Главная Обзор Помощь
Вход
akillibulut
/
kilo
зеркало из https://github.com/squat/kilo
2
0
Ответвить 0
Файлы Задачи 0 Вики
Просмотр исходного кода

Merge pull request #168 from squat/bump_dependecies

go.mod: bump client-go and api machinery
Lucas Servén Marín 5 лет назад
Родитель
f2c37b9de6 a3bf13711c
Сommit
5d33c94d04
100 измененных файлов с 5645 добавлено и 11280 удалено
Разделённый вид Показать статистику Diff
  1. 14 49
      go.mod
  2. 591 94
      go.sum
  3. 185 76
      pkg/k8s/apis/kilo/v1alpha1/openapi_generated.go
  4. 1 1
      pkg/k8s/apis/kilo/v1alpha1/zz_generated.deepcopy.go
  5. 6 4
      pkg/k8s/backend.go
  6. 7 0
      pkg/k8s/clientset/versioned/clientset.go
  7. 6 1
      pkg/k8s/clientset/versioned/fake/clientset_generated.go
  8. 1 1
      pkg/k8s/clientset/versioned/fake/register.go
  9. 11 9
      pkg/k8s/clientset/versioned/typed/kilo/v1alpha1/fake/fake_peer.go
  10. 1 2
      pkg/k8s/clientset/versioned/typed/kilo/v1alpha1/kilo_client.go
  11. 34 30
      pkg/k8s/clientset/versioned/typed/kilo/v1alpha1/peer.go
  12. 3 2
      pkg/k8s/informers/kilo/v1alpha1/peer.go
  13. 3 0
      pkg/k8s/listers/kilo/v1alpha1/peer.go
  14. 8 0
      vendor/github.com/cespare/xxhash/v2/.travis.yml
  15. 22 0
      vendor/github.com/cespare/xxhash/v2/LICENSE.txt
  16. 67 0
      vendor/github.com/cespare/xxhash/v2/README.md
  17. 3 0
      vendor/github.com/cespare/xxhash/v2/go.mod
  18. 0 0
      vendor/github.com/cespare/xxhash/v2/go.sum
  19. 236 0
      vendor/github.com/cespare/xxhash/v2/xxhash.go
  20. 13 0
      vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go
  21. 215 0
      vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s
  22. 76 0
      vendor/github.com/cespare/xxhash/v2/xxhash_other.go
  23. 15 0
      vendor/github.com/cespare/xxhash/v2/xxhash_safe.go
  24. 46 0
      vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go
  25. 12 0
      vendor/github.com/emicklei/go-restful/CHANGES.md
  26. 8 3
      vendor/github.com/emicklei/go-restful/mime.go
  27. 7 2
      vendor/github.com/emicklei/go-restful/response.go
  28. 28 19
      vendor/github.com/emicklei/go-restful/route_builder.go
  29. 5 2
      vendor/github.com/evanphx/json-patch/.travis.yml
  30. 1 1
      vendor/github.com/evanphx/json-patch/LICENSE
  31. 6 5
      vendor/github.com/evanphx/json-patch/README.md
  32. 8 5
      vendor/github.com/evanphx/json-patch/merge.go
  33. 160 72
      vendor/github.com/evanphx/json-patch/patch.go
  34. 4 0
      vendor/github.com/go-kit/kit/log/README.md
  35. 201 0
      vendor/github.com/go-logr/logr/LICENSE
  36. 183 0
      vendor/github.com/go-logr/logr/README.md
  37. 51 0
      vendor/github.com/go-logr/logr/discard.go
  38. 3 0
      vendor/github.com/go-logr/logr/go.mod
  39. 266 0
      vendor/github.com/go-logr/logr/logr.go
  40. 5 5
      vendor/github.com/go-openapi/jsonpointer/.travis.yml
  41. 5 6
      vendor/github.com/go-openapi/jsonpointer/go.mod
  42. 20 7
      vendor/github.com/go-openapi/jsonpointer/go.sum
  43. 1 1
      vendor/github.com/go-openapi/jsonpointer/pointer.go
  44. 5 6
      vendor/github.com/go-openapi/jsonreference/.travis.yml
  45. 7 10
      vendor/github.com/go-openapi/jsonreference/go.mod
  46. 37 13
      vendor/github.com/go-openapi/jsonreference/go.sum
  47. 6 1
      vendor/github.com/go-openapi/spec/.golangci.yml
  48. 5 8
      vendor/github.com/go-openapi/spec/.travis.yml
  49. 3 3
      vendor/github.com/go-openapi/spec/bindata.go
  50. 4 3
      vendor/github.com/go-openapi/spec/expander.go
  51. 8 12
      vendor/github.com/go-openapi/spec/go.mod
  52. 42 15
      vendor/github.com/go-openapi/spec/go.sum
  53. 7 0
      vendor/github.com/go-openapi/spec/items.go
  54. 2 0
      vendor/github.com/go-openapi/spec/ref.go
  55. 7 0
      vendor/github.com/go-openapi/spec/schema.go
  56. 2 6
      vendor/github.com/go-openapi/spec/schema_loader.go
  57. 124 0
      vendor/github.com/go-openapi/spec/swagger.go
  58. 1 0
      vendor/github.com/go-openapi/swag/.gitignore
  59. 5 6
      vendor/github.com/go-openapi/swag/.travis.yml
  60. 0 1
      vendor/github.com/go-openapi/swag/README.md
  61. 4 3
      vendor/github.com/go-openapi/swag/convert.go
  62. 0 1
      vendor/github.com/go-openapi/swag/doc.go
  63. 9 4
      vendor/github.com/go-openapi/swag/go.mod
  64. 16 5
      vendor/github.com/go-openapi/swag/go.sum
  65. 1 1
      vendor/github.com/go-openapi/swag/json.go
  66. 87 0
      vendor/github.com/go-openapi/swag/name_lexem.go
  67. 262 0
      vendor/github.com/go-openapi/swag/split.go
  68. 42 69
      vendor/github.com/go-openapi/swag/util.go
  69. 33 14
      vendor/github.com/go-openapi/swag/yaml.go
  70. 2 0
      vendor/github.com/gogo/protobuf/proto/encode.go
  71. 1 0
      vendor/github.com/gogo/protobuf/proto/extensions.go
  72. 21 0
      vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
  73. 13 7
      vendor/github.com/gogo/protobuf/proto/lib.go
  74. 41 30
      vendor/github.com/gogo/protobuf/proto/properties.go
  75. 10 7
      vendor/github.com/gogo/protobuf/proto/table_marshal.go
  76. 19 0
      vendor/github.com/gogo/protobuf/proto/table_merge.go
  77. 13 9
      vendor/github.com/gogo/protobuf/proto/table_unmarshal.go
  78. 4 2
      vendor/github.com/gogo/protobuf/proto/text.go
  79. 1 1
      vendor/github.com/gogo/protobuf/proto/text_parser.go
  80. 324 0
      vendor/github.com/golang/protobuf/proto/buffer.go
  81. 0 253
      vendor/github.com/golang/protobuf/proto/clone.go
  82. 0 427
      vendor/github.com/golang/protobuf/proto/decode.go
  83. 63 0
      vendor/github.com/golang/protobuf/proto/defaults.go
  84. 88 38
      vendor/github.com/golang/protobuf/proto/deprecated.go
  85. 32 324
      vendor/github.com/golang/protobuf/proto/discard.go
  86. 0 203
      vendor/github.com/golang/protobuf/proto/encode.go
  87. 0 301
      vendor/github.com/golang/protobuf/proto/equal.go
  88. 260 511
      vendor/github.com/golang/protobuf/proto/extensions.go
  89. 0 965
      vendor/github.com/golang/protobuf/proto/lib.go
  90. 0 181
      vendor/github.com/golang/protobuf/proto/message_set.go
  91. 0 360
      vendor/github.com/golang/protobuf/proto/pointer_reflect.go
  92. 0 313
      vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
  93. 205 444
      vendor/github.com/golang/protobuf/proto/properties.go
  94. 167 0
      vendor/github.com/golang/protobuf/proto/proto.go
  95. 323 0
      vendor/github.com/golang/protobuf/proto/registry.go
  96. 0 2776
      vendor/github.com/golang/protobuf/proto/table_marshal.go
  97. 0 654
      vendor/github.com/golang/protobuf/proto/table_merge.go
  98. 0 2053
      vendor/github.com/golang/protobuf/proto/table_unmarshal.go
  99. 0 843
      vendor/github.com/golang/protobuf/proto/text.go
  100. 801 0
      vendor/github.com/golang/protobuf/proto/text_decode.go

+ 14 - 49
go.mod
Просмотреть файл 

@@ -3,64 +3,29 @@ module github.com/squat/kilo
 
 go 1.15
 
 
 require (
 
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
 
 	github.com/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140
 
 	github.com/awalterschulze/gographviz v0.0.0-20181013152038-b2885df04310
 
 	github.com/campoy/embedmd v1.0.0
 
 	github.com/containernetworking/cni v0.6.0
 
 	github.com/containernetworking/plugins v0.6.0
 
 	github.com/coreos/go-iptables v0.4.0
 
-	github.com/emicklei/go-restful v2.9.3+incompatible // indirect
 
-	github.com/evanphx/json-patch v4.2.0+incompatible // indirect
 
-	github.com/ghodss/yaml v1.0.0 // indirect
 
-	github.com/go-kit/kit v0.8.0
 
-	github.com/go-logfmt/logfmt v0.4.0 // indirect
 
-	github.com/go-openapi/jsonpointer v0.19.0 // indirect
 
-	github.com/go-openapi/jsonreference v0.19.0 // indirect
 
-	github.com/go-openapi/spec v0.19.0
 
-	github.com/go-openapi/swag v0.19.0 // indirect
 
-	github.com/go-stack/stack v1.8.0 // indirect
 
-	github.com/gogo/protobuf v1.2.1 // indirect
 
-	github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
 
-	github.com/golang/protobuf v1.3.1 // indirect
 
-	github.com/google/gofuzz v1.0.0 // indirect
 
-	github.com/googleapis/gnostic v0.2.0 // indirect
 
-	github.com/hashicorp/golang-lru v0.5.0 // indirect
 
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
 
+	github.com/go-kit/kit v0.9.0
 
+	github.com/go-openapi/spec v0.19.5
 
 	github.com/imdario/mergo v0.3.6 // indirect
 
-	github.com/json-iterator/go v1.1.6 // indirect
 
-	github.com/kr/pretty v0.1.0 // indirect
 
 	github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
 
-	github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 // indirect
 
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 
 	github.com/oklog/run v1.0.0
 
-	github.com/onsi/ginkgo v1.8.0 // indirect
 
-	github.com/onsi/gomega v1.5.0 // indirect
 
-	github.com/prometheus/client_golang v0.9.2
 
-	github.com/spf13/cobra v0.0.4-0.20190321000552-67fc4837d267
 
-	github.com/spf13/pflag v1.0.3
 
-	github.com/stretchr/testify v1.3.0 // indirect
 
+	github.com/prometheus/client_golang v1.7.1
 
+	github.com/spf13/cobra v1.1.1
 
+	github.com/spf13/pflag v1.0.5
 
 	github.com/vishvananda/netlink v1.0.0
 
 	github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
 
-	golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 // indirect
 
-	golang.org/x/lint v0.0.0-20190409202823-959b441ac422
 
-	golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 // indirect
 
-	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a // indirect
 
-	golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872
 
-	golang.org/x/text v0.3.2 // indirect
 
-	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c // indirect
 
-	golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 // indirect
 
-	google.golang.org/appengine v1.5.0 // indirect
 
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 
-	gopkg.in/inf.v0 v0.9.1 // indirect
 
-	k8s.io/api v0.0.0-20190313235455-40a48860b5ab
 
-	k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed
 
-	k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
 
-	k8s.io/client-go v11.0.0+incompatible
 
-	k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
 
-	k8s.io/gengo v0.0.0-20181106084056-51747d6e00da // indirect
 
-	k8s.io/klog v0.3.0 // indirect
 
-	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
 
-	k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
 
-	sigs.k8s.io/yaml v1.1.0 // indirect
 
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b
 
+	golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
 
+	k8s.io/api v0.21.0
 
+	k8s.io/apiextensions-apiserver v0.21.0
 
+	k8s.io/apimachinery v0.21.0
 
+	k8s.io/client-go v0.21.0
 
+	k8s.io/code-generator v0.21.0
 
+	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
 
 )

+ 591 - 94
go.sum
Просмотреть файл 

@@ -1,207 +1,704 @@
 
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 
+cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
 
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
 
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
 
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 
+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=
 
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
 
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
 
+cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
 
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
 
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
 
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
 
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
 
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 
+github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
 
+github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 
+github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
 
+github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
 
+github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
 
+github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 
+github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 
+github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 
+github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
 
+github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
 
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 
+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/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140 h1:ljF9TLBK+JYXKB8aklLhcubPDBUjpvzWKiqgZ37s+QY=
 
 github.com/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140/go.mod h1:X0noFIik9YqfhGYBLEHg8LJKEwy7QIitLQuFMpKLcPk=
 
-github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 
+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/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
 
 github.com/awalterschulze/gographviz v0.0.0-20181013152038-b2885df04310 h1:t+qxRrRtwNiUYA+Xh2jSXhoG2grnMCMKX4Fg6lx9X1U=
 
 github.com/awalterschulze/gographviz v0.0.0-20181013152038-b2885df04310/go.mod h1:GEV5wmg4YquNw7v1kkyoX9etIk8yVmXj+AkDHuuETHs=
 
-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/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/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 
+github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 
 github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY=
 
 github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
 
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 
+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/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 
+github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 
 github.com/containernetworking/cni v0.6.0 h1:FXICGBZNMtdHlW65trpoHviHctQD3seWhRRcqp2hMOU=
 
 github.com/containernetworking/cni v0.6.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
 
 github.com/containernetworking/plugins v0.6.0 h1:bqPT7yYisnWs+FrtgY5/qLEB9QZ/6z11wMNCwSdzZm0=
 
 github.com/containernetworking/plugins v0.6.0/go.mod h1:dagHaAhNjXjT9QYOklkKJDGaQPTg4pf//FrUcJeb7FU=
 
-github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 
-github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 
 github.com/coreos/go-iptables v0.4.0 h1:wh4UbVs8DhLUbpyq97GLJDKrQMjEDD63T1xE4CrsKzQ=
 
 github.com/coreos/go-iptables v0.4.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
 
+github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
 
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 
-github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 
+github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 
+github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 
+github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 
+github.com/cpuguy83/go-md2man/v2 v2.0.0/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/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 
 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/emicklei/go-restful v2.9.3+incompatible h1:2OwhVdhtzYUp5P5wuGsVDPagKSRd9JK72sJCHVCXh5g=
 
-github.com/emicklei/go-restful v2.9.3+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 
-github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
 
-github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 
+github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 
+github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 
+github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 
+github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 
+github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 
+github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
 
+github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 
+github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 
-github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 
+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 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
 
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 
 github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 
-github.com/go-openapi/jsonpointer v0.19.0 h1:FTUMcX77w5rQkClIzDtTxvn6Bsa894CcrzNj2MMfeg8=
 
-github.com/go-openapi/jsonpointer v0.19.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 
-github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 
-github.com/go-openapi/jsonreference v0.19.0 h1:BqWKpV1dFd+AuiKlgtddwVIFQsuMpxfBDBHGfM2yNpk=
 
-github.com/go-openapi/jsonreference v0.19.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 
-github.com/go-openapi/spec v0.19.0 h1:A4SZ6IWh3lnjH0rG0Z5lkxazMGBECtrZcbyYQi+64k4=
 
-github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 
-github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 
-github.com/go-openapi/swag v0.19.0 h1:Kg7Wl7LkTPlmc393QZQ/5rQadPhi7pBVEMZxyTi0Ii8=
 
-github.com/go-openapi/swag v0.19.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 
+github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 
+github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 
+github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
 
+github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 
+github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
 
+github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
 
+github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
 
+github.com/go-openapi/spec v0.19.5 h1:Xm0Ao53uqnk9QE/LlYV5DEU09UAgpliA85QoT9LzqPw=
 
+github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk=
 
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 
-github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
 
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 
-github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff h1:kOkM9whyQYodu09SJ6W3NCsHG7crFaJILQ22Gozp3lg=
 
-github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 
+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=
 
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
-github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
 
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 
+github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
-github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
 
-github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
 
-github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
 
+github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 
+github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 
+github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 
+github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 
+github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I=
 
+github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
 
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 
+github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 
+github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 
+github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 
+github.com/hashicorp/consul/sdk v0.1.1/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.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 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 
+github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 
+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/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 
+github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 
-github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
 
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 
 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.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=
 
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 
+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/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 
 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/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
 
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 
-github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
-github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983 h1:wL11wNW7dhKIcRCHSm4sHKPWz0tt4mwBsVodG7+Xyqg=
 
-github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 
+github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
 
+github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
 
+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/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 
+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/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/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
 
+github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
 
+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=
 
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 
+github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 
+github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
-github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
 
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
-github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 
+github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw=
 
+github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 
+github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
 
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 
+github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 
+github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 
+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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 
-github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
 
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
 
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
 
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 
+github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
 
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 
+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/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
 
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
 
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 
-github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/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-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 
+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/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 
+github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
 
+github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 
+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/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/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.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 
+github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 
+github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 
+github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 
+github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 
-github.com/spf13/cobra v0.0.4-0.20190321000552-67fc4837d267 h1:I9j1PLS64+NgCtkgbomGInboj1NFH1KF1tkVKlt3yF4=
 
-github.com/spf13/cobra v0.0.4-0.20190321000552-67fc4837d267/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 
+github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 
+github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
 
+github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
 
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 
+github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 
+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/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 
+github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 
 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 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
-github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 
+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/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 
 github.com/vishvananda/netlink v1.0.0 h1:bqNY2lgheFIu1meHUFSH3d7vG93AFyqg3oGbJCOJgSM=
 
 github.com/vishvananda/netlink v1.0.0/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
 
 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4=
 
 github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
 
-github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 
-golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 
+go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
 
+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=
 
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 
+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-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
 
-golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422 h1:QzoH/1pFpZguR8NrRHLcO6jKqfv2zpuSqZLgdm7ZmjI=
 
+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-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
+golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 
+golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 
+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=
 
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
 
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
 
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
 
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
+golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
 
+golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+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-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 h1:KaQtG+aDELoNmXYas3TVkGNYRuq8JQ1aa7LJt8EXVyo=
 
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 
-golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
 
-golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 
+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-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 
+golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM=
 
+golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 
+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/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=
 
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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-20181205085412-a5c9d58dba9a/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-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=
 
-golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 h1:cGjJzUd8RgBw428LXP65YXni0aiGNA4Bl+ls8SmLOm8=
 
-golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+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-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/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-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/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=
 
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M=
 
+golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 
+golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 
+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.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
 
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384 h1:TFlARGu6Czu1z7q93HTxcP1P+/ZFC/IKythI5RzrnRg=
 
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
+golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
+golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 
+golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/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-20190624222133-a101b041ded4/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-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=
 
+golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 
+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-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=
 
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 
+golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 
+golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 
+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.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=
 
+google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 
-google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 
 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 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 
+google.golang.org/appengine v1.6.5/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-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 
+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-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=
 
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
 
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 
+google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 
+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/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 
 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 h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 
+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/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 
+gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 
+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.2.2/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/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 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
-k8s.io/api v0.0.0-20190313235455-40a48860b5ab h1:DG9A67baNpoeweOy2spF1OWHhnVY5KR7/Ek/+U1lVZc=
 
-k8s.io/api v0.0.0-20190313235455-40a48860b5ab/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 
-k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed h1:rCteec//ELIjZMfjIGQbVtZooyaofqDJwsmWwWKItNs=
 
-k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
 
-k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1 h1:IS7K02iBkQXpCeieSiyJjGoLSdVOv2DbPaWHJ+ZtgKg=
 
-k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
 
-k8s.io/client-go v11.0.0+incompatible h1:LBbX2+lOwY9flffWlJM7f1Ct8V2SRNiMRDFeiwnJo9o=
 
-k8s.io/client-go v11.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 
-k8s.io/code-generator v0.0.0-20190311093542-50b561225d70 h1:lgPp615xLHxN84RBd+viA/oHzJfI0miFYFH4T9wpPQ4=
 
-k8s.io/code-generator v0.0.0-20190311093542-50b561225d70/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8=
 
-k8s.io/gengo v0.0.0-20181106084056-51747d6e00da h1:ZMvcXtMVbhUCtCuiSEzBV+Eur4swzfdxx6ZyX3qT6dk=
 
-k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 
-k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
 
-k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 
-k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=
 
-k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 
-k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 h1:8r+l4bNWjRlsFYlQJnKJ2p7s1YQPj4XyXiJVqDHRx7c=
 
-k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
 
-sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 
+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.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 
+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=
 
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 
+gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
 
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 
+k8s.io/api v0.21.0 h1:gu5iGF4V6tfVCQ/R+8Hc0h7H1JuEhzyEi9S4R5LM8+Y=
 
+k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
 
+k8s.io/apiextensions-apiserver v0.21.0 h1:Nd4uBuweg6ImzbxkC1W7xUNZcCV/8Vt10iTdTIVF3hw=
 
+k8s.io/apiextensions-apiserver v0.21.0/go.mod h1:gsQGNtGkc/YoDG9loKI0V+oLZM4ljRPjc/sql5tmvzc=
 
+k8s.io/apimachinery v0.21.0 h1:3Fx+41if+IRavNcKOz09FwEXDBG6ORh6iMsTSelhkMA=
 
+k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
 
+k8s.io/apiserver v0.21.0/go.mod h1:w2YSn4/WIwYuxG5zJmcqtRdtqgW/J2JRgFAqps3bBpg=
 
+k8s.io/client-go v0.21.0 h1:n0zzzJsAQmJngpC0IhgFcApZyoGXPrDIAD601HD09ag=
 
+k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
 
+k8s.io/code-generator v0.21.0 h1:LGWJOvkbBNpuRBqBRXUjzfvymUh7F/iR2KDpwLnqCM4=
 
+k8s.io/code-generator v0.21.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
 
+k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw=
 
+k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 
+k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
 
+k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 
+k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 
+k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 
+k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
 
+k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
 
+k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
 
+k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
 
+k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
 
+k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 
+rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 
+rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 
+rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 
+sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 
+sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
 
+sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 
 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=

Разница между файлами не показана из-за своего большого размера
+ 185 - 76
pkg/k8s/apis/kilo/v1alpha1/openapi_generated.go


+ 1 - 1
pkg/k8s/apis/kilo/v1alpha1/zz_generated.deepcopy.go
Просмотреть файл 

@@ -86,7 +86,7 @@ func (in *PeerEndpoint) DeepCopy() *PeerEndpoint {
 
 func (in *PeerList) DeepCopyInto(out *PeerList) {
 
 	*out = *in
 
 	out.TypeMeta = in.TypeMeta
 
-	out.ListMeta = in.ListMeta
 
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
 
 	if in.Items != nil {
 
 		in, out := &in.Items, &out.Items
 
 		*out = make([]Peer, len(*in))

+ 6 - 4
pkg/k8s/backend.go
Просмотреть файл 

@@ -15,6 +15,7 @@
 
 package k8s
 
 
 import (
 
+	"context"
 
 	"encoding/json"
 
 	"errors"
 
 	"fmt"
 
@@ -29,6 +30,7 @@ import (
 
 	"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"k8s.io/apimachinery/pkg/labels"
 
 	"k8s.io/apimachinery/pkg/types"
 
 	"k8s.io/apimachinery/pkg/util/strategicpatch"
 
@@ -130,7 +132,7 @@ func (nb *nodeBackend) CleanUp(name string) error {
 
 		fmt.Sprintf(jsonRemovePatch, path.Join("/metadata", "annotations", strings.Replace(wireGuardIPAnnotationKey, "/", jsonPatchSlash, 1))),
 
 		fmt.Sprintf(jsonRemovePatch, path.Join("/metadata", "annotations", strings.Replace(discoveredEndpointsKey, "/", jsonPatchSlash, 1))),
 
 	}, ",") + "]")
 
-	if _, err := nb.client.CoreV1().Nodes().Patch(name, types.JSONPatchType, patch); err != nil {
 
+	if _, err := nb.client.CoreV1().Nodes().Patch(context.TODO(), name, types.JSONPatchType, patch, metav1.PatchOptions{}); err != nil {
 
 		return fmt.Errorf("failed to patch node: %v", err)
 
 	}
 
 	return nil
 
@@ -244,7 +246,7 @@ func (nb *nodeBackend) Set(name string, node *mesh.Node) error {
 
 	if err != nil {
 
 		return fmt.Errorf("failed to create patch for node %q: %v", n.Name, err)
 
 	}
 
-	if _, err = nb.client.CoreV1().Nodes().Patch(name, types.StrategicMergePatchType, patch); err != nil {
 
+	if _, err = nb.client.CoreV1().Nodes().Patch(context.TODO(), name, types.StrategicMergePatchType, patch, metav1.PatchOptions{}); err != nil {
 
 		return fmt.Errorf("failed to patch node: %v", err)
 
 	}
 
 	return nil
 
@@ -426,7 +428,7 @@ func (pb *peerBackend) Init(stop <-chan struct{}) error {
 
 	crd.Spec.Subresources.Scale = nil
 
 	crd.Spec.Subresources.Status = nil
 
 
-	_, err := pb.extensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(crd)
 
+	_, err := pb.extensionsClient.ApiextensionsV1beta1().CustomResourceDefinitions().Create(context.TODO(), crd, metav1.CreateOptions{})
 
 	if err != nil && !apierrors.IsAlreadyExists(err) {
 
 		return fmt.Errorf("failed to create CRD: %v", err)
 
 	}
 
@@ -517,7 +519,7 @@ func (pb *peerBackend) Set(name string, peer *mesh.Peer) error {
 
 	p.Spec.PersistentKeepalive = peer.PersistentKeepalive
 
 	p.Spec.PresharedKey = string(peer.PresharedKey)
 
 	p.Spec.PublicKey = string(peer.PublicKey)
 
-	if _, err = pb.client.KiloV1alpha1().Peers().Update(p); err != nil {
 
+	if _, err = pb.client.KiloV1alpha1().Peers().Update(context.TODO(), p, metav1.UpdateOptions{}); err != nil {
 
 		return fmt.Errorf("failed to update peer: %v", err)
 
 	}
 
 	return nil

+ 7 - 0
pkg/k8s/clientset/versioned/clientset.go
Просмотреть файл 

@@ -17,6 +17,8 @@
 
 package versioned
 
 
 import (
 
+	"fmt"
 
+
 
 	kilov1alpha1 "github.com/squat/kilo/pkg/k8s/clientset/versioned/typed/kilo/v1alpha1"
 
 	discovery "k8s.io/client-go/discovery"
 
 	rest "k8s.io/client-go/rest"
 
@@ -49,9 +51,14 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 
 }
 
 
 // NewForConfig creates a new Clientset for the given config.
 
+// If config's RateLimiter is not set and QPS and Burst are acceptable,
 
+// NewForConfig will generate a rate-limiter in configShallowCopy.
 
 func NewForConfig(c *rest.Config) (*Clientset, error) {
 
 	configShallowCopy := *c
 
 	if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 {
 
+		if configShallowCopy.Burst <= 0 {
 
+			return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0")
 
+		}
 
 		configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst)
 
 	}
 
 	var cs Clientset

+ 6 - 1
pkg/k8s/clientset/versioned/fake/clientset_generated.go
Просмотреть файл 

@@ -39,7 +39,7 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 
 		}
 
 	}
 
 
-	cs := &Clientset{}
 
+	cs := &Clientset{tracker: o}
 
 	cs.discovery = &fakediscovery.FakeDiscovery{Fake: &cs.Fake}
 
 	cs.AddReactor("*", "*", testing.ObjectReaction(o))
 
 	cs.AddWatchReactor("*", func(action testing.Action) (handled bool, ret watch.Interface, err error) {
 
@@ -61,12 +61,17 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 
 type Clientset struct {
 
 	testing.Fake
 
 	discovery *fakediscovery.FakeDiscovery
 
+	tracker   testing.ObjectTracker
 
 }
 
 
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 
 	return c.discovery
 
 }
 
 
+func (c *Clientset) Tracker() testing.ObjectTracker {
 
+	return c.tracker
 
+}
 
+
 
 var _ clientset.Interface = &Clientset{}
 
 
 // KiloV1alpha1 retrieves the KiloV1alpha1Client

+ 1 - 1
pkg/k8s/clientset/versioned/fake/register.go
Просмотреть файл 

@@ -27,7 +27,7 @@ import (
 
 
 var scheme = runtime.NewScheme()
 
 var codecs = serializer.NewCodecFactory(scheme)
 
-var parameterCodec = runtime.NewParameterCodec(scheme)
 
+
 
 var localSchemeBuilder = runtime.SchemeBuilder{
 
 	kilov1alpha1.AddToScheme,
 
 }

+ 11 - 9
pkg/k8s/clientset/versioned/typed/kilo/v1alpha1/fake/fake_peer.go
Просмотреть файл 

@@ -17,6 +17,8 @@
 
 package fake
 
 
 import (
 
+	"context"
 
+
 
 	v1alpha1 "github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
 
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	labels "k8s.io/apimachinery/pkg/labels"
 
@@ -36,7 +38,7 @@ var peersResource = schema.GroupVersionResource{Group: "kilo", Version: "v1alpha
 
 var peersKind = schema.GroupVersionKind{Group: "kilo", Version: "v1alpha1", Kind: "Peer"}
 
 
 // Get takes name of the peer, and returns the corresponding peer object, and an error if there is any.
 
-func (c *FakePeers) Get(name string, options v1.GetOptions) (result *v1alpha1.Peer, err error) {
 
+func (c *FakePeers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Peer, err error) {
 
 	obj, err := c.Fake.
 
 		Invokes(testing.NewRootGetAction(peersResource, name), &v1alpha1.Peer{})
 
 	if obj == nil {
 
@@ -46,7 +48,7 @@ func (c *FakePeers) Get(name string, options v1.GetOptions) (result *v1alpha1.Pe
 
 }
 
 
 // List takes label and field selectors, and returns the list of Peers that match those selectors.
 
-func (c *FakePeers) List(opts v1.ListOptions) (result *v1alpha1.PeerList, err error) {
 
+func (c *FakePeers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PeerList, err error) {
 
 	obj, err := c.Fake.
 
 		Invokes(testing.NewRootListAction(peersResource, peersKind, opts), &v1alpha1.PeerList{})
 
 	if obj == nil {
 
@@ -67,13 +69,13 @@ func (c *FakePeers) List(opts v1.ListOptions) (result *v1alpha1.PeerList, err er
 
 }
 
 
 // Watch returns a watch.Interface that watches the requested peers.
 
-func (c *FakePeers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 
+func (c *FakePeers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
 
 	return c.Fake.
 
 		InvokesWatch(testing.NewRootWatchAction(peersResource, opts))
 
 }
 
 
 // Create takes the representation of a peer and creates it.  Returns the server's representation of the peer, and an error, if there is any.
 
-func (c *FakePeers) Create(peer *v1alpha1.Peer) (result *v1alpha1.Peer, err error) {
 
+func (c *FakePeers) Create(ctx context.Context, peer *v1alpha1.Peer, opts v1.CreateOptions) (result *v1alpha1.Peer, err error) {
 
 	obj, err := c.Fake.
 
 		Invokes(testing.NewRootCreateAction(peersResource, peer), &v1alpha1.Peer{})
 
 	if obj == nil {
 
@@ -83,7 +85,7 @@ func (c *FakePeers) Create(peer *v1alpha1.Peer) (result *v1alpha1.Peer, err erro
 
 }
 
 
 // Update takes the representation of a peer and updates it. Returns the server's representation of the peer, and an error, if there is any.
 
-func (c *FakePeers) Update(peer *v1alpha1.Peer) (result *v1alpha1.Peer, err error) {
 
+func (c *FakePeers) Update(ctx context.Context, peer *v1alpha1.Peer, opts v1.UpdateOptions) (result *v1alpha1.Peer, err error) {
 
 	obj, err := c.Fake.
 
 		Invokes(testing.NewRootUpdateAction(peersResource, peer), &v1alpha1.Peer{})
 
 	if obj == nil {
 
@@ -93,22 +95,22 @@ func (c *FakePeers) Update(peer *v1alpha1.Peer) (result *v1alpha1.Peer, err erro
 
 }
 
 
 // Delete takes name of the peer and deletes it. Returns an error if one occurs.
 
-func (c *FakePeers) Delete(name string, options *v1.DeleteOptions) error {
 
+func (c *FakePeers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
 
 	_, err := c.Fake.
 
 		Invokes(testing.NewRootDeleteAction(peersResource, name), &v1alpha1.Peer{})
 
 	return err
 
 }
 
 
 // DeleteCollection deletes a collection of objects.
 
-func (c *FakePeers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
 
-	action := testing.NewRootDeleteCollectionAction(peersResource, listOptions)
 
+func (c *FakePeers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
 
+	action := testing.NewRootDeleteCollectionAction(peersResource, listOpts)
 
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.PeerList{})
 
 	return err
 
 }
 
 
 // Patch applies the patch and returns the patched peer.
 
-func (c *FakePeers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Peer, err error) {
 
+func (c *FakePeers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Peer, err error) {
 
 	obj, err := c.Fake.
 
 		Invokes(testing.NewRootPatchSubresourceAction(peersResource, name, pt, data, subresources...), &v1alpha1.Peer{})
 
 	if obj == nil {

+ 1 - 2
pkg/k8s/clientset/versioned/typed/kilo/v1alpha1/kilo_client.go
Просмотреть файл 

@@ -19,7 +19,6 @@ package v1alpha1
 
 import (
 
 	v1alpha1 "github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
 
 	"github.com/squat/kilo/pkg/k8s/clientset/versioned/scheme"
 
-	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 
 	rest "k8s.io/client-go/rest"
 
 )
 
 
@@ -69,7 +68,7 @@ func setConfigDefaults(config *rest.Config) error {
 
 	gv := v1alpha1.SchemeGroupVersion
 
 	config.GroupVersion = &gv
 
 	config.APIPath = "/apis"
 
-	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
 
+	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
 
 
 	if config.UserAgent == "" {
 
 		config.UserAgent = rest.DefaultKubernetesUserAgent()

+ 34 - 30
pkg/k8s/clientset/versioned/typed/kilo/v1alpha1/peer.go
Просмотреть файл 

@@ -17,6 +17,7 @@
 
 package v1alpha1
 
 
 import (
 
+	"context"
 
 	"time"
 
 
 	v1alpha1 "github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
 
@@ -35,14 +36,14 @@ type PeersGetter interface {
 
 
 // PeerInterface has methods to work with Peer resources.
 
 type PeerInterface interface {
 
-	Create(*v1alpha1.Peer) (*v1alpha1.Peer, error)
 
-	Update(*v1alpha1.Peer) (*v1alpha1.Peer, error)
 
-	Delete(name string, options *v1.DeleteOptions) error
 
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
 
-	Get(name string, options v1.GetOptions) (*v1alpha1.Peer, error)
 
-	List(opts v1.ListOptions) (*v1alpha1.PeerList, error)
 
-	Watch(opts v1.ListOptions) (watch.Interface, error)
 
-	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Peer, err error)
 
+	Create(ctx context.Context, peer *v1alpha1.Peer, opts v1.CreateOptions) (*v1alpha1.Peer, error)
 
+	Update(ctx context.Context, peer *v1alpha1.Peer, opts v1.UpdateOptions) (*v1alpha1.Peer, error)
 
+	Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
 
+	DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
 
+	Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Peer, error)
 
+	List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.PeerList, error)
 
+	Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
 
+	Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Peer, err error)
 
 	PeerExpansion
 
 }
 
 
@@ -59,19 +60,19 @@ func newPeers(c *KiloV1alpha1Client) *peers {
 
 }
 
 
 // Get takes name of the peer, and returns the corresponding peer object, and an error if there is any.
 
-func (c *peers) Get(name string, options v1.GetOptions) (result *v1alpha1.Peer, err error) {
 
+func (c *peers) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Peer, err error) {
 
 	result = &v1alpha1.Peer{}
 
 	err = c.client.Get().
 
 		Resource("peers").
 
 		Name(name).
 
 		VersionedParams(&options, scheme.ParameterCodec).
 
-		Do().
 
+		Do(ctx).
 
 		Into(result)
 
 	return
 
 }
 
 
 // List takes label and field selectors, and returns the list of Peers that match those selectors.
 
-func (c *peers) List(opts v1.ListOptions) (result *v1alpha1.PeerList, err error) {
 
+func (c *peers) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PeerList, err error) {
 
 	var timeout time.Duration
 
 	if opts.TimeoutSeconds != nil {
 
 		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
 
@@ -81,13 +82,13 @@ func (c *peers) List(opts v1.ListOptions) (result *v1alpha1.PeerList, err error)
 
 		Resource("peers").
 
 		VersionedParams(&opts, scheme.ParameterCodec).
 
 		Timeout(timeout).
 
-		Do().
 
+		Do(ctx).
 
 		Into(result)
 
 	return
 
 }
 
 
 // Watch returns a watch.Interface that watches the requested peers.
 
-func (c *peers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 
+func (c *peers) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
 
 	var timeout time.Duration
 
 	if opts.TimeoutSeconds != nil {
 
 		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
 
@@ -97,66 +98,69 @@ func (c *peers) Watch(opts v1.ListOptions) (watch.Interface, error) {
 
 		Resource("peers").
 
 		VersionedParams(&opts, scheme.ParameterCodec).
 
 		Timeout(timeout).
 
-		Watch()
 
+		Watch(ctx)
 
 }
 
 
 // Create takes the representation of a peer and creates it.  Returns the server's representation of the peer, and an error, if there is any.
 
-func (c *peers) Create(peer *v1alpha1.Peer) (result *v1alpha1.Peer, err error) {
 
+func (c *peers) Create(ctx context.Context, peer *v1alpha1.Peer, opts v1.CreateOptions) (result *v1alpha1.Peer, err error) {
 
 	result = &v1alpha1.Peer{}
 
 	err = c.client.Post().
 
 		Resource("peers").
 
+		VersionedParams(&opts, scheme.ParameterCodec).
 
 		Body(peer).
 
-		Do().
 
+		Do(ctx).
 
 		Into(result)
 
 	return
 
 }
 
 
 // Update takes the representation of a peer and updates it. Returns the server's representation of the peer, and an error, if there is any.
 
-func (c *peers) Update(peer *v1alpha1.Peer) (result *v1alpha1.Peer, err error) {
 
+func (c *peers) Update(ctx context.Context, peer *v1alpha1.Peer, opts v1.UpdateOptions) (result *v1alpha1.Peer, err error) {
 
 	result = &v1alpha1.Peer{}
 
 	err = c.client.Put().
 
 		Resource("peers").
 
 		Name(peer.Name).
 
+		VersionedParams(&opts, scheme.ParameterCodec).
 
 		Body(peer).
 
-		Do().
 
+		Do(ctx).
 
 		Into(result)
 
 	return
 
 }
 
 
 // Delete takes name of the peer and deletes it. Returns an error if one occurs.
 
-func (c *peers) Delete(name string, options *v1.DeleteOptions) error {
 
+func (c *peers) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
 
 	return c.client.Delete().
 
 		Resource("peers").
 
 		Name(name).
 
-		Body(options).
 
-		Do().
 
+		Body(&opts).
 
+		Do(ctx).
 
 		Error()
 
 }
 
 
 // DeleteCollection deletes a collection of objects.
 
-func (c *peers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
 
+func (c *peers) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
 
 	var timeout time.Duration
 
-	if listOptions.TimeoutSeconds != nil {
 
-		timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
 
+	if listOpts.TimeoutSeconds != nil {
 
+		timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second
 
 	}
 
 	return c.client.Delete().
 
 		Resource("peers").
 
-		VersionedParams(&listOptions, scheme.ParameterCodec).
 
+		VersionedParams(&listOpts, scheme.ParameterCodec).
 
 		Timeout(timeout).
 
-		Body(options).
 
-		Do().
 
+		Body(&opts).
 
+		Do(ctx).
 
 		Error()
 
 }
 
 
 // Patch applies the patch and returns the patched peer.
 
-func (c *peers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Peer, err error) {
 
+func (c *peers) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Peer, err error) {
 
 	result = &v1alpha1.Peer{}
 
 	err = c.client.Patch(pt).
 
 		Resource("peers").
 
-		SubResource(subresources...).
 
 		Name(name).
 
+		SubResource(subresources...).
 
+		VersionedParams(&opts, scheme.ParameterCodec).
 
 		Body(data).
 
-		Do().
 
+		Do(ctx).
 
 		Into(result)
 
 	return
 
 }

+ 3 - 2
pkg/k8s/informers/kilo/v1alpha1/peer.go
Просмотреть файл 

@@ -17,6 +17,7 @@
 
 package v1alpha1
 
 
 import (
 
+	"context"
 
 	time "time"
 
 
 	kilov1alpha1 "github.com/squat/kilo/pkg/k8s/apis/kilo/v1alpha1"
 
@@ -58,13 +59,13 @@ func NewFilteredPeerInformer(client versioned.Interface, resyncPeriod time.Durat
 
 				if tweakListOptions != nil {
 
 					tweakListOptions(&options)
 
 				}
 
-				return client.KiloV1alpha1().Peers().List(options)
 
+				return client.KiloV1alpha1().Peers().List(context.TODO(), options)
 
 			},
 
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 
 				if tweakListOptions != nil {
 
 					tweakListOptions(&options)
 
 				}
 
-				return client.KiloV1alpha1().Peers().Watch(options)
 
+				return client.KiloV1alpha1().Peers().Watch(context.TODO(), options)
 
 			},
 
 		},
 
 		&kilov1alpha1.Peer{},

+ 3 - 0
pkg/k8s/listers/kilo/v1alpha1/peer.go
Просмотреть файл 

@@ -24,10 +24,13 @@ import (
 
 )
 
 
 // PeerLister helps list Peers.
 
+// All objects returned here must be treated as read-only.
 
 type PeerLister interface {
 
 	// List lists all Peers in the indexer.
 
+	// Objects returned here must be treated as read-only.
 
 	List(selector labels.Selector) (ret []*v1alpha1.Peer, err error)
 
 	// Get retrieves the Peer from the index for a given name.
 
+	// Objects returned here must be treated as read-only.
 
 	Get(name string) (*v1alpha1.Peer, error)
 
 	PeerListerExpansion
 
 }

+ 8 - 0
vendor/github.com/cespare/xxhash/v2/.travis.yml
Просмотреть файл 

@@ -0,0 +1,8 @@
 
+language: go
 
+go:
 
+  - "1.x"
 
+  - master
 
+env:
 
+  - TAGS=""
 
+  - TAGS="-tags purego"
 
+script: go test $TAGS -v ./...

+ 22 - 0
vendor/github.com/cespare/xxhash/v2/LICENSE.txt
Просмотреть файл 

@@ -0,0 +1,22 @@
 
+Copyright (c) 2016 Caleb Spare
 
+
 
+MIT License
 
+
 
+Permission is hereby granted, free of charge, to any person obtaining
 
+a copy of this software and associated documentation files (the
 
+"Software"), to deal in the Software without restriction, including
 
+without limitation the rights to use, copy, modify, merge, publish,
 
+distribute, sublicense, and/or sell copies of the Software, and to
 
+permit persons to whom the Software is furnished to do so, subject to
 
+the following conditions:
 
+
 
+The above copyright notice and this permission notice shall be
 
+included in all copies or substantial portions of the Software.
 
+
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ 67 - 0
vendor/github.com/cespare/xxhash/v2/README.md
Просмотреть файл 

@@ -0,0 +1,67 @@
 
+# xxhash
 
+
 
+[![GoDoc](https://godoc.org/github.com/cespare/xxhash?status.svg)](https://godoc.org/github.com/cespare/xxhash)
 
+[![Build Status](https://travis-ci.org/cespare/xxhash.svg?branch=master)](https://travis-ci.org/cespare/xxhash)
 
+
 
+xxhash is a Go implementation of the 64-bit
 
+[xxHash](http://cyan4973.github.io/xxHash/) algorithm, XXH64. This is a
 
+high-quality hashing algorithm that is much faster than anything in the Go
 
+standard library.
 
+
 
+This package provides a straightforward API:
 
+
 
+```
 
+func Sum64(b []byte) uint64
 
+func Sum64String(s string) uint64
 
+type Digest struct{ ... }
 
+    func New() *Digest
 
+```
 
+
 
+The `Digest` type implements hash.Hash64. Its key methods are:
 
+
 
+```
 
+func (*Digest) Write([]byte) (int, error)
 
+func (*Digest) WriteString(string) (int, error)
 
+func (*Digest) Sum64() uint64
 
+```
 
+
 
+This implementation provides a fast pure-Go implementation and an even faster
 
+assembly implementation for amd64.
 
+
 
+## Compatibility
 
+
 
+This package is in a module and the latest code is in version 2 of the module.
 
+You need a version of Go with at least "minimal module compatibility" to use
 
+github.com/cespare/xxhash/v2:
 
+
 
+* 1.9.7+ for Go 1.9
 
+* 1.10.3+ for Go 1.10
 
+* Go 1.11 or later
 
+
 
+I recommend using the latest release of Go.
 
+
 
+## Benchmarks
 
+
 
+Here are some quick benchmarks comparing the pure-Go and assembly
 
+implementations of Sum64.
 
+
 
+| input size | purego | asm |
 
+| --- | --- | --- |
 
+| 5 B   |  979.66 MB/s |  1291.17 MB/s  |
 
+| 100 B | 7475.26 MB/s | 7973.40 MB/s  |
 
+| 4 KB  | 17573.46 MB/s | 17602.65 MB/s |
 
+| 10 MB | 17131.46 MB/s | 17142.16 MB/s |
 
+
 
+These numbers were generated on Ubuntu 18.04 with an Intel i7-8700K CPU using
 
+the following commands under Go 1.11.2:
 
+
 
+```
 
+$ go test -tags purego -benchtime 10s -bench '/xxhash,direct,bytes'
 
+$ go test -benchtime 10s -bench '/xxhash,direct,bytes'
 
+```
 
+
 
+## Projects using this package
 
+
 
+- [InfluxDB](https://github.com/influxdata/influxdb)
 
+- [Prometheus](https://github.com/prometheus/prometheus)
 
+- [FreeCache](https://github.com/coocood/freecache)

+ 3 - 0
vendor/github.com/cespare/xxhash/v2/go.mod
Просмотреть файл 

@@ -0,0 +1,3 @@
 
+module github.com/cespare/xxhash/v2
 
+
 
+go 1.11

+ 0 - 0
vendor/github.com/cespare/xxhash/v2/go.sum
Просмотреть файл


+ 236 - 0
vendor/github.com/cespare/xxhash/v2/xxhash.go
Просмотреть файл 

@@ -0,0 +1,236 @@
 
+// Package xxhash implements the 64-bit variant of xxHash (XXH64) as described
 
+// at http://cyan4973.github.io/xxHash/.
 
+package xxhash
 
+
 
+import (
 
+	"encoding/binary"
 
+	"errors"
 
+	"math/bits"
 
+)
 
+
 
+const (
 
+	prime1 uint64 = 11400714785074694791
 
+	prime2 uint64 = 14029467366897019727
 
+	prime3 uint64 = 1609587929392839161
 
+	prime4 uint64 = 9650029242287828579
 
+	prime5 uint64 = 2870177450012600261
 
+)
 
+
 
+// NOTE(caleb): I'm using both consts and vars of the primes. Using consts where
 
+// possible in the Go code is worth a small (but measurable) performance boost
 
+// by avoiding some MOVQs. Vars are needed for the asm and also are useful for
 
+// convenience in the Go code in a few places where we need to intentionally
 
+// avoid constant arithmetic (e.g., v1 := prime1 + prime2 fails because the
 
+// result overflows a uint64).
 
+var (
 
+	prime1v = prime1
 
+	prime2v = prime2
 
+	prime3v = prime3
 
+	prime4v = prime4
 
+	prime5v = prime5
 
+)
 
+
 
+// Digest implements hash.Hash64.
 
+type Digest struct {
 
+	v1    uint64
 
+	v2    uint64
 
+	v3    uint64
 
+	v4    uint64
 
+	total uint64
 
+	mem   [32]byte
 
+	n     int // how much of mem is used
 
+}
 
+
 
+// New creates a new Digest that computes the 64-bit xxHash algorithm.
 
+func New() *Digest {
 
+	var d Digest
 
+	d.Reset()
 
+	return &d
 
+}
 
+
 
+// Reset clears the Digest's state so that it can be reused.
 
+func (d *Digest) Reset() {
 
+	d.v1 = prime1v + prime2
 
+	d.v2 = prime2
 
+	d.v3 = 0
 
+	d.v4 = -prime1v
 
+	d.total = 0
 
+	d.n = 0
 
+}
 
+
 
+// Size always returns 8 bytes.
 
+func (d *Digest) Size() int { return 8 }
 
+
 
+// BlockSize always returns 32 bytes.
 
+func (d *Digest) BlockSize() int { return 32 }
 
+
 
+// Write adds more data to d. It always returns len(b), nil.
 
+func (d *Digest) Write(b []byte) (n int, err error) {
 
+	n = len(b)
 
+	d.total += uint64(n)
 
+
 
+	if d.n+n < 32 {
 
+		// This new data doesn't even fill the current block.
 
+		copy(d.mem[d.n:], b)
 
+		d.n += n
 
+		return
 
+	}
 
+
 
+	if d.n > 0 {
 
+		// Finish off the partial block.
 
+		copy(d.mem[d.n:], b)
 
+		d.v1 = round(d.v1, u64(d.mem[0:8]))
 
+		d.v2 = round(d.v2, u64(d.mem[8:16]))
 
+		d.v3 = round(d.v3, u64(d.mem[16:24]))
 
+		d.v4 = round(d.v4, u64(d.mem[24:32]))
 
+		b = b[32-d.n:]
 
+		d.n = 0
 
+	}
 
+
 
+	if len(b) >= 32 {
 
+		// One or more full blocks left.
 
+		nw := writeBlocks(d, b)
 
+		b = b[nw:]
 
+	}
 
+
 
+	// Store any remaining partial block.
 
+	copy(d.mem[:], b)
 
+	d.n = len(b)
 
+
 
+	return
 
+}
 
+
 
+// Sum appends the current hash to b and returns the resulting slice.
 
+func (d *Digest) Sum(b []byte) []byte {
 
+	s := d.Sum64()
 
+	return append(
 
+		b,
 
+		byte(s>>56),
 
+		byte(s>>48),
 
+		byte(s>>40),
 
+		byte(s>>32),
 
+		byte(s>>24),
 
+		byte(s>>16),
 
+		byte(s>>8),
 
+		byte(s),
 
+	)
 
+}
 
+
 
+// Sum64 returns the current hash.
 
+func (d *Digest) Sum64() uint64 {
 
+	var h uint64
 
+
 
+	if d.total >= 32 {
 
+		v1, v2, v3, v4 := d.v1, d.v2, d.v3, d.v4
 
+		h = rol1(v1) + rol7(v2) + rol12(v3) + rol18(v4)
 
+		h = mergeRound(h, v1)
 
+		h = mergeRound(h, v2)
 
+		h = mergeRound(h, v3)
 
+		h = mergeRound(h, v4)
 
+	} else {
 
+		h = d.v3 + prime5
 
+	}
 
+
 
+	h += d.total
 
+
 
+	i, end := 0, d.n
 
+	for ; i+8 <= end; i += 8 {
 
+		k1 := round(0, u64(d.mem[i:i+8]))
 
+		h ^= k1
 
+		h = rol27(h)*prime1 + prime4
 
+	}
 
+	if i+4 <= end {
 
+		h ^= uint64(u32(d.mem[i:i+4])) * prime1
 
+		h = rol23(h)*prime2 + prime3
 
+		i += 4
 
+	}
 
+	for i < end {
 
+		h ^= uint64(d.mem[i]) * prime5
 
+		h = rol11(h) * prime1
 
+		i++
 
+	}
 
+
 
+	h ^= h >> 33
 
+	h *= prime2
 
+	h ^= h >> 29
 
+	h *= prime3
 
+	h ^= h >> 32
 
+
 
+	return h
 
+}
 
+
 
+const (
 
+	magic         = "xxh\x06"
 
+	marshaledSize = len(magic) + 8*5 + 32
 
+)
 
+
 
+// MarshalBinary implements the encoding.BinaryMarshaler interface.
 
+func (d *Digest) MarshalBinary() ([]byte, error) {
 
+	b := make([]byte, 0, marshaledSize)
 
+	b = append(b, magic...)
 
+	b = appendUint64(b, d.v1)
 
+	b = appendUint64(b, d.v2)
 
+	b = appendUint64(b, d.v3)
 
+	b = appendUint64(b, d.v4)
 
+	b = appendUint64(b, d.total)
 
+	b = append(b, d.mem[:d.n]...)
 
+	b = b[:len(b)+len(d.mem)-d.n]
 
+	return b, nil
 
+}
 
+
 
+// UnmarshalBinary implements the encoding.BinaryUnmarshaler interface.
 
+func (d *Digest) UnmarshalBinary(b []byte) error {
 
+	if len(b) < len(magic) || string(b[:len(magic)]) != magic {
 
+		return errors.New("xxhash: invalid hash state identifier")
 
+	}
 
+	if len(b) != marshaledSize {
 
+		return errors.New("xxhash: invalid hash state size")
 
+	}
 
+	b = b[len(magic):]
 
+	b, d.v1 = consumeUint64(b)
 
+	b, d.v2 = consumeUint64(b)
 
+	b, d.v3 = consumeUint64(b)
 
+	b, d.v4 = consumeUint64(b)
 
+	b, d.total = consumeUint64(b)
 
+	copy(d.mem[:], b)
 
+	b = b[len(d.mem):]
 
+	d.n = int(d.total % uint64(len(d.mem)))
 
+	return nil
 
+}
 
+
 
+func appendUint64(b []byte, x uint64) []byte {
 
+	var a [8]byte
 
+	binary.LittleEndian.PutUint64(a[:], x)
 
+	return append(b, a[:]...)
 
+}
 
+
 
+func consumeUint64(b []byte) ([]byte, uint64) {
 
+	x := u64(b)
 
+	return b[8:], x
 
+}
 
+
 
+func u64(b []byte) uint64 { return binary.LittleEndian.Uint64(b) }
 
+func u32(b []byte) uint32 { return binary.LittleEndian.Uint32(b) }
 
+
 
+func round(acc, input uint64) uint64 {
 
+	acc += input * prime2
 
+	acc = rol31(acc)
 
+	acc *= prime1
 
+	return acc
 
+}
 
+
 
+func mergeRound(acc, val uint64) uint64 {
 
+	val = round(0, val)
 
+	acc ^= val
 
+	acc = acc*prime1 + prime4
 
+	return acc
 
+}
 
+
 
+func rol1(x uint64) uint64  { return bits.RotateLeft64(x, 1) }
 
+func rol7(x uint64) uint64  { return bits.RotateLeft64(x, 7) }
 
+func rol11(x uint64) uint64 { return bits.RotateLeft64(x, 11) }
 
+func rol12(x uint64) uint64 { return bits.RotateLeft64(x, 12) }
 
+func rol18(x uint64) uint64 { return bits.RotateLeft64(x, 18) }
 
+func rol23(x uint64) uint64 { return bits.RotateLeft64(x, 23) }
 
+func rol27(x uint64) uint64 { return bits.RotateLeft64(x, 27) }
 
+func rol31(x uint64) uint64 { return bits.RotateLeft64(x, 31) }

+ 13 - 0
vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go
Просмотреть файл 

@@ -0,0 +1,13 @@
 
+// +build !appengine
 
+// +build gc
 
+// +build !purego
 
+
 
+package xxhash
 
+
 
+// Sum64 computes the 64-bit xxHash digest of b.
 
+//
 
+//go:noescape
 
+func Sum64(b []byte) uint64
 
+
 
+//go:noescape
 
+func writeBlocks(d *Digest, b []byte) int

+ 215 - 0
vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s
Просмотреть файл 

@@ -0,0 +1,215 @@
 
+// +build !appengine
 
+// +build gc
 
+// +build !purego
 
+
 
+#include "textflag.h"
 
+
 
+// Register allocation:
 
+// AX	h
 
+// CX	pointer to advance through b
 
+// DX	n
 
+// BX	loop end
 
+// R8	v1, k1
 
+// R9	v2
 
+// R10	v3
 
+// R11	v4
 
+// R12	tmp
 
+// R13	prime1v
 
+// R14	prime2v
 
+// R15	prime4v
 
+
 
+// round reads from and advances the buffer pointer in CX.
 
+// It assumes that R13 has prime1v and R14 has prime2v.
 
+#define round(r) \
 
+	MOVQ  (CX), R12 \
 
+	ADDQ  $8, CX    \
 
+	IMULQ R14, R12  \
 
+	ADDQ  R12, r    \
 
+	ROLQ  $31, r    \
 
+	IMULQ R13, r
 
+
 
+// mergeRound applies a merge round on the two registers acc and val.
 
+// It assumes that R13 has prime1v, R14 has prime2v, and R15 has prime4v.
 
+#define mergeRound(acc, val) \
 
+	IMULQ R14, val \
 
+	ROLQ  $31, val \
 
+	IMULQ R13, val \
 
+	XORQ  val, acc \
 
+	IMULQ R13, acc \
 
+	ADDQ  R15, acc
 
+
 
+// func Sum64(b []byte) uint64
 
+TEXT ·Sum64(SB), NOSPLIT, $0-32
 
+	// Load fixed primes.
 
+	MOVQ ·prime1v(SB), R13
 
+	MOVQ ·prime2v(SB), R14
 
+	MOVQ ·prime4v(SB), R15
 
+
 
+	// Load slice.
 
+	MOVQ b_base+0(FP), CX
 
+	MOVQ b_len+8(FP), DX
 
+	LEAQ (CX)(DX*1), BX
 
+
 
+	// The first loop limit will be len(b)-32.
 
+	SUBQ $32, BX
 
+
 
+	// Check whether we have at least one block.
 
+	CMPQ DX, $32
 
+	JLT  noBlocks
 
+
 
+	// Set up initial state (v1, v2, v3, v4).
 
+	MOVQ R13, R8
 
+	ADDQ R14, R8
 
+	MOVQ R14, R9
 
+	XORQ R10, R10
 
+	XORQ R11, R11
 
+	SUBQ R13, R11
 
+
 
+	// Loop until CX > BX.
 
+blockLoop:
 
+	round(R8)
 
+	round(R9)
 
+	round(R10)
 
+	round(R11)
 
+
 
+	CMPQ CX, BX
 
+	JLE  blockLoop
 
+
 
+	MOVQ R8, AX
 
+	ROLQ $1, AX
 
+	MOVQ R9, R12
 
+	ROLQ $7, R12
 
+	ADDQ R12, AX
 
+	MOVQ R10, R12
 
+	ROLQ $12, R12
 
+	ADDQ R12, AX
 
+	MOVQ R11, R12
 
+	ROLQ $18, R12
 
+	ADDQ R12, AX
 
+
 
+	mergeRound(AX, R8)
 
+	mergeRound(AX, R9)
 
+	mergeRound(AX, R10)
 
+	mergeRound(AX, R11)
 
+
 
+	JMP afterBlocks
 
+
 
+noBlocks:
 
+	MOVQ ·prime5v(SB), AX
 
+
 
+afterBlocks:
 
+	ADDQ DX, AX
 
+
 
+	// Right now BX has len(b)-32, and we want to loop until CX > len(b)-8.
 
+	ADDQ $24, BX
 
+
 
+	CMPQ CX, BX
 
+	JG   fourByte
 
+
 
+wordLoop:
 
+	// Calculate k1.
 
+	MOVQ  (CX), R8
 
+	ADDQ  $8, CX
 
+	IMULQ R14, R8
 
+	ROLQ  $31, R8
 
+	IMULQ R13, R8
 
+
 
+	XORQ  R8, AX
 
+	ROLQ  $27, AX
 
+	IMULQ R13, AX
 
+	ADDQ  R15, AX
 
+
 
+	CMPQ CX, BX
 
+	JLE  wordLoop
 
+
 
+fourByte:
 
+	ADDQ $4, BX
 
+	CMPQ CX, BX
 
+	JG   singles
 
+
 
+	MOVL  (CX), R8
 
+	ADDQ  $4, CX
 
+	IMULQ R13, R8
 
+	XORQ  R8, AX
 
+
 
+	ROLQ  $23, AX
 
+	IMULQ R14, AX
 
+	ADDQ  ·prime3v(SB), AX
 
+
 
+singles:
 
+	ADDQ $4, BX
 
+	CMPQ CX, BX
 
+	JGE  finalize
 
+
 
+singlesLoop:
 
+	MOVBQZX (CX), R12
 
+	ADDQ    $1, CX
 
+	IMULQ   ·prime5v(SB), R12
 
+	XORQ    R12, AX
 
+
 
+	ROLQ  $11, AX
 
+	IMULQ R13, AX
 
+
 
+	CMPQ CX, BX
 
+	JL   singlesLoop
 
+
 
+finalize:
 
+	MOVQ  AX, R12
 
+	SHRQ  $33, R12
 
+	XORQ  R12, AX
 
+	IMULQ R14, AX
 
+	MOVQ  AX, R12
 
+	SHRQ  $29, R12
 
+	XORQ  R12, AX
 
+	IMULQ ·prime3v(SB), AX
 
+	MOVQ  AX, R12
 
+	SHRQ  $32, R12
 
+	XORQ  R12, AX
 
+
 
+	MOVQ AX, ret+24(FP)
 
+	RET
 
+
 
+// writeBlocks uses the same registers as above except that it uses AX to store
 
+// the d pointer.
 
+
 
+// func writeBlocks(d *Digest, b []byte) int
 
+TEXT ·writeBlocks(SB), NOSPLIT, $0-40
 
+	// Load fixed primes needed for round.
 
+	MOVQ ·prime1v(SB), R13
 
+	MOVQ ·prime2v(SB), R14
 
+
 
+	// Load slice.
 
+	MOVQ b_base+8(FP), CX
 
+	MOVQ b_len+16(FP), DX
 
+	LEAQ (CX)(DX*1), BX
 
+	SUBQ $32, BX
 
+
 
+	// Load vN from d.
 
+	MOVQ d+0(FP), AX
 
+	MOVQ 0(AX), R8   // v1
 
+	MOVQ 8(AX), R9   // v2
 
+	MOVQ 16(AX), R10 // v3
 
+	MOVQ 24(AX), R11 // v4
 
+
 
+	// We don't need to check the loop condition here; this function is
 
+	// always called with at least one block of data to process.
 
+blockLoop:
 
+	round(R8)
 
+	round(R9)
 
+	round(R10)
 
+	round(R11)
 
+
 
+	CMPQ CX, BX
 
+	JLE  blockLoop
 
+
 
+	// Copy vN back to d.
 
+	MOVQ R8, 0(AX)
 
+	MOVQ R9, 8(AX)
 
+	MOVQ R10, 16(AX)
 
+	MOVQ R11, 24(AX)
 
+
 
+	// The number of bytes written is CX minus the old base pointer.
 
+	SUBQ b_base+8(FP), CX
 
+	MOVQ CX, ret+32(FP)
 
+
 
+	RET

+ 76 - 0
vendor/github.com/cespare/xxhash/v2/xxhash_other.go
Просмотреть файл 

@@ -0,0 +1,76 @@
 
+// +build !amd64 appengine !gc purego
 
+
 
+package xxhash
 
+
 
+// Sum64 computes the 64-bit xxHash digest of b.
 
+func Sum64(b []byte) uint64 {
 
+	// A simpler version would be
 
+	//   d := New()
 
+	//   d.Write(b)
 
+	//   return d.Sum64()
 
+	// but this is faster, particularly for small inputs.
 
+
 
+	n := len(b)
 
+	var h uint64
 
+
 
+	if n >= 32 {
 
+		v1 := prime1v + prime2
 
+		v2 := prime2
 
+		v3 := uint64(0)
 
+		v4 := -prime1v
 
+		for len(b) >= 32 {
 
+			v1 = round(v1, u64(b[0:8:len(b)]))
 
+			v2 = round(v2, u64(b[8:16:len(b)]))
 
+			v3 = round(v3, u64(b[16:24:len(b)]))
 
+			v4 = round(v4, u64(b[24:32:len(b)]))
 
+			b = b[32:len(b):len(b)]
 
+		}
 
+		h = rol1(v1) + rol7(v2) + rol12(v3) + rol18(v4)
 
+		h = mergeRound(h, v1)
 
+		h = mergeRound(h, v2)
 
+		h = mergeRound(h, v3)
 
+		h = mergeRound(h, v4)
 
+	} else {
 
+		h = prime5
 
+	}
 
+
 
+	h += uint64(n)
 
+
 
+	i, end := 0, len(b)
 
+	for ; i+8 <= end; i += 8 {
 
+		k1 := round(0, u64(b[i:i+8:len(b)]))
 
+		h ^= k1
 
+		h = rol27(h)*prime1 + prime4
 
+	}
 
+	if i+4 <= end {
 
+		h ^= uint64(u32(b[i:i+4:len(b)])) * prime1
 
+		h = rol23(h)*prime2 + prime3
 
+		i += 4
 
+	}
 
+	for ; i < end; i++ {
 
+		h ^= uint64(b[i]) * prime5
 
+		h = rol11(h) * prime1
 
+	}
 
+
 
+	h ^= h >> 33
 
+	h *= prime2
 
+	h ^= h >> 29
 
+	h *= prime3
 
+	h ^= h >> 32
 
+
 
+	return h
 
+}
 
+
 
+func writeBlocks(d *Digest, b []byte) int {
 
+	v1, v2, v3, v4 := d.v1, d.v2, d.v3, d.v4
 
+	n := len(b)
 
+	for len(b) >= 32 {
 
+		v1 = round(v1, u64(b[0:8:len(b)]))
 
+		v2 = round(v2, u64(b[8:16:len(b)]))
 
+		v3 = round(v3, u64(b[16:24:len(b)]))
 
+		v4 = round(v4, u64(b[24:32:len(b)]))
 
+		b = b[32:len(b):len(b)]
 
+	}
 
+	d.v1, d.v2, d.v3, d.v4 = v1, v2, v3, v4
 
+	return n - len(b)
 
+}

+ 15 - 0
vendor/github.com/cespare/xxhash/v2/xxhash_safe.go
Просмотреть файл 

@@ -0,0 +1,15 @@
 
+// +build appengine
 
+
 
+// This file contains the safe implementations of otherwise unsafe-using code.
 
+
 
+package xxhash
 
+
 
+// Sum64String computes the 64-bit xxHash digest of s.
 
+func Sum64String(s string) uint64 {
 
+	return Sum64([]byte(s))
 
+}
 
+
 
+// WriteString adds more data to d. It always returns len(s), nil.
 
+func (d *Digest) WriteString(s string) (n int, err error) {
 
+	return d.Write([]byte(s))
 
+}

+ 46 - 0
vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go
Просмотреть файл 

@@ -0,0 +1,46 @@
 
+// +build !appengine
 
+
 
+// This file encapsulates usage of unsafe.
 
+// xxhash_safe.go contains the safe implementations.
 
+
 
+package xxhash
 
+
 
+import (
 
+	"reflect"
 
+	"unsafe"
 
+)
 
+
 
+// Notes:
 
+//
 
+// See https://groups.google.com/d/msg/golang-nuts/dcjzJy-bSpw/tcZYBzQqAQAJ
 
+// for some discussion about these unsafe conversions.
 
+//
 
+// In the future it's possible that compiler optimizations will make these
 
+// unsafe operations unnecessary: https://golang.org/issue/2205.
 
+//
 
+// Both of these wrapper functions still incur function call overhead since they
 
+// will not be inlined. We could write Go/asm copies of Sum64 and Digest.Write
 
+// for strings to squeeze out a bit more speed. Mid-stack inlining should
 
+// eventually fix this.
 
+
 
+// Sum64String computes the 64-bit xxHash digest of s.
 
+// It may be faster than Sum64([]byte(s)) by avoiding a copy.
 
+func Sum64String(s string) uint64 {
 
+	var b []byte
 
+	bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
 
+	bh.Data = (*reflect.StringHeader)(unsafe.Pointer(&s)).Data
 
+	bh.Len = len(s)
 
+	bh.Cap = len(s)
 
+	return Sum64(b)
 
+}
 
+
 
+// WriteString adds more data to d. It always returns len(s), nil.
 
+// It may be faster than Write([]byte(s)) by avoiding a copy.
 
+func (d *Digest) WriteString(s string) (n int, err error) {
 
+	var b []byte
 
+	bh := (*reflect.SliceHeader)(unsafe.Pointer(&b))
 
+	bh.Data = (*reflect.StringHeader)(unsafe.Pointer(&s)).Data
 
+	bh.Len = len(s)
 
+	bh.Cap = len(s)
 
+	return d.Write(b)
 
+}

+ 12 - 0
vendor/github.com/emicklei/go-restful/CHANGES.md
Просмотреть файл 

@@ -1,6 +1,18 @@
 
 ## Change history of go-restful
 
 
 
+v2.9.5
 
+- fix panic in Response.WriteError if err == nil
 
+
 
+v2.9.4
 
+
 
+- fix issue #400 , parsing mime type quality
 
+- Route Builder added option for contentEncodingEnabled (#398)
 
+
 
+v2.9.3
 
+
 
+- Avoid return of 415 Unsupported Media Type when request body is empty (#396)
 
+
 
 v2.9.2
 
 
 - Reduce allocations in per-request methods to improve performance (#395)

+ 8 - 3
vendor/github.com/emicklei/go-restful/mime.go
Просмотреть файл 

@@ -22,7 +22,10 @@ func insertMime(l []mime, e mime) []mime {
 
 	return append(l, e)
 
 }
 
 
+const qFactorWeightingKey = "q"
 
+
 
 // sortedMimes returns a list of mime sorted (desc) by its specified quality.
 
+// e.g. text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3
 
 func sortedMimes(accept string) (sorted []mime) {
 
 	for _, each := range strings.Split(accept, ",") {
 
 		typeAndQuality := strings.Split(strings.Trim(each, " "), ";")
 
@@ -30,14 +33,16 @@ func sortedMimes(accept string) (sorted []mime) {
 
 			sorted = insertMime(sorted, mime{typeAndQuality[0], 1.0})
 
 		} else {
 
 			// take factor
 
-			parts := strings.Split(typeAndQuality[1], "=")
 
-			if len(parts) == 2 {
 
-				f, err := strconv.ParseFloat(parts[1], 64)
 
+			qAndWeight := strings.Split(typeAndQuality[1], "=")
 
+			if len(qAndWeight) == 2 && strings.Trim(qAndWeight[0], " ") == qFactorWeightingKey {
 
+				f, err := strconv.ParseFloat(qAndWeight[1], 64)
 
 				if err != nil {
 
 					traceLogger.Printf("unable to parse quality in %s, %v", each, err)
 
 				} else {
 
 					sorted = insertMime(sorted, mime{typeAndQuality[0], f})
 
 				}
 
+			} else {
 
+				sorted = insertMime(sorted, mime{typeAndQuality[0], 1.0})
 
 			}
 
 		}
 
 	}

+ 7 - 2
vendor/github.com/emicklei/go-restful/response.go
Просмотреть файл 

@@ -174,10 +174,15 @@ func (r *Response) WriteHeaderAndJson(status int, value interface{}, contentType
 
 	return writeJSON(r, status, contentType, value)
 
 }
 
 
-// WriteError write the http status and the error string on the response.
 
+// WriteError write the http status and the error string on the response. err can be nil.
 
 func (r *Response) WriteError(httpStatus int, err error) error {
 
 	r.err = err
 
-	return r.WriteErrorString(httpStatus, err.Error())
 
+	if err == nil {
 
+		r.WriteErrorString(httpStatus, "")
 
+	} else {
 
+		r.WriteErrorString(httpStatus, err.Error())
 
+	}
 
+	return err
 
 }
 
 
 // WriteServiceError is a convenience method for a responding with a status and a ServiceError

+ 28 - 19
vendor/github.com/emicklei/go-restful/route_builder.go
Просмотреть файл 

@@ -38,6 +38,7 @@ type RouteBuilder struct {
 
 	defaultResponse         *ResponseError
 
 	metadata                map[string]interface{}
 
 	deprecated              bool
 
+	contentEncodingEnabled  *bool
 
 }
 
 
 // Do evaluates each argument with the RouteBuilder itself.
 
@@ -233,6 +234,12 @@ func (b *RouteBuilder) If(condition RouteSelectionConditionFunction) *RouteBuild
 
 	return b
 
 }
 
 
+// ContentEncodingEnabled allows you to override the Containers value for auto-compressing this route response.
 
+func (b *RouteBuilder) ContentEncodingEnabled(enabled bool) *RouteBuilder {
 
+	b.contentEncodingEnabled = &enabled
 
+	return b
 
+}
 
+
 
 // If no specific Route path then set to rootPath
 
 // If no specific Produces then set to rootProduces
 
 // If no specific Consumes then set to rootConsumes
 
@@ -269,25 +276,27 @@ func (b *RouteBuilder) Build() Route {
 
 		operationName = nameOfFunction(b.function)
 
 	}
 
 	route := Route{
 
-		Method:          b.httpMethod,
 
-		Path:            concatPath(b.rootPath, b.currentPath),
 
-		Produces:        b.produces,
 
-		Consumes:        b.consumes,
 
-		Function:        b.function,
 
-		Filters:         b.filters,
 
-		If:              b.conditions,
 
-		relativePath:    b.currentPath,
 
-		pathExpr:        pathExpr,
 
-		Doc:             b.doc,
 
-		Notes:           b.notes,
 
-		Operation:       operationName,
 
-		ParameterDocs:   b.parameters,
 
-		ResponseErrors:  b.errorMap,
 
-		DefaultResponse: b.defaultResponse,
 
-		ReadSample:      b.readSample,
 
-		WriteSample:     b.writeSample,
 
-		Metadata:        b.metadata,
 
-		Deprecated:      b.deprecated}
 
+		Method:                 b.httpMethod,
 
+		Path:                   concatPath(b.rootPath, b.currentPath),
 
+		Produces:               b.produces,
 
+		Consumes:               b.consumes,
 
+		Function:               b.function,
 
+		Filters:                b.filters,
 
+		If:                     b.conditions,
 
+		relativePath:           b.currentPath,
 
+		pathExpr:               pathExpr,
 
+		Doc:                    b.doc,
 
+		Notes:                  b.notes,
 
+		Operation:              operationName,
 
+		ParameterDocs:          b.parameters,
 
+		ResponseErrors:         b.errorMap,
 
+		DefaultResponse:        b.defaultResponse,
 
+		ReadSample:             b.readSample,
 
+		WriteSample:            b.writeSample,
 
+		Metadata:               b.metadata,
 
+		Deprecated:             b.deprecated,
 
+		contentEncodingEnabled: b.contentEncodingEnabled,
 
+	}
 
 	route.postBuild()
 
 	return route
 
 }

+ 5 - 2
vendor/github.com/evanphx/json-patch/.travis.yml
Просмотреть файл 

@@ -1,8 +1,8 @@
 
 language: go
 
 
 go:
 
-  - 1.8
 
-  - 1.7
 
+  - 1.14
 
+  - 1.13
 
 
 install:
 
   - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
 
@@ -11,6 +11,9 @@ install:
 
 script:
 
   - go get
 
   - go test -cover ./...
 
+  - cd ./v5
 
+  - go get
 
+  - go test -cover ./...
 
 
 notifications:
 
   email: false

+ 1 - 1
vendor/github.com/evanphx/json-patch/LICENSE
Просмотреть файл 

@@ -6,7 +6,7 @@ modification, are permitted provided that the following conditions are met:
 
 
 * Redistributions of source code must retain the above copyright notice, this
 
   list of conditions and the following disclaimer.
 
-* Redistributions in binary form must reproduce the above copyright notice
 
+* Redistributions in binary form must reproduce the above copyright notice,
 
   this list of conditions and the following disclaimer in the documentation
 
   and/or other materials provided with the distribution.
 
 * Neither the name of the Evan Phoenix nor the names of its contributors

+ 6 - 5
vendor/github.com/evanphx/json-patch/README.md
Просмотреть файл 

@@ -1,5 +1,5 @@
 
 # JSON-Patch
 
-`jsonpatch` is a library which provides functionallity for both applying
 
+`jsonpatch` is a library which provides functionality for both applying
 
 [RFC6902 JSON patches](http://tools.ietf.org/html/rfc6902) against documents, as
 
 well as for calculating & applying [RFC7396 JSON merge patches](https://tools.ietf.org/html/rfc7396).
 
 
@@ -11,10 +11,11 @@ well as for calculating & applying [RFC7396 JSON merge patches](https://tools.ie
 
 
 **Latest and greatest**: 
 ```bash
 
-go get -u github.com/evanphx/json-patch
 
+go get -u github.com/evanphx/json-patch/v5
 
 ```
 
 
 **Stable Versions**:
 
+* Version 5: `go get -u gopkg.in/evanphx/json-patch.v5`
 
 * Version 4: `go get -u gopkg.in/evanphx/json-patch.v4`
 
 
 (previous versions below `v3` are unavailable)
 
@@ -82,7 +83,7 @@ When ran, you get the following output:
 
 ```bash
 
 $ go run main.go
 
 patch document:   {"height":null,"name":"Jane"}
 
-updated tina doc: {"age":28,"name":"Jane"}
 
+updated alternative doc: {"age":28,"name":"Jane"}
 
 ```
 
 
 ## Create and apply a JSON Patch
 
@@ -164,7 +165,7 @@ func main() {
 
 	}
 
 
 	if !jsonpatch.Equal(original, different) {
 
-		fmt.Println(`"original" is _not_ structurally equal to "similar"`)
 
+		fmt.Println(`"original" is _not_ structurally equal to "different"`)
 
 	}
 
 }
 
 ```
 
@@ -173,7 +174,7 @@ When ran, you get the following output:
 
 ```bash
 
 $ go run main.go
 
 "original" is structurally equal to "similar"
 
-"original" is _not_ structurally equal to "similar"
 
+"original" is _not_ structurally equal to "different"
 
 ```
 
 
 ## Combine merge patches

+ 8 - 5
vendor/github.com/evanphx/json-patch/merge.go
Просмотреть файл 

@@ -307,13 +307,16 @@ func matchesValue(av, bv interface{}) bool {
 
 		return true
 
 	case map[string]interface{}:
 
 		bt := bv.(map[string]interface{})
 
-		for key := range at {
 
-			if !matchesValue(at[key], bt[key]) {
 
-				return false
 
-			}
 
+		if len(bt) != len(at) {
 
+			return false
 
 		}
 
 		for key := range bt {
 
-			if !matchesValue(at[key], bt[key]) {
 
+			av, aOK := at[key]
 
+			bv, bOK := bt[key]
 
+			if aOK != bOK {
 
+				return false
 
+			}
 
+			if !matchesValue(av, bv) {
 
 				return false
 
 			}
 
 		}

+ 160 - 72
vendor/github.com/evanphx/json-patch/patch.go
Просмотреть файл 

@@ -6,6 +6,8 @@ import (
 
 	"fmt"
 
 	"strconv"
 
 	"strings"
 
+
 
+	"github.com/pkg/errors"
 
 )
 
 
 const (
 
@@ -24,6 +26,14 @@ var (
 
 	AccumulatedCopySizeLimit int64 = 0
 
 )
 
 
+var (
 
+	ErrTestFailed   = errors.New("test failed")
 
+	ErrMissing      = errors.New("missing value")
 
+	ErrUnknownType  = errors.New("unknown object type")
 
+	ErrInvalid      = errors.New("invalid state detected")
 
+	ErrInvalidIndex = errors.New("invalid index referenced")
 
+)
 
+
 
 type lazyNode struct {
 
 	raw   *json.RawMessage
 
 	doc   partialDoc
 
@@ -31,10 +41,11 @@ type lazyNode struct {
 
 	which int
 
 }
 
 
-type operation map[string]*json.RawMessage
 
+// Operation is a single JSON-Patch step, such as a single 'add' operation.
 
+type Operation map[string]*json.RawMessage
 
 
-// Patch is an ordered collection of operations.
 
-type Patch []operation
 
+// Patch is an ordered collection of Operations.
 
+type Patch []Operation
 
 
 type partialDoc map[string]*lazyNode
 
 type partialArray []*lazyNode
 
@@ -59,7 +70,7 @@ func (n *lazyNode) MarshalJSON() ([]byte, error) {
 
 	case eAry:
 
 		return json.Marshal(n.ary)
 
 	default:
 
-		return nil, fmt.Errorf("Unknown type")
 
+		return nil, ErrUnknownType
 
 	}
 
 }
 
 
@@ -91,7 +102,7 @@ func (n *lazyNode) intoDoc() (*partialDoc, error) {
 
 	}
 
 
 	if n.raw == nil {
 
-		return nil, fmt.Errorf("Unable to unmarshal nil pointer as partial document")
 
+		return nil, ErrInvalid
 
 	}
 
 
 	err := json.Unmarshal(*n.raw, &n.doc)
 
@@ -110,7 +121,7 @@ func (n *lazyNode) intoAry() (*partialArray, error) {
 
 	}
 
 
 	if n.raw == nil {
 
-		return nil, fmt.Errorf("Unable to unmarshal nil pointer as partial array")
 
+		return nil, ErrInvalid
 
 	}
 
 
 	err := json.Unmarshal(*n.raw, &n.ary)
 
@@ -191,6 +202,10 @@ func (n *lazyNode) equal(o *lazyNode) bool {
 
 			return false
 
 		}
 
 
+		if len(n.doc) != len(o.doc) {
 
+			return false
 
+		}
 
+
 
 		for k, v := range n.doc {
 
 			ov, ok := o.doc[k]
 
 
@@ -198,6 +213,10 @@ func (n *lazyNode) equal(o *lazyNode) bool {
 
 				return false
 
 			}
 
 
+			if (v == nil) != (ov == nil) {
 
+				return false
 
+			}
 
+
 
 			if v == nil && ov == nil {
 
 				continue
 
 			}
 
@@ -227,7 +246,8 @@ func (n *lazyNode) equal(o *lazyNode) bool {
 
 	return true
 
 }
 
 
-func (o operation) kind() string {
 
+// Kind reads the "op" field of the Operation.
 
+func (o Operation) Kind() string {
 
 	if obj, ok := o["op"]; ok && obj != nil {
 
 		var op string
 
 
@@ -243,39 +263,41 @@ func (o operation) kind() string {
 
 	return "unknown"
 
 }
 
 
-func (o operation) path() string {
 
+// Path reads the "path" field of the Operation.
 
+func (o Operation) Path() (string, error) {
 
 	if obj, ok := o["path"]; ok && obj != nil {
 
 		var op string
 
 
 		err := json.Unmarshal(*obj, &op)
 
 
 		if err != nil {
 
-			return "unknown"
 
+			return "unknown", err
 
 		}
 
 
-		return op
 
+		return op, nil
 
 	}
 
 
-	return "unknown"
 
+	return "unknown", errors.Wrapf(ErrMissing, "operation missing path field")
 
 }
 
 
-func (o operation) from() string {
 
+// From reads the "from" field of the Operation.
 
+func (o Operation) From() (string, error) {
 
 	if obj, ok := o["from"]; ok && obj != nil {
 
 		var op string
 
 
 		err := json.Unmarshal(*obj, &op)
 
 
 		if err != nil {
 
-			return "unknown"
 
+			return "unknown", err
 
 		}
 
 
-		return op
 
+		return op, nil
 
 	}
 
 
-	return "unknown"
 
+	return "unknown", errors.Wrapf(ErrMissing, "operation, missing from field")
 
 }
 
 
-func (o operation) value() *lazyNode {
 
+func (o Operation) value() *lazyNode {
 
 	if obj, ok := o["value"]; ok {
 
 		return newLazyNode(obj)
 
 	}
 
@@ -283,6 +305,23 @@ func (o operation) value() *lazyNode {
 
 	return nil
 
 }
 
 
+// ValueInterface decodes the operation value into an interface.
 
+func (o Operation) ValueInterface() (interface{}, error) {
 
+	if obj, ok := o["value"]; ok && obj != nil {
 
+		var v interface{}
 
+
 
+		err := json.Unmarshal(*obj, &v)
 
+
 
+		if err != nil {
 
+			return nil, err
 
+		}
 
+
 
+		return v, nil
 
+	}
 
+
 
+	return nil, errors.Wrapf(ErrMissing, "operation, missing value field")
 
+}
 
+
 
 func isArray(buf []byte) bool {
 
 Loop:
 
 	for _, c := range buf {
 
@@ -359,7 +398,7 @@ func (d *partialDoc) get(key string) (*lazyNode, error) {
 
 func (d *partialDoc) remove(key string) error {
 
 	_, ok := (*d)[key]
 
 	if !ok {
 
-		return fmt.Errorf("Unable to remove nonexistent key: %s", key)
 
+		return errors.Wrapf(ErrMissing, "Unable to remove nonexistent key: %s", key)
 
 	}
 
 
 	delete(*d, key)
 
@@ -385,7 +424,7 @@ func (d *partialArray) add(key string, val *lazyNode) error {
 
 
 	idx, err := strconv.Atoi(key)
 
 	if err != nil {
 
-		return err
 
+		return errors.Wrapf(err, "value was not a proper array index: '%s'", key)
 
 	}
 
 
 	sz := len(*d) + 1
 
@@ -395,17 +434,17 @@ func (d *partialArray) add(key string, val *lazyNode) error {
 
 	cur := *d
 
 
 	if idx >= len(ary) {
 
-		return fmt.Errorf("Unable to access invalid index: %d", idx)
 
+		return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 	}
 
 
-	if SupportNegativeIndices {
 
-		if idx < -len(ary) {
 
-			return fmt.Errorf("Unable to access invalid index: %d", idx)
 
+	if idx < 0 {
 
+		if !SupportNegativeIndices {
 
+			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 		}
 
-
 
-		if idx < 0 {
 
-			idx += len(ary)
 
+		if idx < -len(ary) {
 
+			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 		}
 
+		idx += len(ary)
 
 	}
 
 
 	copy(ary[0:idx], cur[0:idx])
 
@@ -424,7 +463,7 @@ func (d *partialArray) get(key string) (*lazyNode, error) {
 
 	}
 
 
 	if idx >= len(*d) {
 
-		return nil, fmt.Errorf("Unable to access invalid index: %d", idx)
 
+		return nil, errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 	}
 
 
 	return (*d)[idx], nil
 
@@ -439,17 +478,17 @@ func (d *partialArray) remove(key string) error {
 
 	cur := *d
 
 
 	if idx >= len(cur) {
 
-		return fmt.Errorf("Unable to access invalid index: %d", idx)
 
+		return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 	}
 
 
-	if SupportNegativeIndices {
 
-		if idx < -len(cur) {
 
-			return fmt.Errorf("Unable to access invalid index: %d", idx)
 
+	if idx < 0 {
 
+		if !SupportNegativeIndices {
 
+			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 		}
 
-
 
-		if idx < 0 {
 
-			idx += len(cur)
 
+		if idx < -len(cur) {
 
+			return errors.Wrapf(ErrInvalidIndex, "Unable to access invalid index: %d", idx)
 
 		}
 
+		idx += len(cur)
 
 	}
 
 
 	ary := make([]*lazyNode, len(cur)-1)
 
@@ -462,140 +501,189 @@ func (d *partialArray) remove(key string) error {
 
 
 }
 
 
-func (p Patch) add(doc *container, op operation) error {
 
-	path := op.path()
 
+func (p Patch) add(doc *container, op Operation) error {
 
+	path, err := op.Path()
 
+	if err != nil {
 
+		return errors.Wrapf(ErrMissing, "add operation failed to decode path")
 
+	}
 
 
 	con, key := findObject(doc, path)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch add operation does not apply: doc is missing path: \"%s\"", path)
 
+		return errors.Wrapf(ErrMissing, "add operation does not apply: doc is missing path: \"%s\"", path)
 
 	}
 
 
-	return con.add(key, op.value())
 
+	err = con.add(key, op.value())
 
+	if err != nil {
 
+		return errors.Wrapf(err, "error in add for path: '%s'", path)
 
+	}
 
+
 
+	return nil
 
 }
 
 
-func (p Patch) remove(doc *container, op operation) error {
 
-	path := op.path()
 
+func (p Patch) remove(doc *container, op Operation) error {
 
+	path, err := op.Path()
 
+	if err != nil {
 
+		return errors.Wrapf(ErrMissing, "remove operation failed to decode path")
 
+	}
 
 
 	con, key := findObject(doc, path)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch remove operation does not apply: doc is missing path: \"%s\"", path)
 
+		return errors.Wrapf(ErrMissing, "remove operation does not apply: doc is missing path: \"%s\"", path)
 
+	}
 
+
 
+	err = con.remove(key)
 
+	if err != nil {
 
+		return errors.Wrapf(err, "error in remove for path: '%s'", path)
 
 	}
 
 
-	return con.remove(key)
 
+	return nil
 
 }
 
 
-func (p Patch) replace(doc *container, op operation) error {
 
-	path := op.path()
 
+func (p Patch) replace(doc *container, op Operation) error {
 
+	path, err := op.Path()
 
+	if err != nil {
 
+		return errors.Wrapf(err, "replace operation failed to decode path")
 
+	}
 
 
 	con, key := findObject(doc, path)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing path: %s", path)
 
+		return errors.Wrapf(ErrMissing, "replace operation does not apply: doc is missing path: %s", path)
 
 	}
 
 
 	_, ok := con.get(key)
 
 	if ok != nil {
 
-		return fmt.Errorf("jsonpatch replace operation does not apply: doc is missing key: %s", path)
 
+		return errors.Wrapf(ErrMissing, "replace operation does not apply: doc is missing key: %s", path)
 
 	}
 
 
-	return con.set(key, op.value())
 
+	err = con.set(key, op.value())
 
+	if err != nil {
 
+		return errors.Wrapf(err, "error in remove for path: '%s'", path)
 
+	}
 
+
 
+	return nil
 
 }
 
 
-func (p Patch) move(doc *container, op operation) error {
 
-	from := op.from()
 
+func (p Patch) move(doc *container, op Operation) error {
 
+	from, err := op.From()
 
+	if err != nil {
 
+		return errors.Wrapf(err, "move operation failed to decode from")
 
+	}
 
 
 	con, key := findObject(doc, from)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch move operation does not apply: doc is missing from path: %s", from)
 
+		return errors.Wrapf(ErrMissing, "move operation does not apply: doc is missing from path: %s", from)
 
 	}
 
 
 	val, err := con.get(key)
 
 	if err != nil {
 
-		return err
 
+		return errors.Wrapf(err, "error in move for path: '%s'", key)
 
 	}
 
 
 	err = con.remove(key)
 
 	if err != nil {
 
-		return err
 
+		return errors.Wrapf(err, "error in move for path: '%s'", key)
 
 	}
 
 
-	path := op.path()
 
+	path, err := op.Path()
 
+	if err != nil {
 
+		return errors.Wrapf(err, "move operation failed to decode path")
 
+	}
 
 
 	con, key = findObject(doc, path)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch move operation does not apply: doc is missing destination path: %s", path)
 
+		return errors.Wrapf(ErrMissing, "move operation does not apply: doc is missing destination path: %s", path)
 
 	}
 
 
-	return con.add(key, val)
 
+	err = con.add(key, val)
 
+	if err != nil {
 
+		return errors.Wrapf(err, "error in move for path: '%s'", path)
 
+	}
 
+
 
+	return nil
 
 }
 
 
-func (p Patch) test(doc *container, op operation) error {
 
-	path := op.path()
 
+func (p Patch) test(doc *container, op Operation) error {
 
+	path, err := op.Path()
 
+	if err != nil {
 
+		return errors.Wrapf(err, "test operation failed to decode path")
 
+	}
 
 
 	con, key := findObject(doc, path)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch test operation does not apply: is missing path: %s", path)
 
+		return errors.Wrapf(ErrMissing, "test operation does not apply: is missing path: %s", path)
 
 	}
 
 
 	val, err := con.get(key)
 
-
 
 	if err != nil {
 
-		return err
 
+		return errors.Wrapf(err, "error in test for path: '%s'", path)
 
 	}
 
 
 	if val == nil {
 
 		if op.value().raw == nil {
 
 			return nil
 
 		}
 
-		return fmt.Errorf("Testing value %s failed", path)
 
+		return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
 
 	} else if op.value() == nil {
 
-		return fmt.Errorf("Testing value %s failed", path)
 
+		return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
 
 	}
 
 
 	if val.equal(op.value()) {
 
 		return nil
 
 	}
 
 
-	return fmt.Errorf("Testing value %s failed", path)
 
+	return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
 
 }
 
 
-func (p Patch) copy(doc *container, op operation, accumulatedCopySize *int64) error {
 
-	from := op.from()
 
+func (p Patch) copy(doc *container, op Operation, accumulatedCopySize *int64) error {
 
+	from, err := op.From()
 
+	if err != nil {
 
+		return errors.Wrapf(err, "copy operation failed to decode from")
 
+	}
 
 
 	con, key := findObject(doc, from)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch copy operation does not apply: doc is missing from path: %s", from)
 
+		return errors.Wrapf(ErrMissing, "copy operation does not apply: doc is missing from path: %s", from)
 
 	}
 
 
 	val, err := con.get(key)
 
 	if err != nil {
 
-		return err
 
+		return errors.Wrapf(err, "error in copy for from: '%s'", from)
 
 	}
 
 
-	path := op.path()
 
+	path, err := op.Path()
 
+	if err != nil {
 
+		return errors.Wrapf(ErrMissing, "copy operation failed to decode path")
 
+	}
 
 
 	con, key = findObject(doc, path)
 
 
 	if con == nil {
 
-		return fmt.Errorf("jsonpatch copy operation does not apply: doc is missing destination path: %s", path)
 
+		return errors.Wrapf(ErrMissing, "copy operation does not apply: doc is missing destination path: %s", path)
 
 	}
 
 
 	valCopy, sz, err := deepCopy(val)
 
 	if err != nil {
 
-		return err
 
+		return errors.Wrapf(err, "error while performing deep copy")
 
 	}
 
+
 
 	(*accumulatedCopySize) += int64(sz)
 
 	if AccumulatedCopySizeLimit > 0 && *accumulatedCopySize > AccumulatedCopySizeLimit {
 
 		return NewAccumulatedCopySizeError(AccumulatedCopySizeLimit, *accumulatedCopySize)
 
 	}
 
 
-	return con.add(key, valCopy)
 
+	err = con.add(key, valCopy)
 
+	if err != nil {
 
+		return errors.Wrapf(err, "error while adding value during copy")
 
+	}
 
+
 
+	return nil
 
 }
 
 
 // Equal indicates if 2 JSON documents have the same structural equality.
 
@@ -651,7 +739,7 @@ func (p Patch) ApplyIndent(doc []byte, indent string) ([]byte, error) {
 
 	var accumulatedCopySize int64
 
 
 	for _, op := range p {
 
-		switch op.kind() {
 
+		switch op.Kind() {
 
 		case "add":
 
 			err = p.add(&pd, op)
 
 		case "remove":
 
@@ -665,7 +753,7 @@ func (p Patch) ApplyIndent(doc []byte, indent string) ([]byte, error) {
 
 		case "copy":
 
 			err = p.copy(&pd, op, &accumulatedCopySize)
 
 		default:
 
-			err = fmt.Errorf("Unexpected kind: %s", op.kind())
 
+			err = fmt.Errorf("Unexpected kind: %s", op.Kind())
 
 		}
 
 
 		if err != nil {

+ 4 - 0
vendor/github.com/go-kit/kit/log/README.md
Просмотреть файл 

@@ -103,6 +103,10 @@ logger.Log("msg", "hello")
 
 // ts=2016-01-01T12:34:56Z caller=main.go:15 msg=hello
 
 ```
 
 
+## Levels
 
+
 
+Log levels are supported via the [level package](https://godoc.org/github.com/go-kit/kit/log/level).
 
+
 
 ## Supported output formats
 
 
 - [Logfmt](https://brandur.org/logfmt) ([see also](https://blog.codeship.com/logfmt-a-log-format-thats-easy-to-read-and-write))

+ 201 - 0
vendor/github.com/go-logr/logr/LICENSE
Просмотреть файл 

@@ -0,0 +1,201 @@
 
+                                 Apache License
 
+                           Version 2.0, January 2004
 
+                        http://www.apache.org/licenses/
 
+
 
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
+
 
+   1. Definitions.
 
+
 
+      "License" shall mean the terms and conditions for use, reproduction,
 
+      and distribution as defined by Sections 1 through 9 of this document.
 
+
 
+      "Licensor" shall mean the copyright owner or entity authorized by
 
+      the copyright owner that is granting the License.
 
+
 
+      "Legal Entity" shall mean the union of the acting entity and all
 
+      other entities that control, are controlled by, or are under common
 
+      control with that entity. For the purposes of this definition,
 
+      "control" means (i) the power, direct or indirect, to cause the
 
+      direction or management of such entity, whether by contract or
 
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
 
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
+
 
+      "You" (or "Your") shall mean an individual or Legal Entity
 
+      exercising permissions granted by this License.
 
+
 
+      "Source" form shall mean the preferred form for making modifications,
 
+      including but not limited to software source code, documentation
 
+      source, and configuration files.
 
+
 
+      "Object" form shall mean any form resulting from mechanical
 
+      transformation or translation of a Source form, including but
 
+      not limited to compiled object code, generated documentation,
 
+      and conversions to other media types.
 
+
 
+      "Work" shall mean the work of authorship, whether in Source or
 
+      Object form, made available under the License, as indicated by a
 
+      copyright notice that is included in or attached to the work
 
+      (an example is provided in the Appendix below).
 
+
 
+      "Derivative Works" shall mean any work, whether in Source or Object
 
+      form, that is based on (or derived from) the Work and for which the
 
+      editorial revisions, annotations, elaborations, or other modifications
 
+      represent, as a whole, an original work of authorship. For the purposes
 
+      of this License, Derivative Works shall not include works that remain
 
+      separable from, or merely link (or bind by name) to the interfaces of,
 
+      the Work and Derivative Works thereof.
 
+
 
+      "Contribution" shall mean any work of authorship, including
 
+      the original version of the Work and any modifications or additions
 
+      to that Work or Derivative Works thereof, that is intentionally
 
+      submitted to Licensor for inclusion in the Work by the copyright owner
 
+      or by an individual or Legal Entity authorized to submit on behalf of
 
+      the copyright owner. For the purposes of this definition, "submitted"
 
+      means any form of electronic, verbal, or written communication sent
 
+      to the Licensor or its representatives, including but not limited to
 
+      communication on electronic mailing lists, source code control systems,
 
+      and issue tracking systems that are managed by, or on behalf of, the
 
+      Licensor for the purpose of discussing and improving the Work, but
 
+      excluding communication that is conspicuously marked or otherwise
 
+      designated in writing by the copyright owner as "Not a Contribution."
 
+
 
+      "Contributor" shall mean Licensor and any individual or Legal Entity
 
+      on behalf of whom a Contribution has been received by Licensor and
 
+      subsequently incorporated within the Work.
 
+
 
+   2. Grant of Copyright License. Subject to the terms and conditions of
 
+      this License, each Contributor hereby grants to You a perpetual,
 
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
 
+      copyright license to reproduce, prepare Derivative Works of,
 
+      publicly display, publicly perform, sublicense, and distribute the
 
+      Work and such Derivative Works in Source or Object form.
 
+
 
+   3. Grant of Patent License. Subject to the terms and conditions of
 
+      this License, each Contributor hereby grants to You a perpetual,
 
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
 
+      (except as stated in this section) patent license to make, have made,
 
+      use, offer to sell, sell, import, and otherwise transfer the Work,
 
+      where such license applies only to those patent claims licensable
 
+      by such Contributor that are necessarily infringed by their
 
+      Contribution(s) alone or by combination of their Contribution(s)
 
+      with the Work to which such Contribution(s) was submitted. If You
 
+      institute patent litigation against any entity (including a
 
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
 
+      or a Contribution incorporated within the Work constitutes direct
 
+      or contributory patent infringement, then any patent licenses
 
+      granted to You under this License for that Work shall terminate
 
+      as of the date such litigation is filed.
 
+
 
+   4. Redistribution. You may reproduce and distribute copies of the
 
+      Work or Derivative Works thereof in any medium, with or without
 
+      modifications, and in Source or Object form, provided that You
 
+      meet the following conditions:
 
+
 
+      (a) You must give any other recipients of the Work or
 
+          Derivative Works a copy of this License; and
 
+
 
+      (b) You must cause any modified files to carry prominent notices
 
+          stating that You changed the files; and
 
+
 
+      (c) You must retain, in the Source form of any Derivative Works
 
+          that You distribute, all copyright, patent, trademark, and
 
+          attribution notices from the Source form of the Work,
 
+          excluding those notices that do not pertain to any part of
 
+          the Derivative Works; and
 
+
 
+      (d) If the Work includes a "NOTICE" text file as part of its
 
+          distribution, then any Derivative Works that You distribute must
 
+          include a readable copy of the attribution notices contained
 
+          within such NOTICE file, excluding those notices that do not
 
+          pertain to any part of the Derivative Works, in at least one
 
+          of the following places: within a NOTICE text file distributed
 
+          as part of the Derivative Works; within the Source form or
 
+          documentation, if provided along with the Derivative Works; or,
 
+          within a display generated by the Derivative Works, if and
 
+          wherever such third-party notices normally appear. The contents
 
+          of the NOTICE file are for informational purposes only and
 
+          do not modify the License. You may add Your own attribution
 
+          notices within Derivative Works that You distribute, alongside
 
+          or as an addendum to the NOTICE text from the Work, provided
 
+          that such additional attribution notices cannot be construed
 
+          as modifying the License.
 
+
 
+      You may add Your own copyright statement to Your modifications and
 
+      may provide additional or different license terms and conditions
 
+      for use, reproduction, or distribution of Your modifications, or
 
+      for any such Derivative Works as a whole, provided Your use,
 
+      reproduction, and distribution of the Work otherwise complies with
 
+      the conditions stated in this License.
 
+
 
+   5. Submission of Contributions. Unless You explicitly state otherwise,
 
+      any Contribution intentionally submitted for inclusion in the Work
 
+      by You to the Licensor shall be under the terms and conditions of
 
+      this License, without any additional terms or conditions.
 
+      Notwithstanding the above, nothing herein shall supersede or modify
 
+      the terms of any separate license agreement you may have executed
 
+      with Licensor regarding such Contributions.
 
+
 
+   6. Trademarks. This License does not grant permission to use the trade
 
+      names, trademarks, service marks, or product names of the Licensor,
 
+      except as required for reasonable and customary use in describing the
 
+      origin of the Work and reproducing the content of the NOTICE file.
 
+
 
+   7. Disclaimer of Warranty. Unless required by applicable law or
 
+      agreed to in writing, Licensor provides the Work (and each
 
+      Contributor provides its Contributions) on an "AS IS" BASIS,
 
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 
+      implied, including, without limitation, any warranties or conditions
 
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
 
+      PARTICULAR PURPOSE. You are solely responsible for determining the
 
+      appropriateness of using or redistributing the Work and assume any
 
+      risks associated with Your exercise of permissions under this License.
 
+
 
+   8. Limitation of Liability. In no event and under no legal theory,
 
+      whether in tort (including negligence), contract, or otherwise,
 
+      unless required by applicable law (such as deliberate and grossly
 
+      negligent acts) or agreed to in writing, shall any Contributor be
 
+      liable to You for damages, including any direct, indirect, special,
 
+      incidental, or consequential damages of any character arising as a
 
+      result of this License or out of the use or inability to use the
 
+      Work (including but not limited to damages for loss of goodwill,
 
+      work stoppage, computer failure or malfunction, or any and all
 
+      other commercial damages or losses), even if such Contributor
 
+      has been advised of the possibility of such damages.
 
+
 
+   9. Accepting Warranty or Additional Liability. While redistributing
 
+      the Work or Derivative Works thereof, You may choose to offer,
 
+      and charge a fee for, acceptance of support, warranty, indemnity,
 
+      or other liability obligations and/or rights consistent with this
 
+      License. However, in accepting such obligations, You may act only
 
+      on Your own behalf and on Your sole responsibility, not on behalf
 
+      of any other Contributor, and only if You agree to indemnify,
 
+      defend, and hold each Contributor harmless for any liability
 
+      incurred by, or claims asserted against, such Contributor by reason
 
+      of your accepting any such warranty or additional liability.
 
+
 
+   END OF TERMS AND CONDITIONS
 
+
 
+   APPENDIX: How to apply the Apache License to your work.
 
+
 
+      To apply the Apache License to your work, attach the following
 
+      boilerplate notice, with the fields enclosed by brackets "{}"
 
+      replaced with your own identifying information. (Don't include
 
+      the brackets!)  The text should be enclosed in the appropriate
 
+      comment syntax for the file format. We also recommend that a
 
+      file or class name and description of purpose be included on the
 
+      same "printed page" as the copyright notice for easier
 
+      identification within third-party archives.
 
+
 
+   Copyright {yyyy} {name of copyright owner}
 
+
 
+   Licensed under the Apache License, Version 2.0 (the "License");
 
+   you may not use this file except in compliance with the License.
 
+   You may obtain a copy of the License at
 
+
 
+       http://www.apache.org/licenses/LICENSE-2.0
 
+
 
+   Unless required by applicable law or agreed to in writing, software
 
+   distributed under the License is distributed on an "AS IS" BASIS,
 
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+   See the License for the specific language governing permissions and
 
+   limitations under the License.

+ 183 - 0
vendor/github.com/go-logr/logr/README.md
Просмотреть файл 

@@ -0,0 +1,183 @@
 
+# A more minimal logging API for Go
 
+
 
+Before you consider this package, please read [this blog post by the
 
+inimitable Dave Cheney][warning-makes-no-sense].  I really appreciate what
 
+he has to say, and it largely aligns with my own experiences.  Too many
 
+choices of levels means inconsistent logs.
 
+
 
+This package offers a purely abstract interface, based on these ideas but with
 
+a few twists.  Code can depend on just this interface and have the actual
 
+logging implementation be injected from callers.  Ideally only `main()` knows
 
+what logging implementation is being used.
 
+
 
+# Differences from Dave's ideas
 
+
 
+The main differences are:
 
+
 
+1) Dave basically proposes doing away with the notion of a logging API in favor
 
+of `fmt.Printf()`.  I disagree, especially when you consider things like output
 
+locations, timestamps, file and line decorations, and structured logging.  I
 
+restrict the API to just 2 types of logs: info and error.
 
+
 
+Info logs are things you want to tell the user which are not errors.  Error
 
+logs are, well, errors.  If your code receives an `error` from a subordinate
 
+function call and is logging that `error` *and not returning it*, use error
 
+logs.
 
+
 
+2) Verbosity-levels on info logs.  This gives developers a chance to indicate
 
+arbitrary grades of importance for info logs, without assigning names with
 
+semantic meaning such as "warning", "trace", and "debug".  Superficially this
 
+may feel very similar, but the primary difference is the lack of semantics.
 
+Because verbosity is a numerical value, it's safe to assume that an app running
 
+with higher verbosity means more (and less important) logs will be generated.
 
+
 
+This is a BETA grade API.
 
+
 
+There are implementations for the following logging libraries:
 
+
 
+- **github.com/google/glog**: [glogr](https://github.com/go-logr/glogr)
 
+- **k8s.io/klog**: [klogr](https://git.k8s.io/klog/klogr)
 
+- **go.uber.org/zap**: [zapr](https://github.com/go-logr/zapr)
 
+- **log** (the Go standard library logger):
 
+  [stdr](https://github.com/go-logr/stdr)
 
+- **github.com/sirupsen/logrus**: [logrusr](https://github.com/bombsimon/logrusr)
 
+- **github.com/wojas/genericr**: [genericr](https://github.com/wojas/genericr) (makes it easy to implement your own backend)
 
+- **logfmt** (Heroku style [logging](https://www.brandur.org/logfmt)): [logfmtr](https://github.com/iand/logfmtr)
 
+
 
+# FAQ
 
+
 
+## Conceptual
 
+
 
+## Why structured logging?
 
+
 
+- **Structured logs are more easily queriable**: Since you've got
 
+  key-value pairs, it's much easier to query your structured logs for
 
+  particular values by filtering on the contents of a particular key --
 
+  think searching request logs for error codes, Kubernetes reconcilers for
 
+  the name and namespace of the reconciled object, etc
 
+
 
+- **Structured logging makes it easier to have cross-referencable logs**:
 
+  Similarly to searchability, if you maintain conventions around your
 
+  keys, it becomes easy to gather all log lines related to a particular
 
+  concept.
 
+ 
+- **Structured logs allow better dimensions of filtering**: if you have
 
+  structure to your logs, you've got more precise control over how much
 
+  information is logged -- you might choose in a particular configuration
 
+  to log certain keys but not others, only log lines where a certain key
 
+  matches a certain value, etc, instead of just having v-levels and names
 
+  to key off of.
 
+
 
+- **Structured logs better represent structured data**: sometimes, the
 
+  data that you want to log is inherently structured (think tuple-link
 
+  objects).  Structured logs allow you to preserve that structure when
 
+  outputting.
 
+
 
+## Why V-levels?
 
+
 
+**V-levels give operators an easy way to control the chattiness of log
 
+operations**.  V-levels provide a way for a given package to distinguish
 
+the relative importance or verbosity of a given log message.  Then, if
 
+a particular logger or package is logging too many messages, the user
 
+of the package can simply change the v-levels for that library. 
+
 
+## Why not more named levels, like Warning?
 
+
 
+Read [Dave Cheney's post][warning-makes-no-sense].  Then read [Differences
 
+from Dave's ideas](#differences-from-daves-ideas).
 
+
 
+## Why not allow format strings, too?
 
+
 
+**Format strings negate many of the benefits of structured logs**:
 
+
 
+- They're not easily searchable without resorting to fuzzy searching,
 
+  regular expressions, etc
 
+
 
+- They don't store structured data well, since contents are flattened into
 
+  a string
 
+
 
+- They're not cross-referencable
 
+
 
+- They don't compress easily, since the message is not constant
 
+
 
+(unless you turn positional parameters into key-value pairs with numerical
 
+keys, at which point you've gotten key-value logging with meaningless
 
+keys)
 
+
 
+## Practical
 
+
 
+## Why key-value pairs, and not a map?
 
+
 
+Key-value pairs are *much* easier to optimize, especially around
 
+allocations.  Zap (a structured logger that inspired logr's interface) has
 
+[performance measurements](https://github.com/uber-go/zap#performance)
 
+that show this quite nicely.
 
+
 
+While the interface ends up being a little less obvious, you get
 
+potentially better performance, plus avoid making users type
 
+`map[string]string{}` every time they want to log.
 
+
 
+## What if my V-levels differ between libraries?
 
+
 
+That's fine.  Control your V-levels on a per-logger basis, and use the
 
+`WithName` function to pass different loggers to different libraries.
 
+
 
+Generally, you should take care to ensure that you have relatively
 
+consistent V-levels within a given logger, however, as this makes deciding
 
+on what verbosity of logs to request easier.
 
+
 
+## But I *really* want to use a format string!
 
+
 
+That's not actually a question.  Assuming your question is "how do
 
+I convert my mental model of logging with format strings to logging with
 
+constant messages":
 
+
 
+1. figure out what the error actually is, as you'd write in a TL;DR style,
 
+   and use that as a message
 
+
 
+2. For every place you'd write a format specifier, look to the word before
 
+   it, and add that as a key value pair
 
+
 
+For instance, consider the following examples (all taken from spots in the
 
+Kubernetes codebase):
 
+
 
+- `klog.V(4).Infof("Client is returning errors: code %v, error %v",
 
+  responseCode, err)` becomes `logger.Error(err, "client returned an
 
+  error", "code", responseCode)`
 
+
 
+- `klog.V(4).Infof("Got a Retry-After %ds response for attempt %d to %v",
 
+  seconds, retries, url)` becomes `logger.V(4).Info("got a retry-after
 
+  response when requesting url", "attempt", retries, "after
 
+  seconds", seconds, "url", url)`
 
+
 
+If you *really* must use a format string, place it as a key value, and
 
+call `fmt.Sprintf` yourself -- for instance, `log.Printf("unable to
 
+reflect over type %T")` becomes `logger.Info("unable to reflect over
 
+type", "type", fmt.Sprintf("%T"))`.  In general though, the cases where
 
+this is necessary should be few and far between.
 
+
 
+## How do I choose my V-levels?
 
+
 
+This is basically the only hard constraint: increase V-levels to denote
 
+more verbose or more debug-y logs.
 
+
 
+Otherwise, you can start out with `0` as "you always want to see this",
 
+`1` as "common logging that you might *possibly* want to turn off", and
 
+`10` as "I would like to performance-test your log collection stack".
 
+
 
+Then gradually choose levels in between as you need them, working your way
 
+down from 10 (for debug and trace style logs) and up from 1 (for chattier
 
+info-type logs).
 
+
 
+## How do I choose my keys
 
+
 
+- make your keys human-readable
 
+- constant keys are generally a good idea
 
+- be consistent across your codebase
 
+- keys should naturally match parts of the message string
 
+
 
+While key names are mostly unrestricted (and spaces are acceptable),
 
+it's generally a good idea to stick to printable ascii characters, or at
 
+least match the general character set of your log lines.
 
+
 
+[warning-makes-no-sense]: http://dave.cheney.net/2015/11/05/lets-talk-about-logging

+ 51 - 0
vendor/github.com/go-logr/logr/discard.go
Просмотреть файл 

@@ -0,0 +1,51 @@
 
+/*
 
+Copyright 2020 The logr Authors.
 
+
 
+Licensed under the Apache License, Version 2.0 (the "License");
 
+you may not use this file except in compliance with the License.
 
+You may obtain a copy of the License at
 
+
 
+    http://www.apache.org/licenses/LICENSE-2.0
 
+
 
+Unless required by applicable law or agreed to in writing, software
 
+distributed under the License is distributed on an "AS IS" BASIS,
 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+See the License for the specific language governing permissions and
 
+limitations under the License.
 
+*/
 
+
 
+package logr
 
+
 
+// Discard returns a valid Logger that discards all messages logged to it.
 
+// It can be used whenever the caller is not interested in the logs.
 
+func Discard() Logger {
 
+	return DiscardLogger{}
 
+}
 
+
 
+// DiscardLogger is a Logger that discards all messages.
 
+type DiscardLogger struct{}
 
+
 
+func (l DiscardLogger) Enabled() bool {
 
+	return false
 
+}
 
+
 
+func (l DiscardLogger) Info(msg string, keysAndValues ...interface{}) {
 
+}
 
+
 
+func (l DiscardLogger) Error(err error, msg string, keysAndValues ...interface{}) {
 
+}
 
+
 
+func (l DiscardLogger) V(level int) Logger {
 
+	return l
 
+}
 
+
 
+func (l DiscardLogger) WithValues(keysAndValues ...interface{}) Logger {
 
+	return l
 
+}
 
+
 
+func (l DiscardLogger) WithName(name string) Logger {
 
+	return l
 
+}
 
+
 
+// Verify that it actually implements the interface
 
+var _ Logger = DiscardLogger{}

+ 3 - 0
vendor/github.com/go-logr/logr/go.mod
Просмотреть файл 

@@ -0,0 +1,3 @@
 
+module github.com/go-logr/logr
 
+
 
+go 1.14

+ 266 - 0
vendor/github.com/go-logr/logr/logr.go
Просмотреть файл 

@@ -0,0 +1,266 @@
 
+/*
 
+Copyright 2019 The logr Authors.
 
+
 
+Licensed under the Apache License, Version 2.0 (the "License");
 
+you may not use this file except in compliance with the License.
 
+You may obtain a copy of the License at
 
+
 
+    http://www.apache.org/licenses/LICENSE-2.0
 
+
 
+Unless required by applicable law or agreed to in writing, software
 
+distributed under the License is distributed on an "AS IS" BASIS,
 
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+See the License for the specific language governing permissions and
 
+limitations under the License.
 
+*/
 
+
 
+// This design derives from Dave Cheney's blog:
 
+//     http://dave.cheney.net/2015/11/05/lets-talk-about-logging
 
+//
 
+// This is a BETA grade API.  Until there is a significant 2nd implementation,
 
+// I don't really know how it will change.
 
+
 
+// Package logr defines abstract interfaces for logging.  Packages can depend on
 
+// these interfaces and callers can implement logging in whatever way is
 
+// appropriate.
 
+//
 
+// Usage
 
+//
 
+// Logging is done using a Logger.  Loggers can have name prefixes and named
 
+// values attached, so that all log messages logged with that Logger have some
 
+// base context associated.
 
+//
 
+// The term "key" is used to refer to the name associated with a particular
 
+// value, to disambiguate it from the general Logger name.
 
+//
 
+// For instance, suppose we're trying to reconcile the state of an object, and
 
+// we want to log that we've made some decision.
 
+//
 
+// With the traditional log package, we might write:
 
+//   log.Printf("decided to set field foo to value %q for object %s/%s",
 
+//       targetValue, object.Namespace, object.Name)
 
+//
 
+// With logr's structured logging, we'd write:
 
+//   // elsewhere in the file, set up the logger to log with the prefix of
 
+//   // "reconcilers", and the named value target-type=Foo, for extra context.
 
+//   log := mainLogger.WithName("reconcilers").WithValues("target-type", "Foo")
 
+//
 
+//   // later on...
 
+//   log.Info("setting foo on object", "value", targetValue, "object", object)
 
+//
 
+// Depending on our logging implementation, we could then make logging decisions
 
+// based on field values (like only logging such events for objects in a certain
 
+// namespace), or copy the structured information into a structured log store.
 
+//
 
+// For logging errors, Logger has a method called Error.  Suppose we wanted to
 
+// log an error while reconciling.  With the traditional log package, we might
 
+// write:
 
+//   log.Errorf("unable to reconcile object %s/%s: %v", object.Namespace, object.Name, err)
 
+//
 
+// With logr, we'd instead write:
 
+//   // assuming the above setup for log
 
+//   log.Error(err, "unable to reconcile object", "object", object)
 
+//
 
+// This functions similarly to:
 
+//   log.Info("unable to reconcile object", "error", err, "object", object)
 
+//
 
+// However, it ensures that a standard key for the error value ("error") is used
 
+// across all error logging.  Furthermore, certain implementations may choose to
 
+// attach additional information (such as stack traces) on calls to Error, so
 
+// it's preferred to use Error to log errors.
 
+//
 
+// Parts of a log line
 
+//
 
+// Each log message from a Logger has four types of context:
 
+// logger name, log verbosity, log message, and the named values.
 
+//
 
+// The Logger name consists of a series of name "segments" added by successive
 
+// calls to WithName.  These name segments will be joined in some way by the
 
+// underlying implementation.  It is strongly recommended that name segments
 
+// contain simple identifiers (letters, digits, and hyphen), and do not contain
 
+// characters that could muddle the log output or confuse the joining operation
 
+// (e.g.  whitespace, commas, periods, slashes, brackets, quotes, etc).
 
+//
 
+// Log verbosity represents how little a log matters.  Level zero, the default,
 
+// matters most.  Increasing levels matter less and less.  Try to avoid lots of
 
+// different verbosity levels, and instead provide useful keys, logger names,
 
+// and log messages for users to filter on.  It's illegal to pass a log level
 
+// below zero.
 
+//
 
+// The log message consists of a constant message attached to the log line.
 
+// This should generally be a simple description of what's occurring, and should
 
+// never be a format string.
 
+//
 
+// Variable information can then be attached using named values (key/value
 
+// pairs).  Keys are arbitrary strings, while values may be any Go value.
 
+//
 
+// Key Naming Conventions
 
+//
 
+// Keys are not strictly required to conform to any specification or regex, but
 
+// it is recommended that they:
 
+//   * be human-readable and meaningful (not auto-generated or simple ordinals)
 
+//   * be constant (not dependent on input data)
 
+//   * contain only printable characters
 
+//   * not contain whitespace or punctuation
 
+//
 
+// These guidelines help ensure that log data is processed properly regardless
 
+// of the log implementation.  For example, log implementations will try to
 
+// output JSON data or will store data for later database (e.g. SQL) queries.
 
+//
 
+// While users are generally free to use key names of their choice, it's
 
+// generally best to avoid using the following keys, as they're frequently used
 
+// by implementations:
 
+//
 
+//   * `"caller"`: the calling information (file/line) of a particular log line.
 
+//   * `"error"`: the underlying error value in the `Error` method.
 
+//   * `"level"`: the log level.
 
+//   * `"logger"`: the name of the associated logger.
 
+//   * `"msg"`: the log message.
 
+//   * `"stacktrace"`: the stack trace associated with a particular log line or
 
+//                     error (often from the `Error` message).
 
+//   * `"ts"`: the timestamp for a log line.
 
+//
 
+// Implementations are encouraged to make use of these keys to represent the
 
+// above concepts, when necessary (for example, in a pure-JSON output form, it
 
+// would be necessary to represent at least message and timestamp as ordinary
 
+// named values).
 
+//
 
+// Implementations may choose to give callers access to the underlying
 
+// logging implementation.  The recommended pattern for this is:
 
+//   // Underlier exposes access to the underlying logging implementation.
 
+//   // Since callers only have a logr.Logger, they have to know which
 
+//   // implementation is in use, so this interface is less of an abstraction
 
+//   // and more of way to test type conversion.
 
+//   type Underlier interface {
 
+//       GetUnderlying() <underlying-type>
 
+//   }
 
+package logr
 
+
 
+import (
 
+	"context"
 
+)
 
+
 
+// TODO: consider adding back in format strings if they're really needed
 
+// TODO: consider other bits of zap/zapcore functionality like ObjectMarshaller (for arbitrary objects)
 
+// TODO: consider other bits of glog functionality like Flush, OutputStats
 
+
 
+// Logger represents the ability to log messages, both errors and not.
 
+type Logger interface {
 
+	// Enabled tests whether this Logger is enabled.  For example, commandline
 
+	// flags might be used to set the logging verbosity and disable some info
 
+	// logs.
 
+	Enabled() bool
 
+
 
+	// Info logs a non-error message with the given key/value pairs as context.
 
+	//
 
+	// The msg argument should be used to add some constant description to
 
+	// the log line.  The key/value pairs can then be used to add additional
 
+	// variable information.  The key/value pairs should alternate string
 
+	// keys and arbitrary values.
 
+	Info(msg string, keysAndValues ...interface{})
 
+
 
+	// Error logs an error, with the given message and key/value pairs as context.
 
+	// It functions similarly to calling Info with the "error" named value, but may
 
+	// have unique behavior, and should be preferred for logging errors (see the
 
+	// package documentations for more information).
 
+	//
 
+	// The msg field should be used to add context to any underlying error,
 
+	// while the err field should be used to attach the actual error that
 
+	// triggered this log line, if present.
 
+	Error(err error, msg string, keysAndValues ...interface{})
 
+
 
+	// V returns an Logger value for a specific verbosity level, relative to
 
+	// this Logger.  In other words, V values are additive.  V higher verbosity
 
+	// level means a log message is less important.  It's illegal to pass a log
 
+	// level less than zero.
 
+	V(level int) Logger
 
+
 
+	// WithValues adds some key-value pairs of context to a logger.
 
+	// See Info for documentation on how key/value pairs work.
 
+	WithValues(keysAndValues ...interface{}) Logger
 
+
 
+	// WithName adds a new element to the logger's name.
 
+	// Successive calls with WithName continue to append
 
+	// suffixes to the logger's name.  It's strongly recommended
 
+	// that name segments contain only letters, digits, and hyphens
 
+	// (see the package documentation for more information).
 
+	WithName(name string) Logger
 
+}
 
+
 
+// InfoLogger provides compatibility with code that relies on the v0.1.0
 
+// interface.
 
+//
 
+// Deprecated: InfoLogger is an artifact of early versions of this API.  New
 
+// users should never use it and existing users should use Logger instead. This
 
+// will be removed in a future release.
 
+type InfoLogger = Logger
 
+
 
+type contextKey struct{}
 
+
 
+// FromContext returns a Logger constructed from ctx or nil if no
 
+// logger details are found.
 
+func FromContext(ctx context.Context) Logger {
 
+	if v, ok := ctx.Value(contextKey{}).(Logger); ok {
 
+		return v
 
+	}
 
+
 
+	return nil
 
+}
 
+
 
+// FromContextOrDiscard returns a Logger constructed from ctx or a Logger
 
+// that discards all messages if no logger details are found.
 
+func FromContextOrDiscard(ctx context.Context) Logger {
 
+	if v, ok := ctx.Value(contextKey{}).(Logger); ok {
 
+		return v
 
+	}
 
+
 
+	return Discard()
 
+}
 
+
 
+// NewContext returns a new context derived from ctx that embeds the Logger.
 
+func NewContext(ctx context.Context, l Logger) context.Context {
 
+	return context.WithValue(ctx, contextKey{}, l)
 
+}
 
+
 
+// CallDepthLogger represents a Logger that knows how to climb the call stack
 
+// to identify the original call site and can offset the depth by a specified
 
+// number of frames.  This is useful for users who have helper functions
 
+// between the "real" call site and the actual calls to Logger methods.
 
+// Implementations that log information about the call site (such as file,
 
+// function, or line) would otherwise log information about the intermediate
 
+// helper functions.
 
+//
 
+// This is an optional interface and implementations are not required to
 
+// support it.
 
+type CallDepthLogger interface {
 
+	Logger
 
+
 
+	// WithCallDepth returns a Logger that will offset the call stack by the
 
+	// specified number of frames when logging call site information.  If depth
 
+	// is 0 the attribution should be to the direct caller of this method.  If
 
+	// depth is 1 the attribution should skip 1 call frame, and so on.
 
+	// Successive calls to this are additive.
 
+	WithCallDepth(depth int) Logger
 
+}
 
+
 
+// WithCallDepth returns a Logger that will offset the call stack by the
 
+// specified number of frames when logging call site information, if possible.
 
+// This is useful for users who have helper functions between the "real" call
 
+// site and the actual calls to Logger methods.  If depth is 0 the attribution
 
+// should be to the direct caller of this function.  If depth is 1 the
 
+// attribution should skip 1 call frame, and so on.  Successive calls to this
 
+// are additive.
 
+//
 
+// If the underlying log implementation supports the CallDepthLogger interface,
 
+// the WithCallDepth method will be called and the result returned.  If the
 
+// implementation does not support CallDepthLogger, the original Logger will be
 
+// returned.
 
+//
 
+// Callers which care about whether this was supported or not should test for
 
+// CallDepthLogger support themselves.
 
+func WithCallDepth(logger Logger, depth int) Logger {
 
+	if decorator, ok := logger.(CallDepthLogger); ok {
 
+		return decorator.WithCallDepth(depth)
 
+	}
 
+	return logger
 
+}

+ 5 - 5
vendor/github.com/go-openapi/jsonpointer/.travis.yml
Просмотреть файл 

@@ -1,15 +1,15 @@
 
 after_success:
 
 - bash <(curl -s https://codecov.io/bash)
 
 go:
 
-- '1.9'
 
-- 1.10.x
 
 - 1.11.x
 
+- 1.12.x
 
 install:
 
-- go get -u github.com/stretchr/testify/assert
 
-- go get -u github.com/go-openapi/swag
 
+- GO111MODULE=off go get -u gotest.tools/gotestsum
 
+env:
 
+- GO111MODULE=on
 
 language: go
 
 notifications:
 
   slack:
 
     secure: a5VgoiwB1G/AZqzmephPZIhEB9avMlsWSlVnM1dSAtYAwdrQHGTQxAmpOxYIoSPDhWNN5bfZmjd29++UlTwLcHSR+e0kJhH6IfDlsHj/HplNCJ9tyI0zYc7XchtdKgeMxMzBKCzgwFXGSbQGydXTliDNBo0HOzmY3cou/daMFTP60K+offcjS+3LRAYb1EroSRXZqrk1nuF/xDL3792DZUdPMiFR/L/Df6y74D6/QP4sTkTDFQitz4Wy/7jbsfj8dG6qK2zivgV6/l+w4OVjFkxVpPXogDWY10vVXNVynqxfJ7to2d1I9lNCHE2ilBCkWMIPdyJF7hjF8pKW+82yP4EzRh0vu8Xn0HT5MZpQxdRY/YMxNrWaG7SxsoEaO4q5uhgdzAqLYY3TRa7MjIK+7Ur+aqOeTXn6OKwVi0CjvZ6mIU3WUKSwiwkFZMbjRAkSb5CYwMEfGFO/z964xz83qGt6WAtBXNotqCQpTIiKtDHQeLOMfksHImCg6JLhQcWBVxamVgu0G3Pdh8Y6DyPnxraXY95+QDavbjqv7TeYT9T/FNnrkXaTTK0s4iWE5H4ACU0Qvz0wUYgfQrZv0/Hp7V17+rabUwnzYySHCy9SWX/7OV9Cfh31iMp9ZIffr76xmmThtOEqs8TrTtU6BWI3rWwvA9cXQipZTVtL0oswrGw=
 
 script:
 
-- go test -v -race -cover -coverprofile=coverage.txt -covermode=atomic ./...
 
+- gotestsum -f short-verbose -- -race -coverprofile=coverage.txt -covermode=atomic ./...

+ 5 - 6
vendor/github.com/go-openapi/jsonpointer/go.mod
Просмотреть файл 

@@ -1,10 +1,9 @@
 
 module github.com/go-openapi/jsonpointer
 
 
 require (
 
-	github.com/davecgh/go-spew v1.1.1 // indirect
 
-	github.com/go-openapi/swag v0.17.0
 
-	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
 
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 
-	github.com/stretchr/testify v1.2.2
 
-	gopkg.in/yaml.v2 v2.2.1 // indirect
 
+	github.com/go-openapi/swag v0.19.5
 
+	github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
 
+	github.com/stretchr/testify v1.3.0
 
 )
 
+
 
+go 1.13

+ 20 - 7
vendor/github.com/go-openapi/jsonpointer/go.sum
Просмотреть файл 

@@ -1,11 +1,24 @@
 
+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/go-openapi/swag v0.17.0 h1:7wu+dZ5k83kvUWeAb+WUkFiUhDzwGqzTR/NhWzeo1JU=
 
-github.com/go-openapi/swag v0.17.0/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+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/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/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+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/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

+ 1 - 1
vendor/github.com/go-openapi/jsonpointer/pointer.go
Просмотреть файл 

@@ -135,7 +135,7 @@ func getSingleImpl(node interface{}, decodedToken string, nameProvider *swag.Nam
 
 		kv := reflect.ValueOf(decodedToken)
 
 		mv := rValue.MapIndex(kv)
 
 
-		if mv.IsValid() && !swag.IsZero(mv) {
 
+		if mv.IsValid() {
 
 			return mv.Interface(), kind, nil
 
 		}
 
 		return nil, kind, fmt.Errorf("object has no key %q", decodedToken)

+ 5 - 6
vendor/github.com/go-openapi/jsonreference/.travis.yml
Просмотреть файл 

@@ -1,16 +1,15 @@
 
 after_success:
 
 - bash <(curl -s https://codecov.io/bash)
 
 go:
 
-- '1.9'
 
-- 1.10.x
 
 - 1.11.x
 
+- 1.12.x
 
 install:
 
-- go get -u github.com/stretchr/testify/assert
 
-- go get -u github.com/PuerkitoBio/purell
 
-- go get -u github.com/go-openapi/jsonpointer
 
+- GO111MODULE=off go get -u gotest.tools/gotestsum
 
+env:
 
+- GO111MODULE=on
 
 language: go
 
 notifications:
 
   slack:
 
     secure: OpQG/36F7DSF00HLm9WZMhyqFCYYyYTsVDObW226cWiR8PWYiNfLZiSEvIzT1Gx4dDjhigKTIqcLhG34CkL5iNXDjm9Yyo2RYhQPlK8NErNqUEXuBqn4RqYHW48VGhEhOyDd4Ei0E2FN5ZbgpvHgtpkdZ6XDi64r3Ac89isP9aPHXQTuv2Jog6b4/OKKiUTftLcTIst0p4Cp3gqOJWf1wnoj+IadWiECNVQT6zb47IYjtyw6+uV8iUjTzdKcRB6Zc6b4Dq7JAg1Zd7Jfxkql3hlKp4PNlRf9Cy7y5iA3G7MLyg3FcPX5z2kmcyPt2jOTRMBWUJ5zIQpOxizAcN8WsT3WWBL5KbuYK6k0PzujrIDLqdxGpNmjkkMfDBT9cKmZpm2FdW+oZgPFJP+oKmAo4u4KJz/vjiPTXgQlN5bmrLuRMCp+AwC5wkIohTqWZVPE2TK6ZSnMYcg/W39s+RP/9mJoyryAvPSpBOLTI+biCgaUCTOAZxNTWpMFc3tPYntc41WWkdKcooZ9JA5DwfcaVFyTGQ3YXz+HvX6G1z/gW0Q/A4dBi9mj2iE1xm7tRTT+4VQ2AXFvSEI1HJpfPgYnwAtwOD1v3Qm2EUHk9sCdtEDR4wVGEPIVn44GnwFMnGKx9JWppMPYwFu3SVDdHt+E+LOlhZUply11Aa+IVrT2KUQ=
 
 script:
 
-- go test -v -race -cover -coverprofile=coverage.txt -covermode=atomic ./...
 
+- gotestsum -f short-verbose -- -race -coverprofile=coverage.txt -covermode=atomic ./...

+ 7 - 10
vendor/github.com/go-openapi/jsonreference/go.mod
Просмотреть файл 

@@ -1,15 +1,12 @@
 
 module github.com/go-openapi/jsonreference
 
 
 require (
 
-	github.com/PuerkitoBio/purell v1.1.0
 
+	github.com/PuerkitoBio/purell v1.1.1
 
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 
-	github.com/davecgh/go-spew v1.1.1 // indirect
 
-	github.com/go-openapi/jsonpointer v0.17.0
 
-	github.com/go-openapi/swag v0.17.0 // indirect
 
-	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
 
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 
-	github.com/stretchr/testify v1.2.2
 
-	golang.org/x/net v0.0.0-20181005035420-146acd28ed58 // indirect
 
-	golang.org/x/text v0.3.0 // indirect
 
-	gopkg.in/yaml.v2 v2.2.1 // indirect
 
+	github.com/go-openapi/jsonpointer v0.19.3
 
+	github.com/stretchr/testify v1.3.0
 
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 
+	golang.org/x/text v0.3.2 // indirect
 
 )
 
+
 
+go 1.13

+ 37 - 13
vendor/github.com/go-openapi/jsonreference/go.sum
Просмотреть файл 

@@ -1,20 +1,44 @@
 
-github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 
+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/go-openapi/jsonpointer v0.17.0 h1:Bpl2DtZ6k7wKqfFs7e+4P08+M9I3FQgn09a1UsRUQbk=
 
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 
-github.com/go-openapi/swag v0.17.0 h1:7wu+dZ5k83kvUWeAb+WUkFiUhDzwGqzTR/NhWzeo1JU=
 
-github.com/go-openapi/swag v0.17.0/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
 
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 
+github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
 
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+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/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/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+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/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE=
 
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
 
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

+ 6 - 1
vendor/github.com/go-openapi/spec/.golangci.yml
Просмотреть файл 

@@ -8,7 +8,7 @@ linters-settings:
 
   maligned:
 
     suggest-new: true
 
   dupl:
 
-    threshold: 100
 
+    threshold: 200
 
   goconst:
 
     min-len: 2
 
     min-occurrences: 2
 
@@ -21,3 +21,8 @@ linters:
 
     - lll
 
     - gochecknoinits
 
     - gochecknoglobals
 
+    - funlen
 
+    - godox
 
+    - gocognit
 
+    - whitespace
 
+    - wsl

+ 5 - 8
vendor/github.com/go-openapi/spec/.travis.yml
Просмотреть файл 

@@ -1,18 +1,15 @@
 
 after_success:
 
 - bash <(curl -s https://codecov.io/bash)
 
 go:
 
-- '1.9'
 
-- 1.10.x
 
 - 1.11.x
 
+- 1.12.x
 
 install:
 
-- go get -u github.com/stretchr/testify
 
-- go get -u github.com/go-openapi/swag
 
-- go get -u gopkg.in/yaml.v2
 
-- go get -u github.com/go-openapi/jsonpointer
 
-- go get -u github.com/go-openapi/jsonreference
 
+- GO111MODULE=off go get -u gotest.tools/gotestsum
 
+env:
 
+- GO111MODULE=on
 
 language: go
 
 notifications:
 
   slack:
 
     secure: QUWvCkBBK09GF7YtEvHHVt70JOkdlNBG0nIKu/5qc4/nW5HP8I2w0SEf/XR2je0eED1Qe3L/AfMCWwrEj+IUZc3l4v+ju8X8R3Lomhme0Eb0jd1MTMCuPcBT47YCj0M7RON7vXtbFfm1hFJ/jLe5+9FXz0hpXsR24PJc5ZIi/ogNwkaPqG4BmndzecpSh0vc2FJPZUD9LT0I09REY/vXR0oQAalLkW0asGD5taHZTUZq/kBpsNxaAFrLM23i4mUcf33M5fjLpvx5LRICrX/57XpBrDh2TooBU6Qj3CgoY0uPRYUmSNxbVx1czNzl2JtEpb5yjoxfVPQeg0BvQM00G8LJINISR+ohrjhkZmAqchDupAX+yFrxTtORa78CtnIL6z/aTNlgwwVD8kvL/1pFA/JWYmKDmz93mV/+6wubGzNSQCstzjkFA4/iZEKewKUoRIAi/fxyscP6L/rCpmY/4llZZvrnyTqVbt6URWpopUpH4rwYqreXAtJxJsfBJIeSmUIiDIOMGkCTvyTEW3fWGmGoqWtSHLoaWDyAIGb7azb+KvfpWtEcoPFWfSWU+LGee0A/YsUhBl7ADB9A0CJEuR8q4BPpKpfLwPKSiKSAXL7zDkyjExyhtgqbSl2jS+rKIHOZNL8JkCcTP2MKMVd563C5rC5FMKqu3S9m2b6380E=
 
 script:
 
-- go test -v -race -cover -coverprofile=coverage.txt -covermode=atomic ./...
 
+- gotestsum -f short-verbose -- -race -coverprofile=coverage.txt -covermode=atomic ./...

Разница между файлами не показана из-за своего большого размера
+ 3 - 3
vendor/github.com/go-openapi/spec/bindata.go


+ 4 - 3
vendor/github.com/go-openapi/spec/expander.go
Просмотреть файл 

@@ -452,11 +452,12 @@ func expandPathItem(pathItem *PathItem, resolver *schemaLoader, basePath string)
 
 		return err
 
 	}
 
 	if pathItem.Ref.String() != "" {
 
-		var err error
 
-		resolver, err = resolver.transitiveResolver(basePath, pathItem.Ref)
 
-		if resolver.shouldStopOnError(err) {
 
+		transitiveResolver, err := resolver.transitiveResolver(basePath, pathItem.Ref)
 
+		if transitiveResolver.shouldStopOnError(err) {
 
 			return err
 
 		}
 
+		basePath = transitiveResolver.updateBasePath(resolver, basePath)
 
+		resolver = transitiveResolver
 
 	}
 
 	pathItem.Ref = Ref{}

+ 8 - 12
vendor/github.com/go-openapi/spec/go.mod
Просмотреть файл 

@@ -1,16 +1,12 @@
 
 module github.com/go-openapi/spec
 
 
 require (
 
-	github.com/PuerkitoBio/purell v1.1.0 // indirect
 
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 
-	github.com/davecgh/go-spew v1.1.1 // indirect
 
-	github.com/go-openapi/jsonpointer v0.17.0
 
-	github.com/go-openapi/jsonreference v0.17.0
 
-	github.com/go-openapi/swag v0.17.0
 
-	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
 
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 
-	github.com/stretchr/testify v1.2.2
 
-	golang.org/x/net v0.0.0-20181005035420-146acd28ed58 // indirect
 
-	golang.org/x/text v0.3.0 // indirect
 
-	gopkg.in/yaml.v2 v2.2.1
 
+	github.com/go-openapi/jsonpointer v0.19.3
 
+	github.com/go-openapi/jsonreference v0.19.2
 
+	github.com/go-openapi/swag v0.19.5
 
+	github.com/stretchr/testify v1.3.0
 
+	golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect
 
+	gopkg.in/yaml.v2 v2.2.4
 
 )
 
+
 
+go 1.13

+ 42 - 15
vendor/github.com/go-openapi/spec/go.sum
Просмотреть файл 

@@ -1,22 +1,49 @@
 
-github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
 
-github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
+github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 
+github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 
+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/go-openapi/jsonpointer v0.17.0 h1:Bpl2DtZ6k7wKqfFs7e+4P08+M9I3FQgn09a1UsRUQbk=
 
-github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 
-github.com/go-openapi/jsonreference v0.17.0 h1:d/o7/fsLWWQZACbihvZxcyLQ59jfUVs7WOJv/ak7T7A=
 
-github.com/go-openapi/jsonreference v0.17.0/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 
-github.com/go-openapi/swag v0.17.0 h1:7wu+dZ5k83kvUWeAb+WUkFiUhDzwGqzTR/NhWzeo1JU=
 
-github.com/go-openapi/swag v0.17.0/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/go-openapi/jsonpointer v0.19.2 h1:A9+F4Dc/MCNB5jibxf6rRvOvR/iFgQdyNx9eIhnGqq0=
 
+github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 
+github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 
+github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 
+github.com/go-openapi/jsonreference v0.19.2 h1:o20suLFB4Ri0tuzpWtyHlh7E7HnkqTNLq6aR6WVNS1w=
 
+github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
 
+github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88dE=
 
+github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 
+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/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/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+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/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58 h1:otZG8yDCO4LVps5+9bxOeNiCvgmOyt96J3roHTYs7oE=
 
-golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 h1:dfGZHvZk057jK2MCeWus/TowKpJ8y4AmooUzdBSR9GU=
 
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM=
 
+golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 
+golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

+ 7 - 0
vendor/github.com/go-openapi/spec/items.go
Просмотреть файл 

@@ -29,6 +29,7 @@ const (
 
 // SimpleSchema describe swagger simple schemas for parameters and headers
 
 type SimpleSchema struct {
 
 	Type             string      `json:"type,omitempty"`
 
+	Nullable         bool        `json:"nullable,omitempty"`
 
 	Format           string      `json:"format,omitempty"`
 
 	Items            *Items      `json:"items,omitempty"`
 
 	CollectionFormat string      `json:"collectionFormat,omitempty"`
 
@@ -91,6 +92,12 @@ func (i *Items) Typed(tpe, format string) *Items {
 
 	return i
 
 }
 
 
+// AsNullable flags this schema as nullable.
 
+func (i *Items) AsNullable() *Items {
 
+	i.Nullable = true
 
+	return i
 
+}
 
+
 
 // CollectionOf a fluent builder method for an array item
 
 func (i *Items) CollectionOf(items *Items, format string) *Items {
 
 	i.Type = jsonArray

+ 2 - 0
vendor/github.com/go-openapi/spec/ref.go
Просмотреть файл 

@@ -68,10 +68,12 @@ func (r *Ref) IsValidURI(basepaths ...string) bool {
 
 	}
 
 
 	if r.HasFullURL {
 
+		//#nosec
 
 		rr, err := http.Get(v)
 
 		if err != nil {
 
 			return false
 
 		}
 
+		defer rr.Body.Close()
 
 
 		return rr.StatusCode/100 == 2
 
 	}

+ 7 - 0
vendor/github.com/go-openapi/spec/schema.go
Просмотреть файл 

@@ -163,6 +163,7 @@ type SchemaProps struct {
 
 	Schema               SchemaURL         `json:"-"`
 
 	Description          string            `json:"description,omitempty"`
 
 	Type                 StringOrArray     `json:"type,omitempty"`
 
+	Nullable             bool              `json:"nullable,omitempty"`
 
 	Format               string            `json:"format,omitempty"`
 
 	Title                string            `json:"title,omitempty"`
 
 	Default              interface{}       `json:"default,omitempty"`
 
@@ -302,6 +303,12 @@ func (s *Schema) AddType(tpe, format string) *Schema {
 
 	return s
 
 }
 
 
+// AsNullable flags this schema as nullable.
 
+func (s *Schema) AsNullable() *Schema {
 
+	s.Nullable = true
 
+	return s
 
+}
 
+
 
 // CollectionOf a fluent builder method for an array parameter
 
 func (s *Schema) CollectionOf(items Schema) *Schema {
 
 	s.Type = []string{jsonArray}

+ 2 - 6
vendor/github.com/go-openapi/spec/schema_loader.go
Просмотреть файл 

@@ -86,12 +86,7 @@ func (r *schemaLoader) transitiveResolver(basePath string, ref Ref) (*schemaLoad
 
 	newOptions := r.options
 
 	newOptions.RelativeBase = rootURL.String()
 
 	debugLog("setting new root: %s", newOptions.RelativeBase)
 
-	resolver, err := defaultSchemaLoader(root, newOptions, r.cache, r.context)
 
-	if err != nil {
 
-		return nil, err
 
-	}
 
-
 
-	return resolver, nil
 
+	return defaultSchemaLoader(root, newOptions, r.cache, r.context)
 
 }
 
 
 func (r *schemaLoader) updateBasePath(transitive *schemaLoader, basePath string) string {
 
@@ -160,6 +155,7 @@ func (r *schemaLoader) load(refURL *url.URL) (interface{}, url.URL, bool, error)
 
 	if !fromCache {
 
 		b, err := r.loadDoc(normalized)
 
 		if err != nil {
 
+			debugLog("unable to load the document: %v", err)
 
 			return nil, url.URL{}, false, err
 
 		}

+ 124 - 0
vendor/github.com/go-openapi/spec/swagger.go
Просмотреть файл 

@@ -15,6 +15,8 @@
 
 package spec
 
 
 import (
 
+	"bytes"
 
+	"encoding/gob"
 
 	"encoding/json"
 
 	"fmt"
 
 	"strconv"
 
@@ -68,6 +70,36 @@ func (s *Swagger) UnmarshalJSON(data []byte) error {
 
 	return nil
 
 }
 
 
+// GobEncode provides a safe gob encoder for Swagger, including extensions
 
+func (s Swagger) GobEncode() ([]byte, error) {
 
+	var b bytes.Buffer
 
+	raw := struct {
 
+		Props SwaggerProps
 
+		Ext   VendorExtensible
 
+	}{
 
+		Props: s.SwaggerProps,
 
+		Ext:   s.VendorExtensible,
 
+	}
 
+	err := gob.NewEncoder(&b).Encode(raw)
 
+	return b.Bytes(), err
 
+}
 
+
 
+// GobDecode provides a safe gob decoder for Swagger, including extensions
 
+func (s *Swagger) GobDecode(b []byte) error {
 
+	var raw struct {
 
+		Props SwaggerProps
 
+		Ext   VendorExtensible
 
+	}
 
+	buf := bytes.NewBuffer(b)
 
+	err := gob.NewDecoder(buf).Decode(&raw)
 
+	if err != nil {
 
+		return err
 
+	}
 
+	s.SwaggerProps = raw.Props
 
+	s.VendorExtensible = raw.Ext
 
+	return nil
 
+}
 
+
 
 // SwaggerProps captures the top-level properties of an Api specification
 
 //
 
 // NOTE: validation rules
 
@@ -93,6 +125,98 @@ type SwaggerProps struct {
 
 	ExternalDocs        *ExternalDocumentation `json:"externalDocs,omitempty"`
 
 }
 
 
+type swaggerPropsAlias SwaggerProps
 
+
 
+type gobSwaggerPropsAlias struct {
 
+	Security []map[string]struct {
 
+		List []string
 
+		Pad  bool
 
+	}
 
+	Alias           *swaggerPropsAlias
 
+	SecurityIsEmpty bool
 
+}
 
+
 
+// GobEncode provides a safe gob encoder for SwaggerProps, including empty security requirements
 
+func (o SwaggerProps) GobEncode() ([]byte, error) {
 
+	raw := gobSwaggerPropsAlias{
 
+		Alias: (*swaggerPropsAlias)(&o),
 
+	}
 
+
 
+	var b bytes.Buffer
 
+	if o.Security == nil {
 
+		// nil security requirement
 
+		err := gob.NewEncoder(&b).Encode(raw)
 
+		return b.Bytes(), err
 
+	}
 
+
 
+	if len(o.Security) == 0 {
 
+		// empty, but non-nil security requirement
 
+		raw.SecurityIsEmpty = true
 
+		raw.Alias.Security = nil
 
+		err := gob.NewEncoder(&b).Encode(raw)
 
+		return b.Bytes(), err
 
+	}
 
+
 
+	raw.Security = make([]map[string]struct {
 
+		List []string
 
+		Pad  bool
 
+	}, 0, len(o.Security))
 
+	for _, req := range o.Security {
 
+		v := make(map[string]struct {
 
+			List []string
 
+			Pad  bool
 
+		}, len(req))
 
+		for k, val := range req {
 
+			v[k] = struct {
 
+				List []string
 
+				Pad  bool
 
+			}{
 
+				List: val,
 
+			}
 
+		}
 
+		raw.Security = append(raw.Security, v)
 
+	}
 
+
 
+	err := gob.NewEncoder(&b).Encode(raw)
 
+	return b.Bytes(), err
 
+}
 
+
 
+// GobDecode provides a safe gob decoder for SwaggerProps, including empty security requirements
 
+func (o *SwaggerProps) GobDecode(b []byte) error {
 
+	var raw gobSwaggerPropsAlias
 
+
 
+	buf := bytes.NewBuffer(b)
 
+	err := gob.NewDecoder(buf).Decode(&raw)
 
+	if err != nil {
 
+		return err
 
+	}
 
+	if raw.Alias == nil {
 
+		return nil
 
+	}
 
+
 
+	switch {
 
+	case raw.SecurityIsEmpty:
 
+		// empty, but non-nil security requirement
 
+		raw.Alias.Security = []map[string][]string{}
 
+	case len(raw.Alias.Security) == 0:
 
+		// nil security requirement
 
+		raw.Alias.Security = nil
 
+	default:
 
+		raw.Alias.Security = make([]map[string][]string, 0, len(raw.Security))
 
+		for _, req := range raw.Security {
 
+			v := make(map[string][]string, len(req))
 
+			for k, val := range req {
 
+				v[k] = make([]string, 0, len(val.List))
 
+				v[k] = append(v[k], val.List...)
 
+			}
 
+			raw.Alias.Security = append(raw.Alias.Security, v)
 
+		}
 
+	}
 
+
 
+	*o = *(*SwaggerProps)(raw.Alias)
 
+	return nil
 
+}
 
+
 
 // Dependencies represent a dependencies property
 
 type Dependencies map[string]SchemaOrStringArray

+ 1 - 0
vendor/github.com/go-openapi/swag/.gitignore
Просмотреть файл 

@@ -1,3 +1,4 @@
 
 secrets.yml
 
 vendor
 
 Godeps
 
+.idea

+ 5 - 6
vendor/github.com/go-openapi/swag/.travis.yml
Просмотреть файл 

@@ -1,16 +1,15 @@
 
 after_success:
 
 - bash <(curl -s https://codecov.io/bash)
 
 go:
 
-- '1.9'
 
-- 1.10.x
 
 - 1.11.x
 
+- 1.12.x
 
 install:
 
-- go get -u github.com/stretchr/testify
 
-- go get -u github.com/mailru/easyjson
 
-- go get -u gopkg.in/yaml.v2
 
+- GO111MODULE=off go get -u gotest.tools/gotestsum
 
+env:
 
+- GO111MODULE=on
 
 language: go
 
 notifications:
 
   slack:
 
     secure: QUWvCkBBK09GF7YtEvHHVt70JOkdlNBG0nIKu/5qc4/nW5HP8I2w0SEf/XR2je0eED1Qe3L/AfMCWwrEj+IUZc3l4v+ju8X8R3Lomhme0Eb0jd1MTMCuPcBT47YCj0M7RON7vXtbFfm1hFJ/jLe5+9FXz0hpXsR24PJc5ZIi/ogNwkaPqG4BmndzecpSh0vc2FJPZUD9LT0I09REY/vXR0oQAalLkW0asGD5taHZTUZq/kBpsNxaAFrLM23i4mUcf33M5fjLpvx5LRICrX/57XpBrDh2TooBU6Qj3CgoY0uPRYUmSNxbVx1czNzl2JtEpb5yjoxfVPQeg0BvQM00G8LJINISR+ohrjhkZmAqchDupAX+yFrxTtORa78CtnIL6z/aTNlgwwVD8kvL/1pFA/JWYmKDmz93mV/+6wubGzNSQCstzjkFA4/iZEKewKUoRIAi/fxyscP6L/rCpmY/4llZZvrnyTqVbt6URWpopUpH4rwYqreXAtJxJsfBJIeSmUIiDIOMGkCTvyTEW3fWGmGoqWtSHLoaWDyAIGb7azb+KvfpWtEcoPFWfSWU+LGee0A/YsUhBl7ADB9A0CJEuR8q4BPpKpfLwPKSiKSAXL7zDkyjExyhtgqbSl2jS+rKIHOZNL8JkCcTP2MKMVd563C5rC5FMKqu3S9m2b6380E=
 
 script:
 
-- go test -v -race -cover -coverprofile=coverage.txt -covermode=atomic ./...
 
+- gotestsum -f short-verbose -- -race -coverprofile=coverage.txt -covermode=atomic ./...

+ 0 - 1
vendor/github.com/go-openapi/swag/README.md
Просмотреть файл 

@@ -19,5 +19,4 @@ You may also use it standalone for your projects.
 
 
 This repo has only few dependencies outside of the standard library:
 
 
-* JSON utilities depend on github.com/mailru/easyjson
 
 * YAML utilities depend on gopkg.in/yaml.v2

+ 4 - 3
vendor/github.com/go-openapi/swag/convert.go
Просмотреть файл 

@@ -39,11 +39,12 @@ func IsFloat64AJSONInteger(f float64) bool {
 
 	diff := math.Abs(f - g)
 
 
 	// more info: https://floating-point-gui.de/errors/comparison/#look-out-for-edge-cases
 
-	if f == g { // best case
 
+	switch {
 
+	case f == g: // best case
 
 		return true
 
-	} else if f == float64(int64(f)) || f == float64(uint64(f)) { // optimistic case
 
+	case f == float64(int64(f)) || f == float64(uint64(f)): // optimistic case
 
 		return true
 
-	} else if f == 0 || g == 0 || diff < math.SmallestNonzeroFloat64 { // very close to 0 values
 
+	case f == 0 || g == 0 || diff < math.SmallestNonzeroFloat64: // very close to 0 values
 
 		return diff < (epsilon * math.SmallestNonzeroFloat64)
 
 	}
 
 	// check the relative error

+ 0 - 1
vendor/github.com/go-openapi/swag/doc.go
Просмотреть файл 

@@ -27,7 +27,6 @@ You may also use it standalone for your projects.
 
 
 This repo has only few dependencies outside of the standard library:
 
 
-  * JSON utilities depend on github.com/mailru/easyjson
 
   * YAML utilities depend on gopkg.in/yaml.v2
 
 */
 
 package swag

+ 9 - 4
vendor/github.com/go-openapi/swag/go.mod
Просмотреть файл 

@@ -2,8 +2,13 @@ module github.com/go-openapi/swag
 
 
 require (
 
 	github.com/davecgh/go-spew v1.1.1 // indirect
 
-	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329
 
-	github.com/pmezard/go-difflib v1.0.0 // indirect
 
-	github.com/stretchr/testify v1.2.2
 
-	gopkg.in/yaml.v2 v2.2.1
 
+	github.com/kr/pretty v0.1.0 // indirect
 
+	github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63
 
+	github.com/stretchr/testify v1.3.0
 
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 
+	gopkg.in/yaml.v2 v2.2.2
 
 )
 
+
 
+replace github.com/golang/lint => golang.org/x/lint v0.0.0-20190409202823-959b441ac422
 
+
 
+replace sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.5.1

+ 16 - 5
vendor/github.com/go-openapi/swag/go.sum
Просмотреть файл 

@@ -1,9 +1,20 @@
 
+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/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
 
-github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+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/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/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 
+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/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
+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/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

+ 1 - 1
vendor/github.com/go-openapi/swag/json.go
Просмотреть файл 

@@ -99,7 +99,7 @@ func ConcatJSON(blobs ...[]byte) []byte {
 
 	last := len(blobs) - 1
 
 	for blobs[last] == nil || bytes.Equal(blobs[last], nullJSON) {
 
 		// strips trailing null objects
 
-		last = last - 1
 
+		last--
 
 		if last < 0 {
 
 			// there was nothing but "null"s or nil...
 
 			return nil

+ 87 - 0
vendor/github.com/go-openapi/swag/name_lexem.go
Просмотреть файл 

@@ -0,0 +1,87 @@
 
+// Copyright 2015 go-swagger maintainers
 
+//
 
+// Licensed under the Apache License, Version 2.0 (the "License");
 
+// you may not use this file except in compliance with the License.
 
+// You may obtain a copy of the License at
 
+//
 
+//    http://www.apache.org/licenses/LICENSE-2.0
 
+//
 
+// Unless required by applicable law or agreed to in writing, software
 
+// distributed under the License is distributed on an "AS IS" BASIS,
 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+// See the License for the specific language governing permissions and
 
+// limitations under the License.
 
+
 
+package swag
 
+
 
+import "unicode"
 
+
 
+type (
 
+	nameLexem interface {
 
+		GetUnsafeGoName() string
 
+		GetOriginal() string
 
+		IsInitialism() bool
 
+	}
 
+
 
+	initialismNameLexem struct {
 
+		original          string
 
+		matchedInitialism string
 
+	}
 
+
 
+	casualNameLexem struct {
 
+		original string
 
+	}
 
+)
 
+
 
+func newInitialismNameLexem(original, matchedInitialism string) *initialismNameLexem {
 
+	return &initialismNameLexem{
 
+		original:          original,
 
+		matchedInitialism: matchedInitialism,
 
+	}
 
+}
 
+
 
+func newCasualNameLexem(original string) *casualNameLexem {
 
+	return &casualNameLexem{
 
+		original: original,
 
+	}
 
+}
 
+
 
+func (l *initialismNameLexem) GetUnsafeGoName() string {
 
+	return l.matchedInitialism
 
+}
 
+
 
+func (l *casualNameLexem) GetUnsafeGoName() string {
 
+	var first rune
 
+	var rest string
 
+	for i, orig := range l.original {
 
+		if i == 0 {
 
+			first = orig
 
+			continue
 
+		}
 
+		if i > 0 {
 
+			rest = l.original[i:]
 
+			break
 
+		}
 
+	}
 
+	if len(l.original) > 1 {
 
+		return string(unicode.ToUpper(first)) + lower(rest)
 
+	}
 
+
 
+	return l.original
 
+}
 
+
 
+func (l *initialismNameLexem) GetOriginal() string {
 
+	return l.original
 
+}
 
+
 
+func (l *casualNameLexem) GetOriginal() string {
 
+	return l.original
 
+}
 
+
 
+func (l *initialismNameLexem) IsInitialism() bool {
 
+	return true
 
+}
 
+
 
+func (l *casualNameLexem) IsInitialism() bool {
 
+	return false
 
+}

+ 262 - 0
vendor/github.com/go-openapi/swag/split.go
Просмотреть файл 

@@ -0,0 +1,262 @@
 
+// Copyright 2015 go-swagger maintainers
 
+//
 
+// Licensed under the Apache License, Version 2.0 (the "License");
 
+// you may not use this file except in compliance with the License.
 
+// You may obtain a copy of the License at
 
+//
 
+//    http://www.apache.org/licenses/LICENSE-2.0
 
+//
 
+// Unless required by applicable law or agreed to in writing, software
 
+// distributed under the License is distributed on an "AS IS" BASIS,
 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 
+// See the License for the specific language governing permissions and
 
+// limitations under the License.
 
+
 
+package swag
 
+
 
+import (
 
+	"unicode"
 
+)
 
+
 
+var nameReplaceTable = map[rune]string{
 
+	'@': "At ",
 
+	'&': "And ",
 
+	'|': "Pipe ",
 
+	'$': "Dollar ",
 
+	'!': "Bang ",
 
+	'-': "",
 
+	'_': "",
 
+}
 
+
 
+type (
 
+	splitter struct {
 
+		postSplitInitialismCheck bool
 
+		initialisms              []string
 
+	}
 
+
 
+	splitterOption func(*splitter) *splitter
 
+)
 
+
 
+// split calls the splitter; splitter provides more control and post options
 
+func split(str string) []string {
 
+	lexems := newSplitter().split(str)
 
+	result := make([]string, 0, len(lexems))
 
+
 
+	for _, lexem := range lexems {
 
+		result = append(result, lexem.GetOriginal())
 
+	}
 
+
 
+	return result
 
+
 
+}
 
+
 
+func (s *splitter) split(str string) []nameLexem {
 
+	return s.toNameLexems(str)
 
+}
 
+
 
+func newSplitter(options ...splitterOption) *splitter {
 
+	splitter := &splitter{
 
+		postSplitInitialismCheck: false,
 
+		initialisms:              initialisms,
 
+	}
 
+
 
+	for _, option := range options {
 
+		splitter = option(splitter)
 
+	}
 
+
 
+	return splitter
 
+}
 
+
 
+// withPostSplitInitialismCheck allows to catch initialisms after main split process
 
+func withPostSplitInitialismCheck(s *splitter) *splitter {
 
+	s.postSplitInitialismCheck = true
 
+	return s
 
+}
 
+
 
+type (
 
+	initialismMatch struct {
 
+		start, end int
 
+		body       []rune
 
+		complete   bool
 
+	}
 
+	initialismMatches []*initialismMatch
 
+)
 
+
 
+func (s *splitter) toNameLexems(name string) []nameLexem {
 
+	nameRunes := []rune(name)
 
+	matches := s.gatherInitialismMatches(nameRunes)
 
+	return s.mapMatchesToNameLexems(nameRunes, matches)
 
+}
 
+
 
+func (s *splitter) gatherInitialismMatches(nameRunes []rune) initialismMatches {
 
+	matches := make(initialismMatches, 0)
 
+
 
+	for currentRunePosition, currentRune := range nameRunes {
 
+		newMatches := make(initialismMatches, 0, len(matches))
 
+
 
+		// check current initialism matches
 
+		for _, match := range matches {
 
+			if keepCompleteMatch := match.complete; keepCompleteMatch {
 
+				newMatches = append(newMatches, match)
 
+				continue
 
+			}
 
+
 
+			// drop failed match
 
+			currentMatchRune := match.body[currentRunePosition-match.start]
 
+			if !s.initialismRuneEqual(currentMatchRune, currentRune) {
 
+				continue
 
+			}
 
+
 
+			// try to complete ongoing match
 
+			if currentRunePosition-match.start == len(match.body)-1 {
 
+				// we are close; the next step is to check the symbol ahead
 
+				// if it is a small letter, then it is not the end of match
 
+				// but beginning of the next word
 
+
 
+				if currentRunePosition < len(nameRunes)-1 {
 
+					nextRune := nameRunes[currentRunePosition+1]
 
+					if newWord := unicode.IsLower(nextRune); newWord {
 
+						// oh ok, it was the start of a new word
 
+						continue
 
+					}
 
+				}
 
+
 
+				match.complete = true
 
+				match.end = currentRunePosition
 
+			}
 
+
 
+			newMatches = append(newMatches, match)
 
+		}
 
+
 
+		// check for new initialism matches
 
+		for _, initialism := range s.initialisms {
 
+			initialismRunes := []rune(initialism)
 
+			if s.initialismRuneEqual(initialismRunes[0], currentRune) {
 
+				newMatches = append(newMatches, &initialismMatch{
 
+					start:    currentRunePosition,
 
+					body:     initialismRunes,
 
+					complete: false,
 
+				})
 
+			}
 
+		}
 
+
 
+		matches = newMatches
 
+	}
 
+
 
+	return matches
 
+}
 
+
 
+func (s *splitter) mapMatchesToNameLexems(nameRunes []rune, matches initialismMatches) []nameLexem {
 
+	nameLexems := make([]nameLexem, 0)
 
+
 
+	var lastAcceptedMatch *initialismMatch
 
+	for _, match := range matches {
 
+		if !match.complete {
 
+			continue
 
+		}
 
+
 
+		if firstMatch := lastAcceptedMatch == nil; firstMatch {
 
+			nameLexems = append(nameLexems, s.breakCasualString(nameRunes[:match.start])...)
 
+			nameLexems = append(nameLexems, s.breakInitialism(string(match.body)))
 
+
 
+			lastAcceptedMatch = match
 
+
 
+			continue
 
+		}
 
+
 
+		if overlappedMatch := match.start <= lastAcceptedMatch.end; overlappedMatch {
 
+			continue
 
+		}
 
+
 
+		middle := nameRunes[lastAcceptedMatch.end+1 : match.start]
 
+		nameLexems = append(nameLexems, s.breakCasualString(middle)...)
 
+		nameLexems = append(nameLexems, s.breakInitialism(string(match.body)))
 
+
 
+		lastAcceptedMatch = match
 
+	}
 
+
 
+	// we have not found any accepted matches
 
+	if lastAcceptedMatch == nil {
 
+		return s.breakCasualString(nameRunes)
 
+	}
 
+
 
+	if lastAcceptedMatch.end+1 != len(nameRunes) {
 
+		rest := nameRunes[lastAcceptedMatch.end+1:]
 
+		nameLexems = append(nameLexems, s.breakCasualString(rest)...)
 
+	}
 
+
 
+	return nameLexems
 
+}
 
+
 
+func (s *splitter) initialismRuneEqual(a, b rune) bool {
 
+	return a == b
 
+}
 
+
 
+func (s *splitter) breakInitialism(original string) nameLexem {
 
+	return newInitialismNameLexem(original, original)
 
+}
 
+
 
+func (s *splitter) breakCasualString(str []rune) []nameLexem {
 
+	segments := make([]nameLexem, 0)
 
+	currentSegment := ""
 
+
 
+	addCasualNameLexem := func(original string) {
 
+		segments = append(segments, newCasualNameLexem(original))
 
+	}
 
+
 
+	addInitialismNameLexem := func(original, match string) {
 
+		segments = append(segments, newInitialismNameLexem(original, match))
 
+	}
 
+
 
+	addNameLexem := func(original string) {
 
+		if s.postSplitInitialismCheck {
 
+			for _, initialism := range s.initialisms {
 
+				if upper(initialism) == upper(original) {
 
+					addInitialismNameLexem(original, initialism)
 
+					return
 
+				}
 
+			}
 
+		}
 
+
 
+		addCasualNameLexem(original)
 
+	}
 
+
 
+	for _, rn := range string(str) {
 
+		if replace, found := nameReplaceTable[rn]; found {
 
+			if currentSegment != "" {
 
+				addNameLexem(currentSegment)
 
+				currentSegment = ""
 
+			}
 
+
 
+			if replace != "" {
 
+				addNameLexem(replace)
 
+			}
 
+
 
+			continue
 
+		}
 
+
 
+		if !unicode.In(rn, unicode.L, unicode.M, unicode.N, unicode.Pc) {
 
+			if currentSegment != "" {
 
+				addNameLexem(currentSegment)
 
+				currentSegment = ""
 
+			}
 
+
 
+			continue
 
+		}
 
+
 
+		if unicode.IsUpper(rn) {
 
+			if currentSegment != "" {
 
+				addNameLexem(currentSegment)
 
+			}
 
+			currentSegment = ""
 
+		}
 
+
 
+		currentSegment += string(rn)
 
+	}
 
+
 
+	if currentSegment != "" {
 
+		addNameLexem(currentSegment)
 
+	}
 
+
 
+	return segments
 
+}

+ 42 - 69
vendor/github.com/go-openapi/swag/util.go
Просмотреть файл 

@@ -15,11 +15,8 @@
 
 package swag
 
 
 import (
 
-	"math"
 
 	"reflect"
 
-	"regexp"
 
 	"strings"
 
-	"sync"
 
 	"unicode"
 
 )
 
 
@@ -29,15 +26,15 @@ var commonInitialisms *indexOfInitialisms
 
 // initialisms is a slice of sorted initialisms
 
 var initialisms []string
 
 
-var once sync.Once
 
-
 
 var isInitialism func(string) bool
 
 
-var (
 
-	splitRex1     *regexp.Regexp
 
-	splitRex2     *regexp.Regexp
 
-	splitReplacer *strings.Replacer
 
-)
 
+// GoNamePrefixFunc sets an optional rule to prefix go names
 
+// which do not start with a letter.
 
+//
 
+// e.g. to help converting "123" into "{prefix}123"
 
+//
 
+// The default is to prefix with "X"
 
+var GoNamePrefixFunc func(string) string
 
 
 func init() {
 
 	// Taken from https://github.com/golang/lint/blob/3390df4df2787994aea98de825b964ac7944b817/lint.go#L732-L769
 
@@ -55,6 +52,8 @@ func init() {
 
 		"HTTP":  true,
 
 		"ID":    true,
 
 		"IP":    true,
 
+		"IPv4":  true,
 
+		"IPv6":  true,
 
 		"JSON":  true,
 
 		"LHS":   true,
 
 		"OAI":   true,
 
@@ -85,15 +84,12 @@ func init() {
 
 
 	// a thread-safe index of initialisms
 
 	commonInitialisms = newIndexOfInitialisms().load(configuredInitialisms)
 
+	initialisms = commonInitialisms.sorted()
 
 
 	// a test function
 
 	isInitialism = commonInitialisms.isInitialism
 
 }
 
 
-func ensureSorted() {
 
-	initialisms = commonInitialisms.sorted()
 
-}
 
-
 
 const (
 
 	//collectionFormatComma = "csv"
 
 	collectionFormatSpace = "ssv"
 
@@ -175,40 +171,6 @@ func (s byInitialism) Less(i, j int) bool {
 
 	return strings.Compare(s[i], s[j]) > 0
 
 }
 
 
-// Prepares strings by splitting by caps, spaces, dashes, and underscore
 
-func split(str string) []string {
 
-	// check if consecutive single char things make up an initialism
 
-	once.Do(func() {
 
-		splitRex1 = regexp.MustCompile(`(\p{Lu})`)
 
-		splitRex2 = regexp.MustCompile(`(\pL|\pM|\pN|\p{Pc})+`)
 
-		splitReplacer = strings.NewReplacer(
 
-			"@", "At ",
 
-			"&", "And ",
 
-			"|", "Pipe ",
 
-			"$", "Dollar ",
 
-			"!", "Bang ",
 
-			"-", " ",
 
-			"_", " ",
 
-		)
 
-		ensureSorted()
 
-	})
 
-
 
-	str = trim(str)
 
-
 
-	// Convert dash and underscore to spaces
 
-	str = splitReplacer.Replace(str)
 
-
 
-	// Split when uppercase is found (needed for Snake)
 
-	str = splitRex1.ReplaceAllString(str, " $1")
 
-
 
-	for _, k := range initialisms {
 
-		str = strings.Replace(str, splitRex1.ReplaceAllString(k, " $1"), " "+k, -1)
 
-	}
 
-	// Get the final list of words
 
-	//words = rex2.FindAllString(str, -1)
 
-	return splitRex2.FindAllString(str, -1)
 
-}
 
-
 
 // Removes leading whitespaces
 
 func trim(str string) string {
 
 	return strings.Trim(str, " ")
 
@@ -261,30 +223,31 @@ func ToCommandName(name string) string {
 
 
 // ToHumanNameLower represents a code name as a human series of words
 
 func ToHumanNameLower(name string) string {
 
-	in := split(name)
 
+	in := newSplitter(withPostSplitInitialismCheck).split(name)
 
 	out := make([]string, 0, len(in))
 
 
 	for _, w := range in {
 
-		if !isInitialism(upper(w)) {
 
-			out = append(out, lower(w))
 
+		if !w.IsInitialism() {
 
+			out = append(out, lower(w.GetOriginal()))
 
 		} else {
 
-			out = append(out, w)
 
+			out = append(out, w.GetOriginal())
 
 		}
 
 	}
 
+
 
 	return strings.Join(out, " ")
 
 }
 
 
 // ToHumanNameTitle represents a code name as a human series of words with the first letters titleized
 
 func ToHumanNameTitle(name string) string {
 
-	in := split(name)
 
-	out := make([]string, 0, len(in))
 
+	in := newSplitter(withPostSplitInitialismCheck).split(name)
 
 
+	out := make([]string, 0, len(in))
 
 	for _, w := range in {
 
-		uw := upper(w)
 
-		if !isInitialism(uw) {
 
-			out = append(out, Camelize(w))
 
+		original := w.GetOriginal()
 
+		if !w.IsInitialism() {
 
+			out = append(out, Camelize(original))
 
 		} else {
 
-			out = append(out, w)
 
+			out = append(out, original)
 
 		}
 
 	}
 
 	return strings.Join(out, " ")
 
@@ -319,24 +282,34 @@ func ToVarName(name string) string {
 
 
 // ToGoName translates a swagger name which can be underscored or camel cased to a name that golint likes
 
 func ToGoName(name string) string {
 
-	in := split(name)
 
-	out := make([]string, 0, len(in))
 
+	lexems := newSplitter(withPostSplitInitialismCheck).split(name)
 
 
-	for _, w := range in {
 
-		uw := upper(w)
 
-		mod := int(math.Min(float64(len(uw)), 2))
 
-		if !isInitialism(uw) && !isInitialism(uw[:len(uw)-mod]) {
 
-			uw = Camelize(w)
 
+	result := ""
 
+	for _, lexem := range lexems {
 
+		goName := lexem.GetUnsafeGoName()
 
+
 
+		// to support old behavior
 
+		if lexem.IsInitialism() {
 
+			goName = upper(goName)
 
 		}
 
-		out = append(out, uw)
 
+		result += goName
 
 	}
 
 
-	result := strings.Join(out, "")
 
 	if len(result) > 0 {
 
-		if !unicode.IsUpper([]rune(result)[0]) {
 
-			result = "X" + result
 
+		// Only prefix with X when the first character isn't an ascii letter
 
+		first := []rune(result)[0]
 
+		if !unicode.IsLetter(first) || (first > unicode.MaxASCII && !unicode.IsUpper(first)) {
 
+			if GoNamePrefixFunc == nil {
 
+				return "X" + result
 
+			}
 
+			result = GoNamePrefixFunc(name) + result
 
+		}
 
+		first = []rune(result)[0]
 
+		if unicode.IsLetter(first) && !unicode.IsUpper(first) {
 
+			result = string(append([]rune{unicode.ToUpper(first)}, []rune(result)[1:]...))
 
 		}
 
 	}
 
+
 
 	return result
 
 }

+ 33 - 14
vendor/github.com/go-openapi/swag/yaml.go
Просмотреть файл 

@@ -143,19 +143,43 @@ func (s *JSONMapItem) UnmarshalEasyJSON(in *jlexer.Lexer) {
 
 }
 
 
 func transformData(input interface{}) (out interface{}, err error) {
 
+	format := func(t interface{}) (string, error) {
 
+		switch k := t.(type) {
 
+		case string:
 
+			return k, nil
 
+		case uint:
 
+			return strconv.FormatUint(uint64(k), 10), nil
 
+		case uint8:
 
+			return strconv.FormatUint(uint64(k), 10), nil
 
+		case uint16:
 
+			return strconv.FormatUint(uint64(k), 10), nil
 
+		case uint32:
 
+			return strconv.FormatUint(uint64(k), 10), nil
 
+		case uint64:
 
+			return strconv.FormatUint(k, 10), nil
 
+		case int:
 
+			return strconv.Itoa(k), nil
 
+		case int8:
 
+			return strconv.FormatInt(int64(k), 10), nil
 
+		case int16:
 
+			return strconv.FormatInt(int64(k), 10), nil
 
+		case int32:
 
+			return strconv.FormatInt(int64(k), 10), nil
 
+		case int64:
 
+			return strconv.FormatInt(k, 10), nil
 
+		default:
 
+			return "", fmt.Errorf("unexpected map key type, got: %T", k)
 
+		}
 
+	}
 
+
 
 	switch in := input.(type) {
 
 	case yaml.MapSlice:
 
 
 		o := make(JSONMapSlice, len(in))
 
 		for i, mi := range in {
 
 			var nmi JSONMapItem
 
-			switch k := mi.Key.(type) {
 
-			case string:
 
-				nmi.Key = k
 
-			case int:
 
-				nmi.Key = strconv.Itoa(k)
 
-			default:
 
-				return nil, fmt.Errorf("types don't match expect map key string or int got: %T", mi.Key)
 
+			if nmi.Key, err = format(mi.Key); err != nil {
 
+				return nil, err
 
 			}
 
 
 			v, ert := transformData(mi.Value)
 
@@ -170,13 +194,8 @@ func transformData(input interface{}) (out interface{}, err error) {
 
 		o := make(JSONMapSlice, 0, len(in))
 
 		for ke, va := range in {
 
 			var nmi JSONMapItem
 
-			switch k := ke.(type) {
 
-			case string:
 
-				nmi.Key = k
 
-			case int:
 
-				nmi.Key = strconv.Itoa(k)
 
-			default:
 
-				return nil, fmt.Errorf("types don't match expect map key string or int got: %T", ke)
 
+			if nmi.Key, err = format(ke); err != nil {
 
+				return nil, err
 
 			}
 
 
 			v, ert := transformData(va)

+ 2 - 0
vendor/github.com/gogo/protobuf/proto/encode.go
Просмотреть файл 

@@ -189,6 +189,8 @@ type Marshaler interface {
 
 // prefixed by a varint-encoded length.
 
 func (p *Buffer) EncodeMessage(pb Message) error {
 
 	siz := Size(pb)
 
+	sizVar := SizeVarint(uint64(siz))
 
+	p.grow(siz + sizVar)
 
 	p.EncodeVarint(uint64(siz))
 
 	return p.Marshal(pb)
 
 }

+ 1 - 0
vendor/github.com/gogo/protobuf/proto/extensions.go
Просмотреть файл 

@@ -527,6 +527,7 @@ func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
 
 // SetExtension sets the specified extension of pb to the specified value.
 
 func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
 
 	if epb, ok := pb.(extensionsBytes); ok {
 
+		ClearExtension(pb, extension)
 
 		newb, err := encodeExtension(extension, value)
 
 		if err != nil {
 
 			return err

+ 21 - 0
vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
Просмотреть файл 

@@ -154,6 +154,10 @@ func EncodeInternalExtension(m extendableProto, data []byte) (n int, err error)
 
 	return EncodeExtensionMap(m.extensionsWrite(), data)
 
 }
 
 
+func EncodeInternalExtensionBackwards(m extendableProto, data []byte) (n int, err error) {
 
+	return EncodeExtensionMapBackwards(m.extensionsWrite(), data)
 
+}
 
+
 
 func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
 
 	o := 0
 
 	for _, e := range m {
 
@@ -169,6 +173,23 @@ func EncodeExtensionMap(m map[int32]Extension, data []byte) (n int, err error) {
 
 	return o, nil
 
 }
 
 
+func EncodeExtensionMapBackwards(m map[int32]Extension, data []byte) (n int, err error) {
 
+	o := 0
 
+	end := len(data)
 
+	for _, e := range m {
 
+		if err := e.Encode(); err != nil {
 
+			return 0, err
 
+		}
 
+		n := copy(data[end-len(e.enc):], e.enc)
 
+		if n != len(e.enc) {
 
+			return 0, io.ErrShortBuffer
 
+		}
 
+		end -= n
 
+		o += n
 
+	}
 
+	return o, nil
 
+}
 
+
 
 func GetRawExtension(m map[int32]Extension, id int32) ([]byte, error) {
 
 	e := m[id]
 
 	if err := e.Encode(); err != nil {

+ 13 - 7
vendor/github.com/gogo/protobuf/proto/lib.go
Просмотреть файл 

@@ -948,13 +948,19 @@ func isProto3Zero(v reflect.Value) bool {
 
 	return false
 
 }
 
 
-// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
 
-// to assert that that code is compatible with this version of the proto package.
 
-const GoGoProtoPackageIsVersion2 = true
 
-
 
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
 
-// to assert that that code is compatible with this version of the proto package.
 
-const GoGoProtoPackageIsVersion1 = true
 
+const (
 
+	// ProtoPackageIsVersion3 is referenced from generated protocol buffer files
 
+	// to assert that that code is compatible with this version of the proto package.
 
+	GoGoProtoPackageIsVersion3 = true
 
+
 
+	// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
 
+	// to assert that that code is compatible with this version of the proto package.
 
+	GoGoProtoPackageIsVersion2 = true
 
+
 
+	// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
 
+	// to assert that that code is compatible with this version of the proto package.
 
+	GoGoProtoPackageIsVersion1 = true
 
+)
 
 
 // InternalMessageInfo is a type used internally by generated .pb.go files.
 
 // This type is not intended to be used by non-generated code.

+ 41 - 30
vendor/github.com/gogo/protobuf/proto/properties.go
Просмотреть файл 

@@ -43,7 +43,6 @@ package proto
 
 import (
 
 	"fmt"
 
 	"log"
 
-	"os"
 
 	"reflect"
 
 	"sort"
 
 	"strconv"
 
@@ -205,7 +204,7 @@ func (p *Properties) Parse(s string) {
 
 	// "bytes,49,opt,name=foo,def=hello!"
 
 	fields := strings.Split(s, ",") // breaks def=, but handled below.
 
 	if len(fields) < 2 {
 
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
 
+		log.Printf("proto: tag has too few fields: %q", s)
 
 		return
 
 	}
 
 
@@ -225,7 +224,7 @@ func (p *Properties) Parse(s string) {
 
 		p.WireType = WireBytes
 
 		// no numeric converter for non-numeric types
 
 	default:
 
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
 
+		log.Printf("proto: tag has unknown wire type: %q", s)
 
 		return
 
 	}
 
 
@@ -400,6 +399,15 @@ func GetProperties(t reflect.Type) *StructProperties {
 
 	return sprop
 
 }
 
 
+type (
 
+	oneofFuncsIface interface {
 
+		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
 
+	}
 
+	oneofWrappersIface interface {
 
+		XXX_OneofWrappers() []interface{}
 
+	}
 
+)
 
+
 
 // getPropertiesLocked requires that propertiesMu is held.
 
 func getPropertiesLocked(t reflect.Type) *StructProperties {
 
 	if prop, ok := propertiesMap[t]; ok {
 
@@ -441,37 +449,40 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 
 	// Re-order prop.order.
 
 	sort.Sort(prop)
 
 
-	type oneofMessage interface {
 
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
 
-	}
 
-	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); isOneofMessage && ok {
 
+	if isOneofMessage {
 
 		var oots []interface{}
 
-		_, _, _, oots = om.XXX_OneofFuncs()
 
-
 
-		// Interpret oneof metadata.
 
-		prop.OneofTypes = make(map[string]*OneofProperties)
 
-		for _, oot := range oots {
 
-			oop := &OneofProperties{
 
-				Type: reflect.ValueOf(oot).Type(), // *T
 
-				Prop: new(Properties),
 
-			}
 
-			sft := oop.Type.Elem().Field(0)
 
-			oop.Prop.Name = sft.Name
 
-			oop.Prop.Parse(sft.Tag.Get("protobuf"))
 
-			// There will be exactly one interface field that
 
-			// this new value is assignable to.
 
-			for i := 0; i < t.NumField(); i++ {
 
-				f := t.Field(i)
 
-				if f.Type.Kind() != reflect.Interface {
 
-					continue
 
+		switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
 
+		case oneofFuncsIface:
 
+			_, _, _, oots = m.XXX_OneofFuncs()
 
+		case oneofWrappersIface:
 
+			oots = m.XXX_OneofWrappers()
 
+		}
 
+		if len(oots) > 0 {
 
+			// Interpret oneof metadata.
 
+			prop.OneofTypes = make(map[string]*OneofProperties)
 
+			for _, oot := range oots {
 
+				oop := &OneofProperties{
 
+					Type: reflect.ValueOf(oot).Type(), // *T
 
+					Prop: new(Properties),
 
 				}
 
-				if !oop.Type.AssignableTo(f.Type) {
 
-					continue
 
+				sft := oop.Type.Elem().Field(0)
 
+				oop.Prop.Name = sft.Name
 
+				oop.Prop.Parse(sft.Tag.Get("protobuf"))
 
+				// There will be exactly one interface field that
 
+				// this new value is assignable to.
 
+				for i := 0; i < t.NumField(); i++ {
 
+					f := t.Field(i)
 
+					if f.Type.Kind() != reflect.Interface {
 
+						continue
 
+					}
 
+					if !oop.Type.AssignableTo(f.Type) {
 
+						continue
 
+					}
 
+					oop.Field = i
 
+					break
 
 				}
 
-				oop.Field = i
 
-				break
 
+				prop.OneofTypes[oop.Prop.OrigName] = oop
 
 			}
 
-			prop.OneofTypes[oop.Prop.OrigName] = oop
 
 		}
 
 	}

+ 10 - 7
vendor/github.com/gogo/protobuf/proto/table_marshal.go
Просмотреть файл 

@@ -389,8 +389,13 @@ func (u *marshalInfo) computeMarshalInfo() {
 
 	// get oneof implementers
 
 	var oneofImplementers []interface{}
 
 	// gogo: isOneofMessage is needed for embedded oneof messages, without a marshaler and unmarshaler
 
-	if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok && isOneofMessage {
 
-		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
 
+	if isOneofMessage {
 
+		switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
 
+		case oneofFuncsIface:
 
+			_, _, _, oneofImplementers = m.XXX_OneofFuncs()
 
+		case oneofWrappersIface:
 
+			oneofImplementers = m.XXX_OneofWrappers()
 
+		}
 
 	}
 
 
 	// normal fields
 
@@ -519,10 +524,6 @@ func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofI
 
 	}
 
 }
 
 
-type oneofMessage interface {
 
-	XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
 
-}
 
-
 
 // wiretype returns the wire encoding of the type.
 
 func wiretype(encoding string) uint64 {
 
 	switch encoding {
 
@@ -2968,7 +2969,9 @@ func (p *Buffer) Marshal(pb Message) error {
 
 	if m, ok := pb.(newMarshaler); ok {
 
 		siz := m.XXX_Size()
 
 		p.grow(siz) // make sure buf has enough capacity
 
-		p.buf, err = m.XXX_Marshal(p.buf, p.deterministic)
 
+		pp := p.buf[len(p.buf) : len(p.buf) : len(p.buf)+siz]
 
+		pp, err = m.XXX_Marshal(pp, p.deterministic)
 
+		p.buf = append(p.buf, pp...)
 
 		return err
 
 	}
 
 	if m, ok := pb.(Marshaler); ok {

+ 19 - 0
vendor/github.com/gogo/protobuf/proto/table_merge.go
Просмотреть файл 

@@ -530,6 +530,25 @@ func (mi *mergeInfo) computeMergeInfo() {
 
 			}
 
 		case reflect.Struct:
 
 			switch {
 
+			case isSlice && !isPointer: // E.g. []pb.T
 
+				mergeInfo := getMergeInfo(tf)
 
+				zero := reflect.Zero(tf)
 
+				mfi.merge = func(dst, src pointer) {
 
+					// TODO: Make this faster?
 
+					dstsp := dst.asPointerTo(f.Type)
 
+					dsts := dstsp.Elem()
 
+					srcs := src.asPointerTo(f.Type).Elem()
 
+					for i := 0; i < srcs.Len(); i++ {
 
+						dsts = reflect.Append(dsts, zero)
 
+						srcElement := srcs.Index(i).Addr()
 
+						dstElement := dsts.Index(dsts.Len() - 1).Addr()
 
+						mergeInfo.merge(valToPointer(dstElement), valToPointer(srcElement))
 
+					}
 
+					if dsts.IsNil() {
 
+						dsts = reflect.MakeSlice(f.Type, 0, 0)
 
+					}
 
+					dstsp.Elem().Set(dsts)
 
+				}
 
 			case !isPointer:
 
 				mergeInfo := getMergeInfo(tf)
 
 				mfi.merge = func(dst, src pointer) {

+ 13 - 9
vendor/github.com/gogo/protobuf/proto/table_unmarshal.go
Просмотреть файл 

@@ -371,15 +371,18 @@ func (u *unmarshalInfo) computeUnmarshalInfo() {
 
 	}
 
 
 	// Find any types associated with oneof fields.
 
-	// TODO: XXX_OneofFuncs returns more info than we need.  Get rid of some of it?
 
-	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs")
 
 	// gogo: len(oneofFields) > 0 is needed for embedded oneof messages, without a marshaler and unmarshaler
 
-	if fn.IsValid() && len(oneofFields) > 0 {
 
-		res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{}
 
-		for i := res.Len() - 1; i >= 0; i-- {
 
-			v := res.Index(i)                             // interface{}
 
-			tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X
 
-			typ := tptr.Elem()                            // Msg_X
 
+	if len(oneofFields) > 0 {
 
+		var oneofImplementers []interface{}
 
+		switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
 
+		case oneofFuncsIface:
 
+			_, _, _, oneofImplementers = m.XXX_OneofFuncs()
 
+		case oneofWrappersIface:
 
+			oneofImplementers = m.XXX_OneofWrappers()
 
+		}
 
+		for _, v := range oneofImplementers {
 
+			tptr := reflect.TypeOf(v) // *Msg_X
 
+			typ := tptr.Elem()        // Msg_X
 
 
 			f := typ.Field(0) // oneof implementers have one field
 
 			baseUnmarshal := fieldUnmarshaler(&f)
 
@@ -407,11 +410,12 @@ func (u *unmarshalInfo) computeUnmarshalInfo() {
 
 					u.setTag(fieldNum, of.field, unmarshal, 0, name)
 
 				}
 
 			}
 
+
 
 		}
 
 	}
 
 
 	// Get extension ranges, if any.
 
-	fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
 
+	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
 
 	if fn.IsValid() {
 
 		if !u.extensions.IsValid() && !u.oldExtensions.IsValid() && !u.bytesExtensions.IsValid() {
 
 			panic("a message with extensions, but no extensions field in " + t.Name())

+ 4 - 2
vendor/github.com/gogo/protobuf/proto/text.go
Просмотреть файл 

@@ -476,6 +476,8 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 
 	return nil
 
 }
 
 
+var textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
 
+
 
 // writeAny writes an arbitrary field.
 
 func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 
 	v = reflect.Indirect(v)
 
@@ -589,8 +591,8 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
 
 			// mutating this value.
 
 			v = v.Addr()
 
 		}
 
-		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
 
-			text, err := etm.MarshalText()
 
+		if v.Type().Implements(textMarshalerType) {
 
+			text, err := v.Interface().(encoding.TextMarshaler).MarshalText()
 
 			if err != nil {
 
 				return err
 
 			}

+ 1 - 1
vendor/github.com/gogo/protobuf/proto/text_parser.go
Просмотреть файл 

@@ -318,7 +318,7 @@ func unescape(s string) (ch string, tail string, err error) {
 
 		if i > utf8.MaxRune {
 
 			return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss)
 
 		}
 
-		return string(i), s, nil
 
+		return string(rune(i)), s, nil
 
 	}
 
 	return "", "", fmt.Errorf(`unknown escape \%c`, r)
 
 }

+ 324 - 0
vendor/github.com/golang/protobuf/proto/buffer.go
Просмотреть файл 

@@ -0,0 +1,324 @@
 
+// Copyright 2019 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
+
 
+package proto
 
+
 
+import (
 
+	"errors"
 
+	"fmt"
 
+
 
+	"google.golang.org/protobuf/encoding/prototext"
 
+	"google.golang.org/protobuf/encoding/protowire"
 
+	"google.golang.org/protobuf/runtime/protoimpl"
 
+)
 
+
 
+const (
 
+	WireVarint     = 0
 
+	WireFixed32    = 5
 
+	WireFixed64    = 1
 
+	WireBytes      = 2
 
+	WireStartGroup = 3
 
+	WireEndGroup   = 4
 
+)
 
+
 
+// EncodeVarint returns the varint encoded bytes of v.
 
+func EncodeVarint(v uint64) []byte {
 
+	return protowire.AppendVarint(nil, v)
 
+}
 
+
 
+// SizeVarint returns the length of the varint encoded bytes of v.
 
+// This is equal to len(EncodeVarint(v)).
 
+func SizeVarint(v uint64) int {
 
+	return protowire.SizeVarint(v)
 
+}
 
+
 
+// DecodeVarint parses a varint encoded integer from b,
 
+// returning the integer value and the length of the varint.
 
+// It returns (0, 0) if there is a parse error.
 
+func DecodeVarint(b []byte) (uint64, int) {
 
+	v, n := protowire.ConsumeVarint(b)
 
+	if n < 0 {
 
+		return 0, 0
 
+	}
 
+	return v, n
 
+}
 
+
 
+// Buffer is a buffer for encoding and decoding the protobuf wire format.
 
+// It may be reused between invocations to reduce memory usage.
 
+type Buffer struct {
 
+	buf           []byte
 
+	idx           int
 
+	deterministic bool
 
+}
 
+
 
+// NewBuffer allocates a new Buffer initialized with buf,
 
+// where the contents of buf are considered the unread portion of the buffer.
 
+func NewBuffer(buf []byte) *Buffer {
 
+	return &Buffer{buf: buf}
 
+}
 
+
 
+// SetDeterministic specifies whether to use deterministic serialization.
 
+//
 
+// Deterministic serialization guarantees that for a given binary, equal
 
+// messages will always be serialized to the same bytes. This implies:
 
+//
 
+//   - Repeated serialization of a message will return the same bytes.
 
+//   - Different processes of the same binary (which may be executing on
 
+//     different machines) will serialize equal messages to the same bytes.
 
+//
 
+// Note that the deterministic serialization is NOT canonical across
 
+// languages. It is not guaranteed to remain stable over time. It is unstable
 
+// across different builds with schema changes due to unknown fields.
 
+// Users who need canonical serialization (e.g., persistent storage in a
 
+// canonical form, fingerprinting, etc.) should define their own
 
+// canonicalization specification and implement their own serializer rather
 
+// than relying on this API.
 
+//
 
+// If deterministic serialization is requested, map entries will be sorted
 
+// by keys in lexographical order. This is an implementation detail and
 
+// subject to change.
 
+func (b *Buffer) SetDeterministic(deterministic bool) {
 
+	b.deterministic = deterministic
 
+}
 
+
 
+// SetBuf sets buf as the internal buffer,
 
+// where the contents of buf are considered the unread portion of the buffer.
 
+func (b *Buffer) SetBuf(buf []byte) {
 
+	b.buf = buf
 
+	b.idx = 0
 
+}
 
+
 
+// Reset clears the internal buffer of all written and unread data.
 
+func (b *Buffer) Reset() {
 
+	b.buf = b.buf[:0]
 
+	b.idx = 0
 
+}
 
+
 
+// Bytes returns the internal buffer.
 
+func (b *Buffer) Bytes() []byte {
 
+	return b.buf
 
+}
 
+
 
+// Unread returns the unread portion of the buffer.
 
+func (b *Buffer) Unread() []byte {
 
+	return b.buf[b.idx:]
 
+}
 
+
 
+// Marshal appends the wire-format encoding of m to the buffer.
 
+func (b *Buffer) Marshal(m Message) error {
 
+	var err error
 
+	b.buf, err = marshalAppend(b.buf, m, b.deterministic)
 
+	return err
 
+}
 
+
 
+// Unmarshal parses the wire-format message in the buffer and
 
+// places the decoded results in m.
 
+// It does not reset m before unmarshaling.
 
+func (b *Buffer) Unmarshal(m Message) error {
 
+	err := UnmarshalMerge(b.Unread(), m)
 
+	b.idx = len(b.buf)
 
+	return err
 
+}
 
+
 
+type unknownFields struct{ XXX_unrecognized protoimpl.UnknownFields }
 
+
 
+func (m *unknownFields) String() string { panic("not implemented") }
 
+func (m *unknownFields) Reset()         { panic("not implemented") }
 
+func (m *unknownFields) ProtoMessage()  { panic("not implemented") }
 
+
 
+// DebugPrint dumps the encoded bytes of b with a header and footer including s
 
+// to stdout. This is only intended for debugging.
 
+func (*Buffer) DebugPrint(s string, b []byte) {
 
+	m := MessageReflect(new(unknownFields))
 
+	m.SetUnknown(b)
 
+	b, _ = prototext.MarshalOptions{AllowPartial: true, Indent: "\t"}.Marshal(m.Interface())
 
+	fmt.Printf("==== %s ====\n%s==== %s ====\n", s, b, s)
 
+}
 
+
 
+// EncodeVarint appends an unsigned varint encoding to the buffer.
 
+func (b *Buffer) EncodeVarint(v uint64) error {
 
+	b.buf = protowire.AppendVarint(b.buf, v)
 
+	return nil
 
+}
 
+
 
+// EncodeZigzag32 appends a 32-bit zig-zag varint encoding to the buffer.
 
+func (b *Buffer) EncodeZigzag32(v uint64) error {
 
+	return b.EncodeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
 
+}
 
+
 
+// EncodeZigzag64 appends a 64-bit zig-zag varint encoding to the buffer.
 
+func (b *Buffer) EncodeZigzag64(v uint64) error {
 
+	return b.EncodeVarint(uint64((uint64(v) << 1) ^ uint64((int64(v) >> 63))))
 
+}
 
+
 
+// EncodeFixed32 appends a 32-bit little-endian integer to the buffer.
 
+func (b *Buffer) EncodeFixed32(v uint64) error {
 
+	b.buf = protowire.AppendFixed32(b.buf, uint32(v))
 
+	return nil
 
+}
 
+
 
+// EncodeFixed64 appends a 64-bit little-endian integer to the buffer.
 
+func (b *Buffer) EncodeFixed64(v uint64) error {
 
+	b.buf = protowire.AppendFixed64(b.buf, uint64(v))
 
+	return nil
 
+}
 
+
 
+// EncodeRawBytes appends a length-prefixed raw bytes to the buffer.
 
+func (b *Buffer) EncodeRawBytes(v []byte) error {
 
+	b.buf = protowire.AppendBytes(b.buf, v)
 
+	return nil
 
+}
 
+
 
+// EncodeStringBytes appends a length-prefixed raw bytes to the buffer.
 
+// It does not validate whether v contains valid UTF-8.
 
+func (b *Buffer) EncodeStringBytes(v string) error {
 
+	b.buf = protowire.AppendString(b.buf, v)
 
+	return nil
 
+}
 
+
 
+// EncodeMessage appends a length-prefixed encoded message to the buffer.
 
+func (b *Buffer) EncodeMessage(m Message) error {
 
+	var err error
 
+	b.buf = protowire.AppendVarint(b.buf, uint64(Size(m)))
 
+	b.buf, err = marshalAppend(b.buf, m, b.deterministic)
 
+	return err
 
+}
 
+
 
+// DecodeVarint consumes an encoded unsigned varint from the buffer.
 
+func (b *Buffer) DecodeVarint() (uint64, error) {
 
+	v, n := protowire.ConsumeVarint(b.buf[b.idx:])
 
+	if n < 0 {
 
+		return 0, protowire.ParseError(n)
 
+	}
 
+	b.idx += n
 
+	return uint64(v), nil
 
+}
 
+
 
+// DecodeZigzag32 consumes an encoded 32-bit zig-zag varint from the buffer.
 
+func (b *Buffer) DecodeZigzag32() (uint64, error) {
 
+	v, err := b.DecodeVarint()
 
+	if err != nil {
 
+		return 0, err
 
+	}
 
+	return uint64((uint32(v) >> 1) ^ uint32((int32(v&1)<<31)>>31)), nil
 
+}
 
+
 
+// DecodeZigzag64 consumes an encoded 64-bit zig-zag varint from the buffer.
 
+func (b *Buffer) DecodeZigzag64() (uint64, error) {
 
+	v, err := b.DecodeVarint()
 
+	if err != nil {
 
+		return 0, err
 
+	}
 
+	return uint64((uint64(v) >> 1) ^ uint64((int64(v&1)<<63)>>63)), nil
 
+}
 
+
 
+// DecodeFixed32 consumes a 32-bit little-endian integer from the buffer.
 
+func (b *Buffer) DecodeFixed32() (uint64, error) {
 
+	v, n := protowire.ConsumeFixed32(b.buf[b.idx:])
 
+	if n < 0 {
 
+		return 0, protowire.ParseError(n)
 
+	}
 
+	b.idx += n
 
+	return uint64(v), nil
 
+}
 
+
 
+// DecodeFixed64 consumes a 64-bit little-endian integer from the buffer.
 
+func (b *Buffer) DecodeFixed64() (uint64, error) {
 
+	v, n := protowire.ConsumeFixed64(b.buf[b.idx:])
 
+	if n < 0 {
 
+		return 0, protowire.ParseError(n)
 
+	}
 
+	b.idx += n
 
+	return uint64(v), nil
 
+}
 
+
 
+// DecodeRawBytes consumes a length-prefixed raw bytes from the buffer.
 
+// If alloc is specified, it returns a copy the raw bytes
 
+// rather than a sub-slice of the buffer.
 
+func (b *Buffer) DecodeRawBytes(alloc bool) ([]byte, error) {
 
+	v, n := protowire.ConsumeBytes(b.buf[b.idx:])
 
+	if n < 0 {
 
+		return nil, protowire.ParseError(n)
 
+	}
 
+	b.idx += n
 
+	if alloc {
 
+		v = append([]byte(nil), v...)
 
+	}
 
+	return v, nil
 
+}
 
+
 
+// DecodeStringBytes consumes a length-prefixed raw bytes from the buffer.
 
+// It does not validate whether the raw bytes contain valid UTF-8.
 
+func (b *Buffer) DecodeStringBytes() (string, error) {
 
+	v, n := protowire.ConsumeString(b.buf[b.idx:])
 
+	if n < 0 {
 
+		return "", protowire.ParseError(n)
 
+	}
 
+	b.idx += n
 
+	return v, nil
 
+}
 
+
 
+// DecodeMessage consumes a length-prefixed message from the buffer.
 
+// It does not reset m before unmarshaling.
 
+func (b *Buffer) DecodeMessage(m Message) error {
 
+	v, err := b.DecodeRawBytes(false)
 
+	if err != nil {
 
+		return err
 
+	}
 
+	return UnmarshalMerge(v, m)
 
+}
 
+
 
+// DecodeGroup consumes a message group from the buffer.
 
+// It assumes that the start group marker has already been consumed and
 
+// consumes all bytes until (and including the end group marker).
 
+// It does not reset m before unmarshaling.
 
+func (b *Buffer) DecodeGroup(m Message) error {
 
+	v, n, err := consumeGroup(b.buf[b.idx:])
 
+	if err != nil {
 
+		return err
 
+	}
 
+	b.idx += n
 
+	return UnmarshalMerge(v, m)
 
+}
 
+
 
+// consumeGroup parses b until it finds an end group marker, returning
 
+// the raw bytes of the message (excluding the end group marker) and the
 
+// the total length of the message (including the end group marker).
 
+func consumeGroup(b []byte) ([]byte, int, error) {
 
+	b0 := b
 
+	depth := 1 // assume this follows a start group marker
 
+	for {
 
+		_, wtyp, tagLen := protowire.ConsumeTag(b)
 
+		if tagLen < 0 {
 
+			return nil, 0, protowire.ParseError(tagLen)
 
+		}
 
+		b = b[tagLen:]
 
+
 
+		var valLen int
 
+		switch wtyp {
 
+		case protowire.VarintType:
 
+			_, valLen = protowire.ConsumeVarint(b)
 
+		case protowire.Fixed32Type:
 
+			_, valLen = protowire.ConsumeFixed32(b)
 
+		case protowire.Fixed64Type:
 
+			_, valLen = protowire.ConsumeFixed64(b)
 
+		case protowire.BytesType:
 
+			_, valLen = protowire.ConsumeBytes(b)
 
+		case protowire.StartGroupType:
 
+			depth++
 
+		case protowire.EndGroupType:
 
+			depth--
 
+		default:
 
+			return nil, 0, errors.New("proto: cannot parse reserved wire type")
 
+		}
 
+		if valLen < 0 {
 
+			return nil, 0, protowire.ParseError(valLen)
 
+		}
 
+		b = b[valLen:]
 
+
 
+		if depth == 0 {
 
+			return b0[:len(b0)-len(b)-tagLen], len(b0) - len(b), nil
 
+		}
 
+	}
 
+}

+ 0 - 253
vendor/github.com/golang/protobuf/proto/clone.go
Просмотреть файл 

@@ -1,253 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2011 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-// Protocol buffer deep copy and merge.
 
-// TODO: RawMessage.
 
-
 
-package proto
 
-
 
-import (
 
-	"fmt"
 
-	"log"
 
-	"reflect"
 
-	"strings"
 
-)
 
-
 
-// Clone returns a deep copy of a protocol buffer.
 
-func Clone(src Message) Message {
 
-	in := reflect.ValueOf(src)
 
-	if in.IsNil() {
 
-		return src
 
-	}
 
-	out := reflect.New(in.Type().Elem())
 
-	dst := out.Interface().(Message)
 
-	Merge(dst, src)
 
-	return dst
 
-}
 
-
 
-// Merger is the interface representing objects that can merge messages of the same type.
 
-type Merger interface {
 
-	// Merge merges src into this message.
 
-	// Required and optional fields that are set in src will be set to that value in dst.
 
-	// Elements of repeated fields will be appended.
 
-	//
 
-	// Merge may panic if called with a different argument type than the receiver.
 
-	Merge(src Message)
 
-}
 
-
 
-// generatedMerger is the custom merge method that generated protos will have.
 
-// We must add this method since a generate Merge method will conflict with
 
-// many existing protos that have a Merge data field already defined.
 
-type generatedMerger interface {
 
-	XXX_Merge(src Message)
 
-}
 
-
 
-// Merge merges src into dst.
 
-// Required and optional fields that are set in src will be set to that value in dst.
 
-// Elements of repeated fields will be appended.
 
-// Merge panics if src and dst are not the same type, or if dst is nil.
 
-func Merge(dst, src Message) {
 
-	if m, ok := dst.(Merger); ok {
 
-		m.Merge(src)
 
-		return
 
-	}
 
-
 
-	in := reflect.ValueOf(src)
 
-	out := reflect.ValueOf(dst)
 
-	if out.IsNil() {
 
-		panic("proto: nil destination")
 
-	}
 
-	if in.Type() != out.Type() {
 
-		panic(fmt.Sprintf("proto.Merge(%T, %T) type mismatch", dst, src))
 
-	}
 
-	if in.IsNil() {
 
-		return // Merge from nil src is a noop
 
-	}
 
-	if m, ok := dst.(generatedMerger); ok {
 
-		m.XXX_Merge(src)
 
-		return
 
-	}
 
-	mergeStruct(out.Elem(), in.Elem())
 
-}
 
-
 
-func mergeStruct(out, in reflect.Value) {
 
-	sprop := GetProperties(in.Type())
 
-	for i := 0; i < in.NumField(); i++ {
 
-		f := in.Type().Field(i)
 
-		if strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
-		}
 
-		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
 
-	}
 
-
 
-	if emIn, err := extendable(in.Addr().Interface()); err == nil {
 
-		emOut, _ := extendable(out.Addr().Interface())
 
-		mIn, muIn := emIn.extensionsRead()
 
-		if mIn != nil {
 
-			mOut := emOut.extensionsWrite()
 
-			muIn.Lock()
 
-			mergeExtension(mOut, mIn)
 
-			muIn.Unlock()
 
-		}
 
-	}
 
-
 
-	uf := in.FieldByName("XXX_unrecognized")
 
-	if !uf.IsValid() {
 
-		return
 
-	}
 
-	uin := uf.Bytes()
 
-	if len(uin) > 0 {
 
-		out.FieldByName("XXX_unrecognized").SetBytes(append([]byte(nil), uin...))
 
-	}
 
-}
 
-
 
-// mergeAny performs a merge between two values of the same type.
 
-// viaPtr indicates whether the values were indirected through a pointer (implying proto2).
 
-// prop is set if this is a struct field (it may be nil).
 
-func mergeAny(out, in reflect.Value, viaPtr bool, prop *Properties) {
 
-	if in.Type() == protoMessageType {
 
-		if !in.IsNil() {
 
-			if out.IsNil() {
 
-				out.Set(reflect.ValueOf(Clone(in.Interface().(Message))))
 
-			} else {
 
-				Merge(out.Interface().(Message), in.Interface().(Message))
 
-			}
 
-		}
 
-		return
 
-	}
 
-	switch in.Kind() {
 
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
 
-		reflect.String, reflect.Uint32, reflect.Uint64:
 
-		if !viaPtr && isProto3Zero(in) {
 
-			return
 
-		}
 
-		out.Set(in)
 
-	case reflect.Interface:
 
-		// Probably a oneof field; copy non-nil values.
 
-		if in.IsNil() {
 
-			return
 
-		}
 
-		// Allocate destination if it is not set, or set to a different type.
 
-		// Otherwise we will merge as normal.
 
-		if out.IsNil() || out.Elem().Type() != in.Elem().Type() {
 
-			out.Set(reflect.New(in.Elem().Elem().Type())) // interface -> *T -> T -> new(T)
 
-		}
 
-		mergeAny(out.Elem(), in.Elem(), false, nil)
 
-	case reflect.Map:
 
-		if in.Len() == 0 {
 
-			return
 
-		}
 
-		if out.IsNil() {
 
-			out.Set(reflect.MakeMap(in.Type()))
 
-		}
 
-		// For maps with value types of *T or []byte we need to deep copy each value.
 
-		elemKind := in.Type().Elem().Kind()
 
-		for _, key := range in.MapKeys() {
 
-			var val reflect.Value
 
-			switch elemKind {
 
-			case reflect.Ptr:
 
-				val = reflect.New(in.Type().Elem().Elem())
 
-				mergeAny(val, in.MapIndex(key), false, nil)
 
-			case reflect.Slice:
 
-				val = in.MapIndex(key)
 
-				val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
 
-			default:
 
-				val = in.MapIndex(key)
 
-			}
 
-			out.SetMapIndex(key, val)
 
-		}
 
-	case reflect.Ptr:
 
-		if in.IsNil() {
 
-			return
 
-		}
 
-		if out.IsNil() {
 
-			out.Set(reflect.New(in.Elem().Type()))
 
-		}
 
-		mergeAny(out.Elem(), in.Elem(), true, nil)
 
-	case reflect.Slice:
 
-		if in.IsNil() {
 
-			return
 
-		}
 
-		if in.Type().Elem().Kind() == reflect.Uint8 {
 
-			// []byte is a scalar bytes field, not a repeated field.
 
-
 
-			// Edge case: if this is in a proto3 message, a zero length
 
-			// bytes field is considered the zero value, and should not
 
-			// be merged.
 
-			if prop != nil && prop.proto3 && in.Len() == 0 {
 
-				return
 
-			}
 
-
 
-			// Make a deep copy.
 
-			// Append to []byte{} instead of []byte(nil) so that we never end up
 
-			// with a nil result.
 
-			out.SetBytes(append([]byte{}, in.Bytes()...))
 
-			return
 
-		}
 
-		n := in.Len()
 
-		if out.IsNil() {
 
-			out.Set(reflect.MakeSlice(in.Type(), 0, n))
 
-		}
 
-		switch in.Type().Elem().Kind() {
 
-		case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int32, reflect.Int64,
 
-			reflect.String, reflect.Uint32, reflect.Uint64:
 
-			out.Set(reflect.AppendSlice(out, in))
 
-		default:
 
-			for i := 0; i < n; i++ {
 
-				x := reflect.Indirect(reflect.New(in.Type().Elem()))
 
-				mergeAny(x, in.Index(i), false, nil)
 
-				out.Set(reflect.Append(out, x))
 
-			}
 
-		}
 
-	case reflect.Struct:
 
-		mergeStruct(out, in)
 
-	default:
 
-		// unknown type, so not a protocol buffer
 
-		log.Printf("proto: don't know how to copy %v", in)
 
-	}
 
-}
 
-
 
-func mergeExtension(out, in map[int32]Extension) {
 
-	for extNum, eIn := range in {
 
-		eOut := Extension{desc: eIn.desc}
 
-		if eIn.value != nil {
 
-			v := reflect.New(reflect.TypeOf(eIn.value)).Elem()
 
-			mergeAny(v, reflect.ValueOf(eIn.value), false, nil)
 
-			eOut.value = v.Interface()
 
-		}
 
-		if eIn.enc != nil {
 
-			eOut.enc = make([]byte, len(eIn.enc))
 
-			copy(eOut.enc, eIn.enc)
 
-		}
 
-
 
-		out[extNum] = eOut
 
-	}
 
-}

+ 0 - 427
vendor/github.com/golang/protobuf/proto/decode.go
Просмотреть файл 

@@ -1,427 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-/*
 
- * Routines for decoding protocol buffer data to construct in-memory representations.
 
- */
 
-
 
-import (
 
-	"errors"
 
-	"fmt"
 
-	"io"
 
-)
 
-
 
-// errOverflow is returned when an integer is too large to be represented.
 
-var errOverflow = errors.New("proto: integer overflow")
 
-
 
-// ErrInternalBadWireType is returned by generated code when an incorrect
 
-// wire type is encountered. It does not get returned to user code.
 
-var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
 
-
 
-// DecodeVarint reads a varint-encoded integer from the slice.
 
-// It returns the integer and the number of bytes consumed, or
 
-// zero if there is not enough.
 
-// This is the format for the
 
-// int32, int64, uint32, uint64, bool, and enum
 
-// protocol buffer types.
 
-func DecodeVarint(buf []byte) (x uint64, n int) {
 
-	for shift := uint(0); shift < 64; shift += 7 {
 
-		if n >= len(buf) {
 
-			return 0, 0
 
-		}
 
-		b := uint64(buf[n])
 
-		n++
 
-		x |= (b & 0x7F) << shift
 
-		if (b & 0x80) == 0 {
 
-			return x, n
 
-		}
 
-	}
 
-
 
-	// The number is too large to represent in a 64-bit value.
 
-	return 0, 0
 
-}
 
-
 
-func (p *Buffer) decodeVarintSlow() (x uint64, err error) {
 
-	i := p.index
 
-	l := len(p.buf)
 
-
 
-	for shift := uint(0); shift < 64; shift += 7 {
 
-		if i >= l {
 
-			err = io.ErrUnexpectedEOF
 
-			return
 
-		}
 
-		b := p.buf[i]
 
-		i++
 
-		x |= (uint64(b) & 0x7F) << shift
 
-		if b < 0x80 {
 
-			p.index = i
 
-			return
 
-		}
 
-	}
 
-
 
-	// The number is too large to represent in a 64-bit value.
 
-	err = errOverflow
 
-	return
 
-}
 
-
 
-// DecodeVarint reads a varint-encoded integer from the Buffer.
 
-// This is the format for the
 
-// int32, int64, uint32, uint64, bool, and enum
 
-// protocol buffer types.
 
-func (p *Buffer) DecodeVarint() (x uint64, err error) {
 
-	i := p.index
 
-	buf := p.buf
 
-
 
-	if i >= len(buf) {
 
-		return 0, io.ErrUnexpectedEOF
 
-	} else if buf[i] < 0x80 {
 
-		p.index++
 
-		return uint64(buf[i]), nil
 
-	} else if len(buf)-i < 10 {
 
-		return p.decodeVarintSlow()
 
-	}
 
-
 
-	var b uint64
 
-	// we already checked the first byte
 
-	x = uint64(buf[i]) - 0x80
 
-	i++
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 7
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 7
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 14
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 14
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 21
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 21
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 28
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 28
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 35
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 35
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 42
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 42
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 49
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 49
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 56
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-	x -= 0x80 << 56
 
-
 
-	b = uint64(buf[i])
 
-	i++
 
-	x += b << 63
 
-	if b&0x80 == 0 {
 
-		goto done
 
-	}
 
-
 
-	return 0, errOverflow
 
-
 
-done:
 
-	p.index = i
 
-	return x, nil
 
-}
 
-
 
-// DecodeFixed64 reads a 64-bit integer from the Buffer.
 
-// This is the format for the
 
-// fixed64, sfixed64, and double protocol buffer types.
 
-func (p *Buffer) DecodeFixed64() (x uint64, err error) {
 
-	// x, err already 0
 
-	i := p.index + 8
 
-	if i < 0 || i > len(p.buf) {
 
-		err = io.ErrUnexpectedEOF
 
-		return
 
-	}
 
-	p.index = i
 
-
 
-	x = uint64(p.buf[i-8])
 
-	x |= uint64(p.buf[i-7]) << 8
 
-	x |= uint64(p.buf[i-6]) << 16
 
-	x |= uint64(p.buf[i-5]) << 24
 
-	x |= uint64(p.buf[i-4]) << 32
 
-	x |= uint64(p.buf[i-3]) << 40
 
-	x |= uint64(p.buf[i-2]) << 48
 
-	x |= uint64(p.buf[i-1]) << 56
 
-	return
 
-}
 
-
 
-// DecodeFixed32 reads a 32-bit integer from the Buffer.
 
-// This is the format for the
 
-// fixed32, sfixed32, and float protocol buffer types.
 
-func (p *Buffer) DecodeFixed32() (x uint64, err error) {
 
-	// x, err already 0
 
-	i := p.index + 4
 
-	if i < 0 || i > len(p.buf) {
 
-		err = io.ErrUnexpectedEOF
 
-		return
 
-	}
 
-	p.index = i
 
-
 
-	x = uint64(p.buf[i-4])
 
-	x |= uint64(p.buf[i-3]) << 8
 
-	x |= uint64(p.buf[i-2]) << 16
 
-	x |= uint64(p.buf[i-1]) << 24
 
-	return
 
-}
 
-
 
-// DecodeZigzag64 reads a zigzag-encoded 64-bit integer
 
-// from the Buffer.
 
-// This is the format used for the sint64 protocol buffer type.
 
-func (p *Buffer) DecodeZigzag64() (x uint64, err error) {
 
-	x, err = p.DecodeVarint()
 
-	if err != nil {
 
-		return
 
-	}
 
-	x = (x >> 1) ^ uint64((int64(x&1)<<63)>>63)
 
-	return
 
-}
 
-
 
-// DecodeZigzag32 reads a zigzag-encoded 32-bit integer
 
-// from  the Buffer.
 
-// This is the format used for the sint32 protocol buffer type.
 
-func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
 
-	x, err = p.DecodeVarint()
 
-	if err != nil {
 
-		return
 
-	}
 
-	x = uint64((uint32(x) >> 1) ^ uint32((int32(x&1)<<31)>>31))
 
-	return
 
-}
 
-
 
-// DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
 
-// This is the format used for the bytes protocol buffer
 
-// type and for embedded messages.
 
-func (p *Buffer) DecodeRawBytes(alloc bool) (buf []byte, err error) {
 
-	n, err := p.DecodeVarint()
 
-	if err != nil {
 
-		return nil, err
 
-	}
 
-
 
-	nb := int(n)
 
-	if nb < 0 {
 
-		return nil, fmt.Errorf("proto: bad byte length %d", nb)
 
-	}
 
-	end := p.index + nb
 
-	if end < p.index || end > len(p.buf) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-
 
-	if !alloc {
 
-		// todo: check if can get more uses of alloc=false
 
-		buf = p.buf[p.index:end]
 
-		p.index += nb
 
-		return
 
-	}
 
-
 
-	buf = make([]byte, nb)
 
-	copy(buf, p.buf[p.index:])
 
-	p.index += nb
 
-	return
 
-}
 
-
 
-// DecodeStringBytes reads an encoded string from the Buffer.
 
-// This is the format used for the proto2 string type.
 
-func (p *Buffer) DecodeStringBytes() (s string, err error) {
 
-	buf, err := p.DecodeRawBytes(false)
 
-	if err != nil {
 
-		return
 
-	}
 
-	return string(buf), nil
 
-}
 
-
 
-// Unmarshaler is the interface representing objects that can
 
-// unmarshal themselves.  The argument points to data that may be
 
-// overwritten, so implementations should not keep references to the
 
-// buffer.
 
-// Unmarshal implementations should not clear the receiver.
 
-// Any unmarshaled data should be merged into the receiver.
 
-// Callers of Unmarshal that do not want to retain existing data
 
-// should Reset the receiver before calling Unmarshal.
 
-type Unmarshaler interface {
 
-	Unmarshal([]byte) error
 
-}
 
-
 
-// newUnmarshaler is the interface representing objects that can
 
-// unmarshal themselves. The semantics are identical to Unmarshaler.
 
-//
 
-// This exists to support protoc-gen-go generated messages.
 
-// The proto package will stop type-asserting to this interface in the future.
 
-//
 
-// DO NOT DEPEND ON THIS.
 
-type newUnmarshaler interface {
 
-	XXX_Unmarshal([]byte) error
 
-}
 
-
 
-// Unmarshal parses the protocol buffer representation in buf and places the
 
-// decoded result in pb.  If the struct underlying pb does not match
 
-// the data in buf, the results can be unpredictable.
 
-//
 
-// Unmarshal resets pb before starting to unmarshal, so any
 
-// existing data in pb is always removed. Use UnmarshalMerge
 
-// to preserve and append to existing data.
 
-func Unmarshal(buf []byte, pb Message) error {
 
-	pb.Reset()
 
-	if u, ok := pb.(newUnmarshaler); ok {
 
-		return u.XXX_Unmarshal(buf)
 
-	}
 
-	if u, ok := pb.(Unmarshaler); ok {
 
-		return u.Unmarshal(buf)
 
-	}
 
-	return NewBuffer(buf).Unmarshal(pb)
 
-}
 
-
 
-// UnmarshalMerge parses the protocol buffer representation in buf and
 
-// writes the decoded result to pb.  If the struct underlying pb does not match
 
-// the data in buf, the results can be unpredictable.
 
-//
 
-// UnmarshalMerge merges into existing data in pb.
 
-// Most code should use Unmarshal instead.
 
-func UnmarshalMerge(buf []byte, pb Message) error {
 
-	if u, ok := pb.(newUnmarshaler); ok {
 
-		return u.XXX_Unmarshal(buf)
 
-	}
 
-	if u, ok := pb.(Unmarshaler); ok {
 
-		// NOTE: The history of proto have unfortunately been inconsistent
 
-		// whether Unmarshaler should or should not implicitly clear itself.
 
-		// Some implementations do, most do not.
 
-		// Thus, calling this here may or may not do what people want.
 
-		//
 
-		// See https://github.com/golang/protobuf/issues/424
 
-		return u.Unmarshal(buf)
 
-	}
 
-	return NewBuffer(buf).Unmarshal(pb)
 
-}
 
-
 
-// DecodeMessage reads a count-delimited message from the Buffer.
 
-func (p *Buffer) DecodeMessage(pb Message) error {
 
-	enc, err := p.DecodeRawBytes(false)
 
-	if err != nil {
 
-		return err
 
-	}
 
-	return NewBuffer(enc).Unmarshal(pb)
 
-}
 
-
 
-// DecodeGroup reads a tag-delimited group from the Buffer.
 
-// StartGroup tag is already consumed. This function consumes
 
-// EndGroup tag.
 
-func (p *Buffer) DecodeGroup(pb Message) error {
 
-	b := p.buf[p.index:]
 
-	x, y := findEndGroup(b)
 
-	if x < 0 {
 
-		return io.ErrUnexpectedEOF
 
-	}
 
-	err := Unmarshal(b[:x], pb)
 
-	p.index += y
 
-	return err
 
-}
 
-
 
-// Unmarshal parses the protocol buffer representation in the
 
-// Buffer and places the decoded result in pb.  If the struct
 
-// underlying pb does not match the data in the buffer, the results can be
 
-// unpredictable.
 
-//
 
-// Unlike proto.Unmarshal, this does not reset pb before starting to unmarshal.
 
-func (p *Buffer) Unmarshal(pb Message) error {
 
-	// If the object can unmarshal itself, let it.
 
-	if u, ok := pb.(newUnmarshaler); ok {
 
-		err := u.XXX_Unmarshal(p.buf[p.index:])
 
-		p.index = len(p.buf)
 
-		return err
 
-	}
 
-	if u, ok := pb.(Unmarshaler); ok {
 
-		// NOTE: The history of proto have unfortunately been inconsistent
 
-		// whether Unmarshaler should or should not implicitly clear itself.
 
-		// Some implementations do, most do not.
 
-		// Thus, calling this here may or may not do what people want.
 
-		//
 
-		// See https://github.com/golang/protobuf/issues/424
 
-		err := u.Unmarshal(p.buf[p.index:])
 
-		p.index = len(p.buf)
 
-		return err
 
-	}
 
-
 
-	// Slow workaround for messages that aren't Unmarshalers.
 
-	// This includes some hand-coded .pb.go files and
 
-	// bootstrap protos.
 
-	// TODO: fix all of those and then add Unmarshal to
 
-	// the Message interface. Then:
 
-	// The cast above and code below can be deleted.
 
-	// The old unmarshaler can be deleted.
 
-	// Clients can call Unmarshal directly (can already do that, actually).
 
-	var info InternalMessageInfo
 
-	err := info.Unmarshal(pb, p.buf[p.index:])
 
-	p.index = len(p.buf)
 
-	return err
 
-}

+ 63 - 0
vendor/github.com/golang/protobuf/proto/defaults.go
Просмотреть файл 

@@ -0,0 +1,63 @@
 
+// Copyright 2019 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
+
 
+package proto
 
+
 
+import (
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
+)
 
+
 
+// SetDefaults sets unpopulated scalar fields to their default values.
 
+// Fields within a oneof are not set even if they have a default value.
 
+// SetDefaults is recursively called upon any populated message fields.
 
+func SetDefaults(m Message) {
 
+	if m != nil {
 
+		setDefaults(MessageReflect(m))
 
+	}
 
+}
 
+
 
+func setDefaults(m protoreflect.Message) {
 
+	fds := m.Descriptor().Fields()
 
+	for i := 0; i < fds.Len(); i++ {
 
+		fd := fds.Get(i)
 
+		if !m.Has(fd) {
 
+			if fd.HasDefault() && fd.ContainingOneof() == nil {
 
+				v := fd.Default()
 
+				if fd.Kind() == protoreflect.BytesKind {
 
+					v = protoreflect.ValueOf(append([]byte(nil), v.Bytes()...)) // copy the default bytes
 
+				}
 
+				m.Set(fd, v)
 
+			}
 
+			continue
 
+		}
 
+	}
 
+
 
+	m.Range(func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
 
+		switch {
 
+		// Handle singular message.
 
+		case fd.Cardinality() != protoreflect.Repeated:
 
+			if fd.Message() != nil {
 
+				setDefaults(m.Get(fd).Message())
 
+			}
 
+		// Handle list of messages.
 
+		case fd.IsList():
 
+			if fd.Message() != nil {
 
+				ls := m.Get(fd).List()
 
+				for i := 0; i < ls.Len(); i++ {
 
+					setDefaults(ls.Get(i).Message())
 
+				}
 
+			}
 
+		// Handle map of messages.
 
+		case fd.IsMap():
 
+			if fd.MapValue().Message() != nil {
 
+				ms := m.Get(fd).Map()
 
+				ms.Range(func(_ protoreflect.MapKey, v protoreflect.Value) bool {
 
+					setDefaults(v.Message())
 
+					return true
 
+				})
 
+			}
 
+		}
 
+		return true
 
+	})
 
+}

+ 88 - 38
vendor/github.com/golang/protobuf/proto/deprecated.go
Просмотреть файл 

@@ -1,63 +1,113 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2018 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Copyright 2018 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
 
 package proto
 
 
-import "errors"
 
+import (
 
+	"encoding/json"
 
+	"errors"
 
+	"fmt"
 
+	"strconv"
 
 
-// Deprecated: do not use.
 
+	protoV2 "google.golang.org/protobuf/proto"
 
+)
 
+
 
+var (
 
+	// Deprecated: No longer returned.
 
+	ErrNil = errors.New("proto: Marshal called with nil")
 
+
 
+	// Deprecated: No longer returned.
 
+	ErrTooLarge = errors.New("proto: message encodes to over 2 GB")
 
+
 
+	// Deprecated: No longer returned.
 
+	ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
 
+)
 
+
 
+// Deprecated: Do not use.
 
 type Stats struct{ Emalloc, Dmalloc, Encode, Decode, Chit, Cmiss, Size uint64 }
 
 
-// Deprecated: do not use.
 
+// Deprecated: Do not use.
 
 func GetStats() Stats { return Stats{} }
 
 
-// Deprecated: do not use.
 
+// Deprecated: Do not use.
 
 func MarshalMessageSet(interface{}) ([]byte, error) {
 
 	return nil, errors.New("proto: not implemented")
 
 }
 
 
-// Deprecated: do not use.
 
+// Deprecated: Do not use.
 
 func UnmarshalMessageSet([]byte, interface{}) error {
 
 	return errors.New("proto: not implemented")
 
 }
 
 
-// Deprecated: do not use.
 
+// Deprecated: Do not use.
 
 func MarshalMessageSetJSON(interface{}) ([]byte, error) {
 
 	return nil, errors.New("proto: not implemented")
 
 }
 
 
-// Deprecated: do not use.
 
+// Deprecated: Do not use.
 
 func UnmarshalMessageSetJSON([]byte, interface{}) error {
 
 	return errors.New("proto: not implemented")
 
 }
 
 
-// Deprecated: do not use.
 
+// Deprecated: Do not use.
 
 func RegisterMessageSetType(Message, int32, string) {}
 
+
 
+// Deprecated: Do not use.
 
+func EnumName(m map[int32]string, v int32) string {
 
+	s, ok := m[v]
 
+	if ok {
 
+		return s
 
+	}
 
+	return strconv.Itoa(int(v))
 
+}
 
+
 
+// Deprecated: Do not use.
 
+func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
 
+	if data[0] == '"' {
 
+		// New style: enums are strings.
 
+		var repr string
 
+		if err := json.Unmarshal(data, &repr); err != nil {
 
+			return -1, err
 
+		}
 
+		val, ok := m[repr]
 
+		if !ok {
 
+			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
 
+		}
 
+		return val, nil
 
+	}
 
+	// Old style: enums are ints.
 
+	var val int32
 
+	if err := json.Unmarshal(data, &val); err != nil {
 
+		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
 
+	}
 
+	return val, nil
 
+}
 
+
 
+// Deprecated: Do not use; this type existed for intenal-use only.
 
+type InternalMessageInfo struct{}
 
+
 
+// Deprecated: Do not use; this method existed for intenal-use only.
 
+func (*InternalMessageInfo) DiscardUnknown(m Message) {
 
+	DiscardUnknown(m)
 
+}
 
+
 
+// Deprecated: Do not use; this method existed for intenal-use only.
 
+func (*InternalMessageInfo) Marshal(b []byte, m Message, deterministic bool) ([]byte, error) {
 
+	return protoV2.MarshalOptions{Deterministic: deterministic}.MarshalAppend(b, MessageV2(m))
 
+}
 
+
 
+// Deprecated: Do not use; this method existed for intenal-use only.
 
+func (*InternalMessageInfo) Merge(dst, src Message) {
 
+	protoV2.Merge(MessageV2(dst), MessageV2(src))
 
+}
 
+
 
+// Deprecated: Do not use; this method existed for intenal-use only.
 
+func (*InternalMessageInfo) Size(m Message) int {
 
+	return protoV2.Size(MessageV2(m))
 
+}
 
+
 
+// Deprecated: Do not use; this method existed for intenal-use only.
 
+func (*InternalMessageInfo) Unmarshal(m Message, b []byte) error {
 
+	return protoV2.UnmarshalOptions{Merge: true}.Unmarshal(b, MessageV2(m))
 
+}

+ 32 - 324
vendor/github.com/golang/protobuf/proto/discard.go
Просмотреть файл 

@@ -1,48 +1,13 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2017 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Copyright 2019 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
 
 package proto
 
 
 import (
 
-	"fmt"
 
-	"reflect"
 
-	"strings"
 
-	"sync"
 
-	"sync/atomic"
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
 )
 
 
-type generatedDiscarder interface {
 
-	XXX_DiscardUnknown()
 
-}
 
-
 
 // DiscardUnknown recursively discards all unknown fields from this message
 
 // and all embedded messages.
 
 //
 
@@ -51,300 +16,43 @@ type generatedDiscarder interface {
 
 // marshal to be able to produce a message that continues to have those
 
 // unrecognized fields. To avoid this, DiscardUnknown is used to
 
 // explicitly clear the unknown fields after unmarshaling.
 
-//
 
-// For proto2 messages, the unknown fields of message extensions are only
 
-// discarded from messages that have been accessed via GetExtension.
 
 func DiscardUnknown(m Message) {
 
-	if m, ok := m.(generatedDiscarder); ok {
 
-		m.XXX_DiscardUnknown()
 
-		return
 
-	}
 
-	// TODO: Dynamically populate a InternalMessageInfo for legacy messages,
 
-	// but the master branch has no implementation for InternalMessageInfo,
 
-	// so it would be more work to replicate that approach.
 
-	discardLegacy(m)
 
-}
 
-
 
-// DiscardUnknown recursively discards all unknown fields.
 
-func (a *InternalMessageInfo) DiscardUnknown(m Message) {
 
-	di := atomicLoadDiscardInfo(&a.discard)
 
-	if di == nil {
 
-		di = getDiscardInfo(reflect.TypeOf(m).Elem())
 
-		atomicStoreDiscardInfo(&a.discard, di)
 
-	}
 
-	di.discard(toPointer(&m))
 
-}
 
-
 
-type discardInfo struct {
 
-	typ reflect.Type
 
-
 
-	initialized int32 // 0: only typ is valid, 1: everything is valid
 
-	lock        sync.Mutex
 
-
 
-	fields       []discardFieldInfo
 
-	unrecognized field
 
-}
 
-
 
-type discardFieldInfo struct {
 
-	field   field // Offset of field, guaranteed to be valid
 
-	discard func(src pointer)
 
-}
 
-
 
-var (
 
-	discardInfoMap  = map[reflect.Type]*discardInfo{}
 
-	discardInfoLock sync.Mutex
 
-)
 
-
 
-func getDiscardInfo(t reflect.Type) *discardInfo {
 
-	discardInfoLock.Lock()
 
-	defer discardInfoLock.Unlock()
 
-	di := discardInfoMap[t]
 
-	if di == nil {
 
-		di = &discardInfo{typ: t}
 
-		discardInfoMap[t] = di
 
+	if m != nil {
 
+		discardUnknown(MessageReflect(m))
 
 	}
 
-	return di
 
 }
 
 
-func (di *discardInfo) discard(src pointer) {
 
-	if src.isNil() {
 
-		return // Nothing to do.
 
-	}
 
-
 
-	if atomic.LoadInt32(&di.initialized) == 0 {
 
-		di.computeDiscardInfo()
 
-	}
 
-
 
-	for _, fi := range di.fields {
 
-		sfp := src.offset(fi.field)
 
-		fi.discard(sfp)
 
-	}
 
-
 
-	// For proto2 messages, only discard unknown fields in message extensions
 
-	// that have been accessed via GetExtension.
 
-	if em, err := extendable(src.asPointerTo(di.typ).Interface()); err == nil {
 
-		// Ignore lock since DiscardUnknown is not concurrency safe.
 
-		emm, _ := em.extensionsRead()
 
-		for _, mx := range emm {
 
-			if m, ok := mx.value.(Message); ok {
 
-				DiscardUnknown(m)
 
+func discardUnknown(m protoreflect.Message) {
 
+	m.Range(func(fd protoreflect.FieldDescriptor, val protoreflect.Value) bool {
 
+		switch {
 
+		// Handle singular message.
 
+		case fd.Cardinality() != protoreflect.Repeated:
 
+			if fd.Message() != nil {
 
+				discardUnknown(m.Get(fd).Message())
 
 			}
 
-		}
 
-	}
 
-
 
-	if di.unrecognized.IsValid() {
 
-		*src.offset(di.unrecognized).toBytes() = nil
 
-	}
 
-}
 
-
 
-func (di *discardInfo) computeDiscardInfo() {
 
-	di.lock.Lock()
 
-	defer di.lock.Unlock()
 
-	if di.initialized != 0 {
 
-		return
 
-	}
 
-	t := di.typ
 
-	n := t.NumField()
 
-
 
-	for i := 0; i < n; i++ {
 
-		f := t.Field(i)
 
-		if strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
-		}
 
-
 
-		dfi := discardFieldInfo{field: toField(&f)}
 
-		tf := f.Type
 
-
 
-		// Unwrap tf to get its most basic type.
 
-		var isPointer, isSlice bool
 
-		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
 
-			isSlice = true
 
-			tf = tf.Elem()
 
-		}
 
-		if tf.Kind() == reflect.Ptr {
 
-			isPointer = true
 
-			tf = tf.Elem()
 
-		}
 
-		if isPointer && isSlice && tf.Kind() != reflect.Struct {
 
-			panic(fmt.Sprintf("%v.%s cannot be a slice of pointers to primitive types", t, f.Name))
 
-		}
 
-
 
-		switch tf.Kind() {
 
-		case reflect.Struct:
 
-			switch {
 
-			case !isPointer:
 
-				panic(fmt.Sprintf("%v.%s cannot be a direct struct value", t, f.Name))
 
-			case isSlice: // E.g., []*pb.T
 
-				di := getDiscardInfo(tf)
 
-				dfi.discard = func(src pointer) {
 
-					sps := src.getPointerSlice()
 
-					for _, sp := range sps {
 
-						if !sp.isNil() {
 
-							di.discard(sp)
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., *pb.T
 
-				di := getDiscardInfo(tf)
 
-				dfi.discard = func(src pointer) {
 
-					sp := src.getPointer()
 
-					if !sp.isNil() {
 
-						di.discard(sp)
 
-					}
 
+		// Handle list of messages.
 
+		case fd.IsList():
 
+			if fd.Message() != nil {
 
+				ls := m.Get(fd).List()
 
+				for i := 0; i < ls.Len(); i++ {
 
+					discardUnknown(ls.Get(i).Message())
 
 				}
 
 			}
 
-		case reflect.Map:
 
-			switch {
 
-			case isPointer || isSlice:
 
-				panic(fmt.Sprintf("%v.%s cannot be a pointer to a map or a slice of map values", t, f.Name))
 
-			default: // E.g., map[K]V
 
-				if tf.Elem().Kind() == reflect.Ptr { // Proto struct (e.g., *T)
 
-					dfi.discard = func(src pointer) {
 
-						sm := src.asPointerTo(tf).Elem()
 
-						if sm.Len() == 0 {
 
-							return
 
-						}
 
-						for _, key := range sm.MapKeys() {
 
-							val := sm.MapIndex(key)
 
-							DiscardUnknown(val.Interface().(Message))
 
-						}
 
-					}
 
-				} else {
 
-					dfi.discard = func(pointer) {} // Noop
 
-				}
 
-			}
 
-		case reflect.Interface:
 
-			// Must be oneof field.
 
-			switch {
 
-			case isPointer || isSlice:
 
-				panic(fmt.Sprintf("%v.%s cannot be a pointer to a interface or a slice of interface values", t, f.Name))
 
-			default: // E.g., interface{}
 
-				// TODO: Make this faster?
 
-				dfi.discard = func(src pointer) {
 
-					su := src.asPointerTo(tf).Elem()
 
-					if !su.IsNil() {
 
-						sv := su.Elem().Elem().Field(0)
 
-						if sv.Kind() == reflect.Ptr && sv.IsNil() {
 
-							return
 
-						}
 
-						switch sv.Type().Kind() {
 
-						case reflect.Ptr: // Proto struct (e.g., *T)
 
-							DiscardUnknown(sv.Interface().(Message))
 
-						}
 
-					}
 
-				}
 
+		// Handle map of messages.
 
+		case fd.IsMap():
 
+			if fd.MapValue().Message() != nil {
 
+				ms := m.Get(fd).Map()
 
+				ms.Range(func(_ protoreflect.MapKey, v protoreflect.Value) bool {
 
+					discardUnknown(v.Message())
 
+					return true
 
+				})
 
 			}
 
-		default:
 
-			continue
 
-		}
 
-		di.fields = append(di.fields, dfi)
 
-	}
 
-
 
-	di.unrecognized = invalidField
 
-	if f, ok := t.FieldByName("XXX_unrecognized"); ok {
 
-		if f.Type != reflect.TypeOf([]byte{}) {
 
-			panic("expected XXX_unrecognized to be of type []byte")
 
-		}
 
-		di.unrecognized = toField(&f)
 
-	}
 
-
 
-	atomic.StoreInt32(&di.initialized, 1)
 
-}
 
-
 
-func discardLegacy(m Message) {
 
-	v := reflect.ValueOf(m)
 
-	if v.Kind() != reflect.Ptr || v.IsNil() {
 
-		return
 
-	}
 
-	v = v.Elem()
 
-	if v.Kind() != reflect.Struct {
 
-		return
 
-	}
 
-	t := v.Type()
 
-
 
-	for i := 0; i < v.NumField(); i++ {
 
-		f := t.Field(i)
 
-		if strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
 		}
 
-		vf := v.Field(i)
 
-		tf := f.Type
 
+		return true
 
+	})
 
 
-		// Unwrap tf to get its most basic type.
 
-		var isPointer, isSlice bool
 
-		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
 
-			isSlice = true
 
-			tf = tf.Elem()
 
-		}
 
-		if tf.Kind() == reflect.Ptr {
 
-			isPointer = true
 
-			tf = tf.Elem()
 
-		}
 
-		if isPointer && isSlice && tf.Kind() != reflect.Struct {
 
-			panic(fmt.Sprintf("%T.%s cannot be a slice of pointers to primitive types", m, f.Name))
 
-		}
 
-
 
-		switch tf.Kind() {
 
-		case reflect.Struct:
 
-			switch {
 
-			case !isPointer:
 
-				panic(fmt.Sprintf("%T.%s cannot be a direct struct value", m, f.Name))
 
-			case isSlice: // E.g., []*pb.T
 
-				for j := 0; j < vf.Len(); j++ {
 
-					discardLegacy(vf.Index(j).Interface().(Message))
 
-				}
 
-			default: // E.g., *pb.T
 
-				discardLegacy(vf.Interface().(Message))
 
-			}
 
-		case reflect.Map:
 
-			switch {
 
-			case isPointer || isSlice:
 
-				panic(fmt.Sprintf("%T.%s cannot be a pointer to a map or a slice of map values", m, f.Name))
 
-			default: // E.g., map[K]V
 
-				tv := vf.Type().Elem()
 
-				if tv.Kind() == reflect.Ptr && tv.Implements(protoMessageType) { // Proto struct (e.g., *T)
 
-					for _, key := range vf.MapKeys() {
 
-						val := vf.MapIndex(key)
 
-						discardLegacy(val.Interface().(Message))
 
-					}
 
-				}
 
-			}
 
-		case reflect.Interface:
 
-			// Must be oneof field.
 
-			switch {
 
-			case isPointer || isSlice:
 
-				panic(fmt.Sprintf("%T.%s cannot be a pointer to a interface or a slice of interface values", m, f.Name))
 
-			default: // E.g., test_proto.isCommunique_Union interface
 
-				if !vf.IsNil() && f.Tag.Get("protobuf_oneof") != "" {
 
-					vf = vf.Elem() // E.g., *test_proto.Communique_Msg
 
-					if !vf.IsNil() {
 
-						vf = vf.Elem()   // E.g., test_proto.Communique_Msg
 
-						vf = vf.Field(0) // E.g., Proto struct (e.g., *T) or primitive value
 
-						if vf.Kind() == reflect.Ptr {
 
-							discardLegacy(vf.Interface().(Message))
 
-						}
 
-					}
 
-				}
 
-			}
 
-		}
 
-	}
 
-
 
-	if vf := v.FieldByName("XXX_unrecognized"); vf.IsValid() {
 
-		if vf.Type() != reflect.TypeOf([]byte{}) {
 
-			panic("expected XXX_unrecognized to be of type []byte")
 
-		}
 
-		vf.Set(reflect.ValueOf([]byte(nil)))
 
-	}
 
-
 
-	// For proto2 messages, only discard unknown fields in message extensions
 
-	// that have been accessed via GetExtension.
 
-	if em, err := extendable(m); err == nil {
 
-		// Ignore lock since discardLegacy is not concurrency safe.
 
-		emm, _ := em.extensionsRead()
 
-		for _, mx := range emm {
 
-			if m, ok := mx.value.(Message); ok {
 
-				discardLegacy(m)
 
-			}
 
-		}
 
+	// Discard unknown fields.
 
+	if len(m.GetUnknown()) > 0 {
 
+		m.SetUnknown(nil)
 
 	}
 
 }

+ 0 - 203
vendor/github.com/golang/protobuf/proto/encode.go
Просмотреть файл 

@@ -1,203 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-/*
 
- * Routines for encoding data into the wire format for protocol buffers.
 
- */
 
-
 
-import (
 
-	"errors"
 
-	"reflect"
 
-)
 
-
 
-var (
 
-	// errRepeatedHasNil is the error returned if Marshal is called with
 
-	// a struct with a repeated field containing a nil element.
 
-	errRepeatedHasNil = errors.New("proto: repeated field has nil element")
 
-
 
-	// errOneofHasNil is the error returned if Marshal is called with
 
-	// a struct with a oneof field containing a nil element.
 
-	errOneofHasNil = errors.New("proto: oneof field has nil value")
 
-
 
-	// ErrNil is the error returned if Marshal is called with nil.
 
-	ErrNil = errors.New("proto: Marshal called with nil")
 
-
 
-	// ErrTooLarge is the error returned if Marshal is called with a
 
-	// message that encodes to >2GB.
 
-	ErrTooLarge = errors.New("proto: message encodes to over 2 GB")
 
-)
 
-
 
-// The fundamental encoders that put bytes on the wire.
 
-// Those that take integer types all accept uint64 and are
 
-// therefore of type valueEncoder.
 
-
 
-const maxVarintBytes = 10 // maximum length of a varint
 
-
 
-// EncodeVarint returns the varint encoding of x.
 
-// This is the format for the
 
-// int32, int64, uint32, uint64, bool, and enum
 
-// protocol buffer types.
 
-// Not used by the package itself, but helpful to clients
 
-// wishing to use the same encoding.
 
-func EncodeVarint(x uint64) []byte {
 
-	var buf [maxVarintBytes]byte
 
-	var n int
 
-	for n = 0; x > 127; n++ {
 
-		buf[n] = 0x80 | uint8(x&0x7F)
 
-		x >>= 7
 
-	}
 
-	buf[n] = uint8(x)
 
-	n++
 
-	return buf[0:n]
 
-}
 
-
 
-// EncodeVarint writes a varint-encoded integer to the Buffer.
 
-// This is the format for the
 
-// int32, int64, uint32, uint64, bool, and enum
 
-// protocol buffer types.
 
-func (p *Buffer) EncodeVarint(x uint64) error {
 
-	for x >= 1<<7 {
 
-		p.buf = append(p.buf, uint8(x&0x7f|0x80))
 
-		x >>= 7
 
-	}
 
-	p.buf = append(p.buf, uint8(x))
 
-	return nil
 
-}
 
-
 
-// SizeVarint returns the varint encoding size of an integer.
 
-func SizeVarint(x uint64) int {
 
-	switch {
 
-	case x < 1<<7:
 
-		return 1
 
-	case x < 1<<14:
 
-		return 2
 
-	case x < 1<<21:
 
-		return 3
 
-	case x < 1<<28:
 
-		return 4
 
-	case x < 1<<35:
 
-		return 5
 
-	case x < 1<<42:
 
-		return 6
 
-	case x < 1<<49:
 
-		return 7
 
-	case x < 1<<56:
 
-		return 8
 
-	case x < 1<<63:
 
-		return 9
 
-	}
 
-	return 10
 
-}
 
-
 
-// EncodeFixed64 writes a 64-bit integer to the Buffer.
 
-// This is the format for the
 
-// fixed64, sfixed64, and double protocol buffer types.
 
-func (p *Buffer) EncodeFixed64(x uint64) error {
 
-	p.buf = append(p.buf,
 
-		uint8(x),
 
-		uint8(x>>8),
 
-		uint8(x>>16),
 
-		uint8(x>>24),
 
-		uint8(x>>32),
 
-		uint8(x>>40),
 
-		uint8(x>>48),
 
-		uint8(x>>56))
 
-	return nil
 
-}
 
-
 
-// EncodeFixed32 writes a 32-bit integer to the Buffer.
 
-// This is the format for the
 
-// fixed32, sfixed32, and float protocol buffer types.
 
-func (p *Buffer) EncodeFixed32(x uint64) error {
 
-	p.buf = append(p.buf,
 
-		uint8(x),
 
-		uint8(x>>8),
 
-		uint8(x>>16),
 
-		uint8(x>>24))
 
-	return nil
 
-}
 
-
 
-// EncodeZigzag64 writes a zigzag-encoded 64-bit integer
 
-// to the Buffer.
 
-// This is the format used for the sint64 protocol buffer type.
 
-func (p *Buffer) EncodeZigzag64(x uint64) error {
 
-	// use signed number to get arithmetic right shift.
 
-	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 
-}
 
-
 
-// EncodeZigzag32 writes a zigzag-encoded 32-bit integer
 
-// to the Buffer.
 
-// This is the format used for the sint32 protocol buffer type.
 
-func (p *Buffer) EncodeZigzag32(x uint64) error {
 
-	// use signed number to get arithmetic right shift.
 
-	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
 
-}
 
-
 
-// EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
 
-// This is the format used for the bytes protocol buffer
 
-// type and for embedded messages.
 
-func (p *Buffer) EncodeRawBytes(b []byte) error {
 
-	p.EncodeVarint(uint64(len(b)))
 
-	p.buf = append(p.buf, b...)
 
-	return nil
 
-}
 
-
 
-// EncodeStringBytes writes an encoded string to the Buffer.
 
-// This is the format used for the proto2 string type.
 
-func (p *Buffer) EncodeStringBytes(s string) error {
 
-	p.EncodeVarint(uint64(len(s)))
 
-	p.buf = append(p.buf, s...)
 
-	return nil
 
-}
 
-
 
-// Marshaler is the interface representing objects that can marshal themselves.
 
-type Marshaler interface {
 
-	Marshal() ([]byte, error)
 
-}
 
-
 
-// EncodeMessage writes the protocol buffer to the Buffer,
 
-// prefixed by a varint-encoded length.
 
-func (p *Buffer) EncodeMessage(pb Message) error {
 
-	siz := Size(pb)
 
-	p.EncodeVarint(uint64(siz))
 
-	return p.Marshal(pb)
 
-}
 
-
 
-// All protocol buffer fields are nillable, but be careful.
 
-func isNil(v reflect.Value) bool {
 
-	switch v.Kind() {
 
-	case reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
 
-		return v.IsNil()
 
-	}
 
-	return false
 
-}

+ 0 - 301
vendor/github.com/golang/protobuf/proto/equal.go
Просмотреть файл 

@@ -1,301 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2011 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-// Protocol buffer comparison.
 
-
 
-package proto
 
-
 
-import (
 
-	"bytes"
 
-	"log"
 
-	"reflect"
 
-	"strings"
 
-)
 
-
 
-/*
 
-Equal returns true iff protocol buffers a and b are equal.
 
-The arguments must both be pointers to protocol buffer structs.
 
-
 
-Equality is defined in this way:
 
-  - Two messages are equal iff they are the same type,
 
-    corresponding fields are equal, unknown field sets
 
-    are equal, and extensions sets are equal.
 
-  - Two set scalar fields are equal iff their values are equal.
 
-    If the fields are of a floating-point type, remember that
 
-    NaN != x for all x, including NaN. If the message is defined
 
-    in a proto3 .proto file, fields are not "set"; specifically,
 
-    zero length proto3 "bytes" fields are equal (nil == {}).
 
-  - Two repeated fields are equal iff their lengths are the same,
 
-    and their corresponding elements are equal. Note a "bytes" field,
 
-    although represented by []byte, is not a repeated field and the
 
-    rule for the scalar fields described above applies.
 
-  - Two unset fields are equal.
 
-  - Two unknown field sets are equal if their current
 
-    encoded state is equal.
 
-  - Two extension sets are equal iff they have corresponding
 
-    elements that are pairwise equal.
 
-  - Two map fields are equal iff their lengths are the same,
 
-    and they contain the same set of elements. Zero-length map
 
-    fields are equal.
 
-  - Every other combination of things are not equal.
 
-
 
-The return value is undefined if a and b are not protocol buffers.
 
-*/
 
-func Equal(a, b Message) bool {
 
-	if a == nil || b == nil {
 
-		return a == b
 
-	}
 
-	v1, v2 := reflect.ValueOf(a), reflect.ValueOf(b)
 
-	if v1.Type() != v2.Type() {
 
-		return false
 
-	}
 
-	if v1.Kind() == reflect.Ptr {
 
-		if v1.IsNil() {
 
-			return v2.IsNil()
 
-		}
 
-		if v2.IsNil() {
 
-			return false
 
-		}
 
-		v1, v2 = v1.Elem(), v2.Elem()
 
-	}
 
-	if v1.Kind() != reflect.Struct {
 
-		return false
 
-	}
 
-	return equalStruct(v1, v2)
 
-}
 
-
 
-// v1 and v2 are known to have the same type.
 
-func equalStruct(v1, v2 reflect.Value) bool {
 
-	sprop := GetProperties(v1.Type())
 
-	for i := 0; i < v1.NumField(); i++ {
 
-		f := v1.Type().Field(i)
 
-		if strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
-		}
 
-		f1, f2 := v1.Field(i), v2.Field(i)
 
-		if f.Type.Kind() == reflect.Ptr {
 
-			if n1, n2 := f1.IsNil(), f2.IsNil(); n1 && n2 {
 
-				// both unset
 
-				continue
 
-			} else if n1 != n2 {
 
-				// set/unset mismatch
 
-				return false
 
-			}
 
-			f1, f2 = f1.Elem(), f2.Elem()
 
-		}
 
-		if !equalAny(f1, f2, sprop.Prop[i]) {
 
-			return false
 
-		}
 
-	}
 
-
 
-	if em1 := v1.FieldByName("XXX_InternalExtensions"); em1.IsValid() {
 
-		em2 := v2.FieldByName("XXX_InternalExtensions")
 
-		if !equalExtensions(v1.Type(), em1.Interface().(XXX_InternalExtensions), em2.Interface().(XXX_InternalExtensions)) {
 
-			return false
 
-		}
 
-	}
 
-
 
-	if em1 := v1.FieldByName("XXX_extensions"); em1.IsValid() {
 
-		em2 := v2.FieldByName("XXX_extensions")
 
-		if !equalExtMap(v1.Type(), em1.Interface().(map[int32]Extension), em2.Interface().(map[int32]Extension)) {
 
-			return false
 
-		}
 
-	}
 
-
 
-	uf := v1.FieldByName("XXX_unrecognized")
 
-	if !uf.IsValid() {
 
-		return true
 
-	}
 
-
 
-	u1 := uf.Bytes()
 
-	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
 
-	return bytes.Equal(u1, u2)
 
-}
 
-
 
-// v1 and v2 are known to have the same type.
 
-// prop may be nil.
 
-func equalAny(v1, v2 reflect.Value, prop *Properties) bool {
 
-	if v1.Type() == protoMessageType {
 
-		m1, _ := v1.Interface().(Message)
 
-		m2, _ := v2.Interface().(Message)
 
-		return Equal(m1, m2)
 
-	}
 
-	switch v1.Kind() {
 
-	case reflect.Bool:
 
-		return v1.Bool() == v2.Bool()
 
-	case reflect.Float32, reflect.Float64:
 
-		return v1.Float() == v2.Float()
 
-	case reflect.Int32, reflect.Int64:
 
-		return v1.Int() == v2.Int()
 
-	case reflect.Interface:
 
-		// Probably a oneof field; compare the inner values.
 
-		n1, n2 := v1.IsNil(), v2.IsNil()
 
-		if n1 || n2 {
 
-			return n1 == n2
 
-		}
 
-		e1, e2 := v1.Elem(), v2.Elem()
 
-		if e1.Type() != e2.Type() {
 
-			return false
 
-		}
 
-		return equalAny(e1, e2, nil)
 
-	case reflect.Map:
 
-		if v1.Len() != v2.Len() {
 
-			return false
 
-		}
 
-		for _, key := range v1.MapKeys() {
 
-			val2 := v2.MapIndex(key)
 
-			if !val2.IsValid() {
 
-				// This key was not found in the second map.
 
-				return false
 
-			}
 
-			if !equalAny(v1.MapIndex(key), val2, nil) {
 
-				return false
 
-			}
 
-		}
 
-		return true
 
-	case reflect.Ptr:
 
-		// Maps may have nil values in them, so check for nil.
 
-		if v1.IsNil() && v2.IsNil() {
 
-			return true
 
-		}
 
-		if v1.IsNil() != v2.IsNil() {
 
-			return false
 
-		}
 
-		return equalAny(v1.Elem(), v2.Elem(), prop)
 
-	case reflect.Slice:
 
-		if v1.Type().Elem().Kind() == reflect.Uint8 {
 
-			// short circuit: []byte
 
-
 
-			// Edge case: if this is in a proto3 message, a zero length
 
-			// bytes field is considered the zero value.
 
-			if prop != nil && prop.proto3 && v1.Len() == 0 && v2.Len() == 0 {
 
-				return true
 
-			}
 
-			if v1.IsNil() != v2.IsNil() {
 
-				return false
 
-			}
 
-			return bytes.Equal(v1.Interface().([]byte), v2.Interface().([]byte))
 
-		}
 
-
 
-		if v1.Len() != v2.Len() {
 
-			return false
 
-		}
 
-		for i := 0; i < v1.Len(); i++ {
 
-			if !equalAny(v1.Index(i), v2.Index(i), prop) {
 
-				return false
 
-			}
 
-		}
 
-		return true
 
-	case reflect.String:
 
-		return v1.Interface().(string) == v2.Interface().(string)
 
-	case reflect.Struct:
 
-		return equalStruct(v1, v2)
 
-	case reflect.Uint32, reflect.Uint64:
 
-		return v1.Uint() == v2.Uint()
 
-	}
 
-
 
-	// unknown type, so not a protocol buffer
 
-	log.Printf("proto: don't know how to compare %v", v1)
 
-	return false
 
-}
 
-
 
-// base is the struct type that the extensions are based on.
 
-// x1 and x2 are InternalExtensions.
 
-func equalExtensions(base reflect.Type, x1, x2 XXX_InternalExtensions) bool {
 
-	em1, _ := x1.extensionsRead()
 
-	em2, _ := x2.extensionsRead()
 
-	return equalExtMap(base, em1, em2)
 
-}
 
-
 
-func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 
-	if len(em1) != len(em2) {
 
-		return false
 
-	}
 
-
 
-	for extNum, e1 := range em1 {
 
-		e2, ok := em2[extNum]
 
-		if !ok {
 
-			return false
 
-		}
 
-
 
-		m1 := extensionAsLegacyType(e1.value)
 
-		m2 := extensionAsLegacyType(e2.value)
 
-
 
-		if m1 == nil && m2 == nil {
 
-			// Both have only encoded form.
 
-			if bytes.Equal(e1.enc, e2.enc) {
 
-				continue
 
-			}
 
-			// The bytes are different, but the extensions might still be
 
-			// equal. We need to decode them to compare.
 
-		}
 
-
 
-		if m1 != nil && m2 != nil {
 
-			// Both are unencoded.
 
-			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
 
-				return false
 
-			}
 
-			continue
 
-		}
 
-
 
-		// At least one is encoded. To do a semantically correct comparison
 
-		// we need to unmarshal them first.
 
-		var desc *ExtensionDesc
 
-		if m := extensionMaps[base]; m != nil {
 
-			desc = m[extNum]
 
-		}
 
-		if desc == nil {
 
-			// If both have only encoded form and the bytes are the same,
 
-			// it is handled above. We get here when the bytes are different.
 
-			// We don't know how to decode it, so just compare them as byte
 
-			// slices.
 
-			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
 
-			return false
 
-		}
 
-		var err error
 
-		if m1 == nil {
 
-			m1, err = decodeExtension(e1.enc, desc)
 
-		}
 
-		if m2 == nil && err == nil {
 
-			m2, err = decodeExtension(e2.enc, desc)
 
-		}
 
-		if err != nil {
 
-			// The encoded form is invalid.
 
-			log.Printf("proto: badly encoded extension %d of %v: %v", extNum, base, err)
 
-			return false
 
-		}
 
-		if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
 
-			return false
 
-		}
 
-	}
 
-
 
-	return true
 
-}

+ 260 - 511
vendor/github.com/golang/protobuf/proto/extensions.go
Просмотреть файл 

@@ -1,607 +1,356 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Copyright 2010 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
 
 package proto
 
 
-/*
 
- * Types and routines for supporting protocol buffer extensions.
 
- */
 
-
 
 import (
 
 	"errors"
 
 	"fmt"
 
-	"io"
 
 	"reflect"
 
-	"strconv"
 
-	"sync"
 
-)
 
-
 
-// ErrMissingExtension is the error returned by GetExtension if the named extension is not in the message.
 
-var ErrMissingExtension = errors.New("proto: missing extension")
 
-
 
-// ExtensionRange represents a range of message extensions for a protocol buffer.
 
-// Used in code generated by the protocol compiler.
 
-type ExtensionRange struct {
 
-	Start, End int32 // both inclusive
 
-}
 
-
 
-// extendableProto is an interface implemented by any protocol buffer generated by the current
 
-// proto compiler that may be extended.
 
-type extendableProto interface {
 
-	Message
 
-	ExtensionRangeArray() []ExtensionRange
 
-	extensionsWrite() map[int32]Extension
 
-	extensionsRead() (map[int32]Extension, sync.Locker)
 
-}
 
-
 
-// extendableProtoV1 is an interface implemented by a protocol buffer generated by the previous
 
-// version of the proto compiler that may be extended.
 
-type extendableProtoV1 interface {
 
-	Message
 
-	ExtensionRangeArray() []ExtensionRange
 
-	ExtensionMap() map[int32]Extension
 
-}
 
 
-// extensionAdapter is a wrapper around extendableProtoV1 that implements extendableProto.
 
-type extensionAdapter struct {
 
-	extendableProtoV1
 
-}
 
+	"google.golang.org/protobuf/encoding/protowire"
 
+	"google.golang.org/protobuf/proto"
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
+	"google.golang.org/protobuf/reflect/protoregistry"
 
+	"google.golang.org/protobuf/runtime/protoiface"
 
+	"google.golang.org/protobuf/runtime/protoimpl"
 
+)
 
 
-func (e extensionAdapter) extensionsWrite() map[int32]Extension {
 
-	return e.ExtensionMap()
 
-}
 
+type (
 
+	// ExtensionDesc represents an extension descriptor and
 
+	// is used to interact with an extension field in a message.
 
+	//
 
+	// Variables of this type are generated in code by protoc-gen-go.
 
+	ExtensionDesc = protoimpl.ExtensionInfo
 
 
-func (e extensionAdapter) extensionsRead() (map[int32]Extension, sync.Locker) {
 
-	return e.ExtensionMap(), notLocker{}
 
-}
 
+	// ExtensionRange represents a range of message extensions.
 
+	// Used in code generated by protoc-gen-go.
 
+	ExtensionRange = protoiface.ExtensionRangeV1
 
 
-// notLocker is a sync.Locker whose Lock and Unlock methods are nops.
 
-type notLocker struct{}
 
+	// Deprecated: Do not use; this is an internal type.
 
+	Extension = protoimpl.ExtensionFieldV1
 
 
-func (n notLocker) Lock()   {}
 
-func (n notLocker) Unlock() {}
 
+	// Deprecated: Do not use; this is an internal type.
 
+	XXX_InternalExtensions = protoimpl.ExtensionFields
 
+)
 
 
-// extendable returns the extendableProto interface for the given generated proto message.
 
-// If the proto message has the old extension format, it returns a wrapper that implements
 
-// the extendableProto interface.
 
-func extendable(p interface{}) (extendableProto, error) {
 
-	switch p := p.(type) {
 
-	case extendableProto:
 
-		if isNilPtr(p) {
 
-			return nil, fmt.Errorf("proto: nil %T is not extendable", p)
 
-		}
 
-		return p, nil
 
-	case extendableProtoV1:
 
-		if isNilPtr(p) {
 
-			return nil, fmt.Errorf("proto: nil %T is not extendable", p)
 
-		}
 
-		return extensionAdapter{p}, nil
 
-	}
 
-	// Don't allocate a specific error containing %T:
 
-	// this is the hot path for Clone and MarshalText.
 
-	return nil, errNotExtendable
 
-}
 
+// ErrMissingExtension reports whether the extension was not present.
 
+var ErrMissingExtension = errors.New("proto: missing extension")
 
 
 var errNotExtendable = errors.New("proto: not an extendable proto.Message")
 
 
-func isNilPtr(x interface{}) bool {
 
-	v := reflect.ValueOf(x)
 
-	return v.Kind() == reflect.Ptr && v.IsNil()
 
-}
 
-
 
-// XXX_InternalExtensions is an internal representation of proto extensions.
 
-//
 
-// Each generated message struct type embeds an anonymous XXX_InternalExtensions field,
 
-// thus gaining the unexported 'extensions' method, which can be called only from the proto package.
 
-//
 
-// The methods of XXX_InternalExtensions are not concurrency safe in general,
 
-// but calls to logically read-only methods such as has and get may be executed concurrently.
 
-type XXX_InternalExtensions struct {
 
-	// The struct must be indirect so that if a user inadvertently copies a
 
-	// generated message and its embedded XXX_InternalExtensions, they
 
-	// avoid the mayhem of a copied mutex.
 
-	//
 
-	// The mutex serializes all logically read-only operations to p.extensionMap.
 
-	// It is up to the client to ensure that write operations to p.extensionMap are
 
-	// mutually exclusive with other accesses.
 
-	p *struct {
 
-		mu           sync.Mutex
 
-		extensionMap map[int32]Extension
 
+// HasExtension reports whether the extension field is present in m
 
+// either as an explicitly populated field or as an unknown field.
 
+func HasExtension(m Message, xt *ExtensionDesc) (has bool) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() {
 
+		return false
 
 	}
 
-}
 
 
-// extensionsWrite returns the extension map, creating it on first use.
 
-func (e *XXX_InternalExtensions) extensionsWrite() map[int32]Extension {
 
-	if e.p == nil {
 
-		e.p = new(struct {
 
-			mu           sync.Mutex
 
-			extensionMap map[int32]Extension
 
+	// Check whether any populated known field matches the field number.
 
+	xtd := xt.TypeDescriptor()
 
+	if isValidExtension(mr.Descriptor(), xtd) {
 
+		has = mr.Has(xtd)
 
+	} else {
 
+		mr.Range(func(fd protoreflect.FieldDescriptor, _ protoreflect.Value) bool {
 
+			has = int32(fd.Number()) == xt.Field
 
+			return !has
 
 		})
 
-		e.p.extensionMap = make(map[int32]Extension)
 
 	}
 
-	return e.p.extensionMap
 
-}
 
 
-// extensionsRead returns the extensions map for read-only use.  It may be nil.
 
-// The caller must hold the returned mutex's lock when accessing Elements within the map.
 
-func (e *XXX_InternalExtensions) extensionsRead() (map[int32]Extension, sync.Locker) {
 
-	if e.p == nil {
 
-		return nil, nil
 
+	// Check whether any unknown field matches the field number.
 
+	for b := mr.GetUnknown(); !has && len(b) > 0; {
 
+		num, _, n := protowire.ConsumeField(b)
 
+		has = int32(num) == xt.Field
 
+		b = b[n:]
 
 	}
 
-	return e.p.extensionMap, &e.p.mu
 
-}
 
-
 
-// ExtensionDesc represents an extension specification.
 
-// Used in generated code from the protocol compiler.
 
-type ExtensionDesc struct {
 
-	ExtendedType  Message     // nil pointer to the type that is being extended
 
-	ExtensionType interface{} // nil pointer to the extension type
 
-	Field         int32       // field number
 
-	Name          string      // fully-qualified name of extension, for text formatting
 
-	Tag           string      // protobuf tag style
 
-	Filename      string      // name of the file in which the extension is defined
 
-}
 
-
 
-func (ed *ExtensionDesc) repeated() bool {
 
-	t := reflect.TypeOf(ed.ExtensionType)
 
-	return t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8
 
-}
 
-
 
-// Extension represents an extension in a message.
 
-type Extension struct {
 
-	// When an extension is stored in a message using SetExtension
 
-	// only desc and value are set. When the message is marshaled
 
-	// enc will be set to the encoded form of the message.
 
-	//
 
-	// When a message is unmarshaled and contains extensions, each
 
-	// extension will have only enc set. When such an extension is
 
-	// accessed using GetExtension (or GetExtensions) desc and value
 
-	// will be set.
 
-	desc *ExtensionDesc
 
-
 
-	// value is a concrete value for the extension field. Let the type of
 
-	// desc.ExtensionType be the "API type" and the type of Extension.value
 
-	// be the "storage type". The API type and storage type are the same except:
 
-	//	* For scalars (except []byte), the API type uses *T,
 
-	//	while the storage type uses T.
 
-	//	* For repeated fields, the API type uses []T, while the storage type
 
-	//	uses *[]T.
 
-	//
 
-	// The reason for the divergence is so that the storage type more naturally
 
-	// matches what is expected of when retrieving the values through the
 
-	// protobuf reflection APIs.
 
-	//
 
-	// The value may only be populated if desc is also populated.
 
-	value interface{}
 
-
 
-	// enc is the raw bytes for the extension field.
 
-	enc []byte
 
+	return has
 
 }
 
 
-// SetRawExtension is for testing only.
 
-func SetRawExtension(base Message, id int32, b []byte) {
 
-	epb, err := extendable(base)
 
-	if err != nil {
 
+// ClearExtension removes the extension field from m
 
+// either as an explicitly populated field or as an unknown field.
 
+func ClearExtension(m Message, xt *ExtensionDesc) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() {
 
 		return
 
 	}
 
-	extmap := epb.extensionsWrite()
 
-	extmap[id] = Extension{enc: b}
 
-}
 
 
-// isExtensionField returns true iff the given field number is in an extension range.
 
-func isExtensionField(pb extendableProto, field int32) bool {
 
-	for _, er := range pb.ExtensionRangeArray() {
 
-		if er.Start <= field && field <= er.End {
 
+	xtd := xt.TypeDescriptor()
 
+	if isValidExtension(mr.Descriptor(), xtd) {
 
+		mr.Clear(xtd)
 
+	} else {
 
+		mr.Range(func(fd protoreflect.FieldDescriptor, _ protoreflect.Value) bool {
 
+			if int32(fd.Number()) == xt.Field {
 
+				mr.Clear(fd)
 
+				return false
 
+			}
 
 			return true
 
-		}
 
-	}
 
-	return false
 
-}
 
-
 
-// checkExtensionTypes checks that the given extension is valid for pb.
 
-func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
 
-	var pbi interface{} = pb
 
-	// Check the extended type.
 
-	if ea, ok := pbi.(extensionAdapter); ok {
 
-		pbi = ea.extendableProtoV1
 
-	}
 
-	if a, b := reflect.TypeOf(pbi), reflect.TypeOf(extension.ExtendedType); a != b {
 
-		return fmt.Errorf("proto: bad extended type; %v does not extend %v", b, a)
 
-	}
 
-	// Check the range.
 
-	if !isExtensionField(pb, extension.Field) {
 
-		return errors.New("proto: bad extension number; not in declared ranges")
 
-	}
 
-	return nil
 
-}
 
-
 
-// extPropKey is sufficient to uniquely identify an extension.
 
-type extPropKey struct {
 
-	base  reflect.Type
 
-	field int32
 
-}
 
-
 
-var extProp = struct {
 
-	sync.RWMutex
 
-	m map[extPropKey]*Properties
 
-}{
 
-	m: make(map[extPropKey]*Properties),
 
-}
 
-
 
-func extensionProperties(ed *ExtensionDesc) *Properties {
 
-	key := extPropKey{base: reflect.TypeOf(ed.ExtendedType), field: ed.Field}
 
-
 
-	extProp.RLock()
 
-	if prop, ok := extProp.m[key]; ok {
 
-		extProp.RUnlock()
 
-		return prop
 
-	}
 
-	extProp.RUnlock()
 
-
 
-	extProp.Lock()
 
-	defer extProp.Unlock()
 
-	// Check again.
 
-	if prop, ok := extProp.m[key]; ok {
 
-		return prop
 
-	}
 
-
 
-	prop := new(Properties)
 
-	prop.Init(reflect.TypeOf(ed.ExtensionType), "unknown_name", ed.Tag, nil)
 
-	extProp.m[key] = prop
 
-	return prop
 
-}
 
-
 
-// HasExtension returns whether the given extension is present in pb.
 
-func HasExtension(pb Message, extension *ExtensionDesc) bool {
 
-	// TODO: Check types, field numbers, etc.?
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
-		return false
 
-	}
 
-	extmap, mu := epb.extensionsRead()
 
-	if extmap == nil {
 
-		return false
 
+		})
 
 	}
 
-	mu.Lock()
 
-	_, ok := extmap[extension.Field]
 
-	mu.Unlock()
 
-	return ok
 
+	clearUnknown(mr, fieldNum(xt.Field))
 
 }
 
 
-// ClearExtension removes the given extension from pb.
 
-func ClearExtension(pb Message, extension *ExtensionDesc) {
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
+// ClearAllExtensions clears all extensions from m.
 
+// This includes populated fields and unknown fields in the extension range.
 
+func ClearAllExtensions(m Message) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() {
 
 		return
 
 	}
 
-	// TODO: Check types, field numbers, etc.?
 
-	extmap := epb.extensionsWrite()
 
-	delete(extmap, extension.Field)
 
+
 
+	mr.Range(func(fd protoreflect.FieldDescriptor, _ protoreflect.Value) bool {
 
+		if fd.IsExtension() {
 
+			mr.Clear(fd)
 
+		}
 
+		return true
 
+	})
 
+	clearUnknown(mr, mr.Descriptor().ExtensionRanges())
 
 }
 
 
-// GetExtension retrieves a proto2 extended field from pb.
 
+// GetExtension retrieves a proto2 extended field from m.
 
 //
 
 // If the descriptor is type complete (i.e., ExtensionDesc.ExtensionType is non-nil),
 
 // then GetExtension parses the encoded field and returns a Go value of the specified type.
 
 // If the field is not present, then the default value is returned (if one is specified),
 
 // otherwise ErrMissingExtension is reported.
 
 //
 
-// If the descriptor is not type complete (i.e., ExtensionDesc.ExtensionType is nil),
 
-// then GetExtension returns the raw encoded bytes of the field extension.
 
-func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
-		return nil, err
 
-	}
 
-
 
-	if extension.ExtendedType != nil {
 
-		// can only check type if this is a complete descriptor
 
-		if err := checkExtensionTypes(epb, extension); err != nil {
 
-			return nil, err
 
+// If the descriptor is type incomplete (i.e., ExtensionDesc.ExtensionType is nil),
 
+// then GetExtension returns the raw encoded bytes for the extension field.
 
+func GetExtension(m Message, xt *ExtensionDesc) (interface{}, error) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() || mr.Descriptor().ExtensionRanges().Len() == 0 {
 
+		return nil, errNotExtendable
 
+	}
 
+
 
+	// Retrieve the unknown fields for this extension field.
 
+	var bo protoreflect.RawFields
 
+	for bi := mr.GetUnknown(); len(bi) > 0; {
 
+		num, _, n := protowire.ConsumeField(bi)
 
+		if int32(num) == xt.Field {
 
+			bo = append(bo, bi[:n]...)
 
 		}
 
+		bi = bi[n:]
 
 	}
 
 
-	emap, mu := epb.extensionsRead()
 
-	if emap == nil {
 
-		return defaultExtensionValue(extension)
 
-	}
 
-	mu.Lock()
 
-	defer mu.Unlock()
 
-	e, ok := emap[extension.Field]
 
-	if !ok {
 
-		// defaultExtensionValue returns the default value or
 
-		// ErrMissingExtension if there is no default.
 
-		return defaultExtensionValue(extension)
 
-	}
 
-
 
-	if e.value != nil {
 
-		// Already decoded. Check the descriptor, though.
 
-		if e.desc != extension {
 
-			// This shouldn't happen. If it does, it means that
 
-			// GetExtension was called twice with two different
 
-			// descriptors with the same field number.
 
-			return nil, errors.New("proto: descriptor conflict")
 
-		}
 
-		return extensionAsLegacyType(e.value), nil
 
+	// For type incomplete descriptors, only retrieve the unknown fields.
 
+	if xt.ExtensionType == nil {
 
+		return []byte(bo), nil
 
 	}
 
 
-	if extension.ExtensionType == nil {
 
-		// incomplete descriptor
 
-		return e.enc, nil
 
+	// If the extension field only exists as unknown fields, unmarshal it.
 
+	// This is rarely done since proto.Unmarshal eagerly unmarshals extensions.
 
+	xtd := xt.TypeDescriptor()
 
+	if !isValidExtension(mr.Descriptor(), xtd) {
 
+		return nil, fmt.Errorf("proto: bad extended type; %T does not extend %T", xt.ExtendedType, m)
 
 	}
 
-
 
-	v, err := decodeExtension(e.enc, extension)
 
-	if err != nil {
 
-		return nil, err
 
+	if !mr.Has(xtd) && len(bo) > 0 {
 
+		m2 := mr.New()
 
+		if err := (proto.UnmarshalOptions{
 
+			Resolver: extensionResolver{xt},
 
+		}.Unmarshal(bo, m2.Interface())); err != nil {
 
+			return nil, err
 
+		}
 
+		if m2.Has(xtd) {
 
+			mr.Set(xtd, m2.Get(xtd))
 
+			clearUnknown(mr, fieldNum(xt.Field))
 
+		}
 
 	}
 
 
-	// Remember the decoded version and drop the encoded version.
 
-	// That way it is safe to mutate what we return.
 
-	e.value = extensionAsStorageType(v)
 
-	e.desc = extension
 
-	e.enc = nil
 
-	emap[extension.Field] = e
 
-	return extensionAsLegacyType(e.value), nil
 
-}
 
-
 
-// defaultExtensionValue returns the default value for extension.
 
-// If no default for an extension is defined ErrMissingExtension is returned.
 
-func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
 
-	if extension.ExtensionType == nil {
 
-		// incomplete descriptor, so no default
 
+	// Check whether the message has the extension field set or a default.
 
+	var pv protoreflect.Value
 
+	switch {
 
+	case mr.Has(xtd):
 
+		pv = mr.Get(xtd)
 
+	case xtd.HasDefault():
 
+		pv = xtd.Default()
 
+	default:
 
 		return nil, ErrMissingExtension
 
 	}
 
 
-	t := reflect.TypeOf(extension.ExtensionType)
 
-	props := extensionProperties(extension)
 
-
 
-	sf, _, err := fieldDefault(t, props)
 
-	if err != nil {
 
-		return nil, err
 
-	}
 
-
 
-	if sf == nil || sf.value == nil {
 
-		// There is no default value.
 
-		return nil, ErrMissingExtension
 
+	v := xt.InterfaceOf(pv)
 
+	rv := reflect.ValueOf(v)
 
+	if isScalarKind(rv.Kind()) {
 
+		rv2 := reflect.New(rv.Type())
 
+		rv2.Elem().Set(rv)
 
+		v = rv2.Interface()
 
 	}
 
+	return v, nil
 
+}
 
 
-	if t.Kind() != reflect.Ptr {
 
-		// We do not need to return a Ptr, we can directly return sf.value.
 
-		return sf.value, nil
 
-	}
 
+// extensionResolver is a custom extension resolver that stores a single
 
+// extension type that takes precedence over the global registry.
 
+type extensionResolver struct{ xt protoreflect.ExtensionType }
 
 
-	// We need to return an interface{} that is a pointer to sf.value.
 
-	value := reflect.New(t).Elem()
 
-	value.Set(reflect.New(value.Type().Elem()))
 
-	if sf.kind == reflect.Int32 {
 
-		// We may have an int32 or an enum, but the underlying data is int32.
 
-		// Since we can't set an int32 into a non int32 reflect.value directly
 
-		// set it as a int32.
 
-		value.Elem().SetInt(int64(sf.value.(int32)))
 
-	} else {
 
-		value.Elem().Set(reflect.ValueOf(sf.value))
 
+func (r extensionResolver) FindExtensionByName(field protoreflect.FullName) (protoreflect.ExtensionType, error) {
 
+	if xtd := r.xt.TypeDescriptor(); xtd.FullName() == field {
 
+		return r.xt, nil
 
 	}
 
-	return value.Interface(), nil
 
+	return protoregistry.GlobalTypes.FindExtensionByName(field)
 
 }
 
 
-// decodeExtension decodes an extension encoded in b.
 
-func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
 
-	t := reflect.TypeOf(extension.ExtensionType)
 
-	unmarshal := typeUnmarshaler(t, extension.Tag)
 
-
 
-	// t is a pointer to a struct, pointer to basic type or a slice.
 
-	// Allocate space to store the pointer/slice.
 
-	value := reflect.New(t).Elem()
 
-
 
-	var err error
 
-	for {
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		wire := int(x) & 7
 
-
 
-		b, err = unmarshal(b, valToPointer(value.Addr()), wire)
 
-		if err != nil {
 
-			return nil, err
 
-		}
 
-
 
-		if len(b) == 0 {
 
-			break
 
-		}
 
+func (r extensionResolver) FindExtensionByNumber(message protoreflect.FullName, field protoreflect.FieldNumber) (protoreflect.ExtensionType, error) {
 
+	if xtd := r.xt.TypeDescriptor(); xtd.ContainingMessage().FullName() == message && xtd.Number() == field {
 
+		return r.xt, nil
 
 	}
 
-	return value.Interface(), nil
 
+	return protoregistry.GlobalTypes.FindExtensionByNumber(message, field)
 
 }
 
 
-// GetExtensions returns a slice of the extensions present in pb that are also listed in es.
 
-// The returned slice has the same length as es; missing extensions will appear as nil elements.
 
-func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
-		return nil, err
 
+// GetExtensions returns a list of the extensions values present in m,
 
+// corresponding with the provided list of extension descriptors, xts.
 
+// If an extension is missing in m, the corresponding value is nil.
 
+func GetExtensions(m Message, xts []*ExtensionDesc) ([]interface{}, error) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() {
 
+		return nil, errNotExtendable
 
 	}
 
-	extensions = make([]interface{}, len(es))
 
-	for i, e := range es {
 
-		extensions[i], err = GetExtension(epb, e)
 
-		if err == ErrMissingExtension {
 
-			err = nil
 
-		}
 
+
 
+	vs := make([]interface{}, len(xts))
 
+	for i, xt := range xts {
 
+		v, err := GetExtension(m, xt)
 
 		if err != nil {
 
-			return
 
+			if err == ErrMissingExtension {
 
+				continue
 
+			}
 
+			return vs, err
 
 		}
 
+		vs[i] = v
 
 	}
 
-	return
 
+	return vs, nil
 
 }
 
 
-// ExtensionDescs returns a new slice containing pb's extension descriptors, in undefined order.
 
-// For non-registered extensions, ExtensionDescs returns an incomplete descriptor containing
 
-// just the Field field, which defines the extension's field number.
 
-func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
-		return nil, err
 
+// SetExtension sets an extension field in m to the provided value.
 
+func SetExtension(m Message, xt *ExtensionDesc, v interface{}) error {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() || mr.Descriptor().ExtensionRanges().Len() == 0 {
 
+		return errNotExtendable
 
 	}
 
-	registeredExtensions := RegisteredExtensions(pb)
 
 
-	emap, mu := epb.extensionsRead()
 
-	if emap == nil {
 
-		return nil, nil
 
+	rv := reflect.ValueOf(v)
 
+	if reflect.TypeOf(v) != reflect.TypeOf(xt.ExtensionType) {
 
+		return fmt.Errorf("proto: bad extension value type. got: %T, want: %T", v, xt.ExtensionType)
 
 	}
 
-	mu.Lock()
 
-	defer mu.Unlock()
 
-	extensions := make([]*ExtensionDesc, 0, len(emap))
 
-	for extid, e := range emap {
 
-		desc := e.desc
 
-		if desc == nil {
 
-			desc = registeredExtensions[extid]
 
-			if desc == nil {
 
-				desc = &ExtensionDesc{Field: extid}
 
-			}
 
+	if rv.Kind() == reflect.Ptr {
 
+		if rv.IsNil() {
 
+			return fmt.Errorf("proto: SetExtension called with nil value of type %T", v)
 
+		}
 
+		if isScalarKind(rv.Elem().Kind()) {
 
+			v = rv.Elem().Interface()
 
 		}
 
-
 
-		extensions = append(extensions, desc)
 
 	}
 
-	return extensions, nil
 
-}
 
 
-// SetExtension sets the specified extension of pb to the specified value.
 
-func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
-		return err
 
-	}
 
-	if err := checkExtensionTypes(epb, extension); err != nil {
 
-		return err
 
-	}
 
-	typ := reflect.TypeOf(extension.ExtensionType)
 
-	if typ != reflect.TypeOf(value) {
 
-		return fmt.Errorf("proto: bad extension value type. got: %T, want: %T", value, extension.ExtensionType)
 
+	xtd := xt.TypeDescriptor()
 
+	if !isValidExtension(mr.Descriptor(), xtd) {
 
+		return fmt.Errorf("proto: bad extended type; %T does not extend %T", xt.ExtendedType, m)
 
 	}
 
-	// nil extension values need to be caught early, because the
 
-	// encoder can't distinguish an ErrNil due to a nil extension
 
-	// from an ErrNil due to a missing field. Extensions are
 
-	// always optional, so the encoder would just swallow the error
 
-	// and drop all the extensions from the encoded message.
 
-	if reflect.ValueOf(value).IsNil() {
 
-		return fmt.Errorf("proto: SetExtension called with nil value of type %T", value)
 
-	}
 
-
 
-	extmap := epb.extensionsWrite()
 
-	extmap[extension.Field] = Extension{desc: extension, value: extensionAsStorageType(value)}
 
+	mr.Set(xtd, xt.ValueOf(v))
 
+	clearUnknown(mr, fieldNum(xt.Field))
 
 	return nil
 
 }
 
 
-// ClearAllExtensions clears all extensions from pb.
 
-func ClearAllExtensions(pb Message) {
 
-	epb, err := extendable(pb)
 
-	if err != nil {
 
+// SetRawExtension inserts b into the unknown fields of m.
 
+//
 
+// Deprecated: Use Message.ProtoReflect.SetUnknown instead.
 
+func SetRawExtension(m Message, fnum int32, b []byte) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() {
 
 		return
 
 	}
 
-	m := epb.extensionsWrite()
 
-	for k := range m {
 
-		delete(m, k)
 
+
 
+	// Verify that the raw field is valid.
 
+	for b0 := b; len(b0) > 0; {
 
+		num, _, n := protowire.ConsumeField(b0)
 
+		if int32(num) != fnum {
 
+			panic(fmt.Sprintf("mismatching field number: got %d, want %d", num, fnum))
 
+		}
 
+		b0 = b0[n:]
 
 	}
 
-}
 
 
-// A global registry of extensions.
 
-// The generated code will register the generated descriptors by calling RegisterExtension.
 
+	ClearExtension(m, &ExtensionDesc{Field: fnum})
 
+	mr.SetUnknown(append(mr.GetUnknown(), b...))
 
+}
 
 
-var extensionMaps = make(map[reflect.Type]map[int32]*ExtensionDesc)
 
+// ExtensionDescs returns a list of extension descriptors found in m,
 
+// containing descriptors for both populated extension fields in m and
 
+// also unknown fields of m that are in the extension range.
 
+// For the later case, an type incomplete descriptor is provided where only
 
+// the ExtensionDesc.Field field is populated.
 
+// The order of the extension descriptors is undefined.
 
+func ExtensionDescs(m Message) ([]*ExtensionDesc, error) {
 
+	mr := MessageReflect(m)
 
+	if mr == nil || !mr.IsValid() || mr.Descriptor().ExtensionRanges().Len() == 0 {
 
+		return nil, errNotExtendable
 
+	}
 
 
-// RegisterExtension is called from the generated code.
 
-func RegisterExtension(desc *ExtensionDesc) {
 
-	st := reflect.TypeOf(desc.ExtendedType).Elem()
 
-	m := extensionMaps[st]
 
-	if m == nil {
 
-		m = make(map[int32]*ExtensionDesc)
 
-		extensionMaps[st] = m
 
+	// Collect a set of known extension descriptors.
 
+	extDescs := make(map[protoreflect.FieldNumber]*ExtensionDesc)
 
+	mr.Range(func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
 
+		if fd.IsExtension() {
 
+			xt := fd.(protoreflect.ExtensionTypeDescriptor)
 
+			if xd, ok := xt.Type().(*ExtensionDesc); ok {
 
+				extDescs[fd.Number()] = xd
 
+			}
 
+		}
 
+		return true
 
+	})
 
+
 
+	// Collect a set of unknown extension descriptors.
 
+	extRanges := mr.Descriptor().ExtensionRanges()
 
+	for b := mr.GetUnknown(); len(b) > 0; {
 
+		num, _, n := protowire.ConsumeField(b)
 
+		if extRanges.Has(num) && extDescs[num] == nil {
 
+			extDescs[num] = nil
 
+		}
 
+		b = b[n:]
 
 	}
 
-	if _, ok := m[desc.Field]; ok {
 
-		panic("proto: duplicate extension registered: " + st.String() + " " + strconv.Itoa(int(desc.Field)))
 
+
 
+	// Transpose the set of descriptors into a list.
 
+	var xts []*ExtensionDesc
 
+	for num, xt := range extDescs {
 
+		if xt == nil {
 
+			xt = &ExtensionDesc{Field: int32(num)}
 
+		}
 
+		xts = append(xts, xt)
 
 	}
 
-	m[desc.Field] = desc
 
+	return xts, nil
 
 }
 
 
-// RegisteredExtensions returns a map of the registered extensions of a
 
-// protocol buffer struct, indexed by the extension number.
 
-// The argument pb should be a nil pointer to the struct type.
 
-func RegisteredExtensions(pb Message) map[int32]*ExtensionDesc {
 
-	return extensionMaps[reflect.TypeOf(pb).Elem()]
 
+// isValidExtension reports whether xtd is a valid extension descriptor for md.
 
+func isValidExtension(md protoreflect.MessageDescriptor, xtd protoreflect.ExtensionTypeDescriptor) bool {
 
+	return xtd.ContainingMessage() == md && md.ExtensionRanges().Has(xtd.Number())
 
 }
 
 
-// extensionAsLegacyType converts an value in the storage type as the API type.
 
-// See Extension.value.
 
-func extensionAsLegacyType(v interface{}) interface{} {
 
-	switch rv := reflect.ValueOf(v); rv.Kind() {
 
+// isScalarKind reports whether k is a protobuf scalar kind (except bytes).
 
+// This function exists for historical reasons since the representation of
 
+// scalars differs between v1 and v2, where v1 uses *T and v2 uses T.
 
+func isScalarKind(k reflect.Kind) bool {
 
+	switch k {
 
 	case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String:
 
-		// Represent primitive types as a pointer to the value.
 
-		rv2 := reflect.New(rv.Type())
 
-		rv2.Elem().Set(rv)
 
-		v = rv2.Interface()
 
-	case reflect.Ptr:
 
-		// Represent slice types as the value itself.
 
-		switch rv.Type().Elem().Kind() {
 
-		case reflect.Slice:
 
-			if rv.IsNil() {
 
-				v = reflect.Zero(rv.Type().Elem()).Interface()
 
-			} else {
 
-				v = rv.Elem().Interface()
 
-			}
 
-		}
 
+		return true
 
+	default:
 
+		return false
 
 	}
 
-	return v
 
 }
 
 
-// extensionAsStorageType converts an value in the API type as the storage type.
 
-// See Extension.value.
 
-func extensionAsStorageType(v interface{}) interface{} {
 
-	switch rv := reflect.ValueOf(v); rv.Kind() {
 
-	case reflect.Ptr:
 
-		// Represent slice types as the value itself.
 
-		switch rv.Type().Elem().Kind() {
 
-		case reflect.Bool, reflect.Int32, reflect.Int64, reflect.Uint32, reflect.Uint64, reflect.Float32, reflect.Float64, reflect.String:
 
-			if rv.IsNil() {
 
-				v = reflect.Zero(rv.Type().Elem()).Interface()
 
-			} else {
 
-				v = rv.Elem().Interface()
 
-			}
 
-		}
 
-	case reflect.Slice:
 
-		// Represent slice types as a pointer to the value.
 
-		if rv.Type().Elem().Kind() != reflect.Uint8 {
 
-			rv2 := reflect.New(rv.Type())
 
-			rv2.Elem().Set(rv)
 
-			v = rv2.Interface()
 
+// clearUnknown removes unknown fields from m where remover.Has reports true.
 
+func clearUnknown(m protoreflect.Message, remover interface {
 
+	Has(protoreflect.FieldNumber) bool
 
+}) {
 
+	var bo protoreflect.RawFields
 
+	for bi := m.GetUnknown(); len(bi) > 0; {
 
+		num, _, n := protowire.ConsumeField(bi)
 
+		if !remover.Has(num) {
 
+			bo = append(bo, bi[:n]...)
 
 		}
 
+		bi = bi[n:]
 
 	}
 
-	return v
 
+	if bi := m.GetUnknown(); len(bi) != len(bo) {
 
+		m.SetUnknown(bo)
 
+	}
 
+}
 
+
 
+type fieldNum protoreflect.FieldNumber
 
+
 
+func (n1 fieldNum) Has(n2 protoreflect.FieldNumber) bool {
 
+	return protoreflect.FieldNumber(n1) == n2
 
 }

+ 0 - 965
vendor/github.com/golang/protobuf/proto/lib.go
Просмотреть файл 

@@ -1,965 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-/*
 
-Package proto converts data structures to and from the wire format of
 
-protocol buffers.  It works in concert with the Go source code generated
 
-for .proto files by the protocol compiler.
 
-
 
-A summary of the properties of the protocol buffer interface
 
-for a protocol buffer variable v:
 
-
 
-  - Names are turned from camel_case to CamelCase for export.
 
-  - There are no methods on v to set fields; just treat
 
-	them as structure fields.
 
-  - There are getters that return a field's value if set,
 
-	and return the field's default value if unset.
 
-	The getters work even if the receiver is a nil message.
 
-  - The zero value for a struct is its correct initialization state.
 
-	All desired fields must be set before marshaling.
 
-  - A Reset() method will restore a protobuf struct to its zero state.
 
-  - Non-repeated fields are pointers to the values; nil means unset.
 
-	That is, optional or required field int32 f becomes F *int32.
 
-  - Repeated fields are slices.
 
-  - Helper functions are available to aid the setting of fields.
 
-	msg.Foo = proto.String("hello") // set field
 
-  - Constants are defined to hold the default values of all fields that
 
-	have them.  They have the form Default_StructName_FieldName.
 
-	Because the getter methods handle defaulted values,
 
-	direct use of these constants should be rare.
 
-  - Enums are given type names and maps from names to values.
 
-	Enum values are prefixed by the enclosing message's name, or by the
 
-	enum's type name if it is a top-level enum. Enum types have a String
 
-	method, and a Enum method to assist in message construction.
 
-  - Nested messages, groups and enums have type names prefixed with the name of
 
-	the surrounding message type.
 
-  - Extensions are given descriptor names that start with E_,
 
-	followed by an underscore-delimited list of the nested messages
 
-	that contain it (if any) followed by the CamelCased name of the
 
-	extension field itself.  HasExtension, ClearExtension, GetExtension
 
-	and SetExtension are functions for manipulating extensions.
 
-  - Oneof field sets are given a single field in their message,
 
-	with distinguished wrapper types for each possible field value.
 
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
 
-
 
-When the .proto file specifies `syntax="proto3"`, there are some differences:
 
-
 
-  - Non-repeated fields of non-message type are values instead of pointers.
 
-  - Enum types do not get an Enum method.
 
-
 
-The simplest way to describe this is to see an example.
 
-Given file test.proto, containing
 
-
 
-	package example;
 
-
 
-	enum FOO { X = 17; }
 
-
 
-	message Test {
 
-	  required string label = 1;
 
-	  optional int32 type = 2 [default=77];
 
-	  repeated int64 reps = 3;
 
-	  optional group OptionalGroup = 4 {
 
-	    required string RequiredField = 5;
 
-	  }
 
-	  oneof union {
 
-	    int32 number = 6;
 
-	    string name = 7;
 
-	  }
 
-	}
 
-
 
-The resulting file, test.pb.go, is:
 
-
 
-	package example
 
-
 
-	import proto "github.com/golang/protobuf/proto"
 
-	import math "math"
 
-
 
-	type FOO int32
 
-	const (
 
-		FOO_X FOO = 17
 
-	)
 
-	var FOO_name = map[int32]string{
 
-		17: "X",
 
-	}
 
-	var FOO_value = map[string]int32{
 
-		"X": 17,
 
-	}
 
-
 
-	func (x FOO) Enum() *FOO {
 
-		p := new(FOO)
 
-		*p = x
 
-		return p
 
-	}
 
-	func (x FOO) String() string {
 
-		return proto.EnumName(FOO_name, int32(x))
 
-	}
 
-	func (x *FOO) UnmarshalJSON(data []byte) error {
 
-		value, err := proto.UnmarshalJSONEnum(FOO_value, data)
 
-		if err != nil {
 
-			return err
 
-		}
 
-		*x = FOO(value)
 
-		return nil
 
-	}
 
-
 
-	type Test struct {
 
-		Label         *string             `protobuf:"bytes,1,req,name=label" json:"label,omitempty"`
 
-		Type          *int32              `protobuf:"varint,2,opt,name=type,def=77" json:"type,omitempty"`
 
-		Reps          []int64             `protobuf:"varint,3,rep,name=reps" json:"reps,omitempty"`
 
-		Optionalgroup *Test_OptionalGroup `protobuf:"group,4,opt,name=OptionalGroup" json:"optionalgroup,omitempty"`
 
-		// Types that are valid to be assigned to Union:
 
-		//	*Test_Number
 
-		//	*Test_Name
 
-		Union            isTest_Union `protobuf_oneof:"union"`
 
-		XXX_unrecognized []byte       `json:"-"`
 
-	}
 
-	func (m *Test) Reset()         { *m = Test{} }
 
-	func (m *Test) String() string { return proto.CompactTextString(m) }
 
-	func (*Test) ProtoMessage() {}
 
-
 
-	type isTest_Union interface {
 
-		isTest_Union()
 
-	}
 
-
 
-	type Test_Number struct {
 
-		Number int32 `protobuf:"varint,6,opt,name=number"`
 
-	}
 
-	type Test_Name struct {
 
-		Name string `protobuf:"bytes,7,opt,name=name"`
 
-	}
 
-
 
-	func (*Test_Number) isTest_Union() {}
 
-	func (*Test_Name) isTest_Union()   {}
 
-
 
-	func (m *Test) GetUnion() isTest_Union {
 
-		if m != nil {
 
-			return m.Union
 
-		}
 
-		return nil
 
-	}
 
-	const Default_Test_Type int32 = 77
 
-
 
-	func (m *Test) GetLabel() string {
 
-		if m != nil && m.Label != nil {
 
-			return *m.Label
 
-		}
 
-		return ""
 
-	}
 
-
 
-	func (m *Test) GetType() int32 {
 
-		if m != nil && m.Type != nil {
 
-			return *m.Type
 
-		}
 
-		return Default_Test_Type
 
-	}
 
-
 
-	func (m *Test) GetOptionalgroup() *Test_OptionalGroup {
 
-		if m != nil {
 
-			return m.Optionalgroup
 
-		}
 
-		return nil
 
-	}
 
-
 
-	type Test_OptionalGroup struct {
 
-		RequiredField *string `protobuf:"bytes,5,req" json:"RequiredField,omitempty"`
 
-	}
 
-	func (m *Test_OptionalGroup) Reset()         { *m = Test_OptionalGroup{} }
 
-	func (m *Test_OptionalGroup) String() string { return proto.CompactTextString(m) }
 
-
 
-	func (m *Test_OptionalGroup) GetRequiredField() string {
 
-		if m != nil && m.RequiredField != nil {
 
-			return *m.RequiredField
 
-		}
 
-		return ""
 
-	}
 
-
 
-	func (m *Test) GetNumber() int32 {
 
-		if x, ok := m.GetUnion().(*Test_Number); ok {
 
-			return x.Number
 
-		}
 
-		return 0
 
-	}
 
-
 
-	func (m *Test) GetName() string {
 
-		if x, ok := m.GetUnion().(*Test_Name); ok {
 
-			return x.Name
 
-		}
 
-		return ""
 
-	}
 
-
 
-	func init() {
 
-		proto.RegisterEnum("example.FOO", FOO_name, FOO_value)
 
-	}
 
-
 
-To create and play with a Test object:
 
-
 
-	package main
 
-
 
-	import (
 
-		"log"
 
-
 
-		"github.com/golang/protobuf/proto"
 
-		pb "./example.pb"
 
-	)
 
-
 
-	func main() {
 
-		test := &pb.Test{
 
-			Label: proto.String("hello"),
 
-			Type:  proto.Int32(17),
 
-			Reps:  []int64{1, 2, 3},
 
-			Optionalgroup: &pb.Test_OptionalGroup{
 
-				RequiredField: proto.String("good bye"),
 
-			},
 
-			Union: &pb.Test_Name{"fred"},
 
-		}
 
-		data, err := proto.Marshal(test)
 
-		if err != nil {
 
-			log.Fatal("marshaling error: ", err)
 
-		}
 
-		newTest := &pb.Test{}
 
-		err = proto.Unmarshal(data, newTest)
 
-		if err != nil {
 
-			log.Fatal("unmarshaling error: ", err)
 
-		}
 
-		// Now test and newTest contain the same data.
 
-		if test.GetLabel() != newTest.GetLabel() {
 
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
 
-		}
 
-		// Use a type switch to determine which oneof was set.
 
-		switch u := test.Union.(type) {
 
-		case *pb.Test_Number: // u.Number contains the number.
 
-		case *pb.Test_Name: // u.Name contains the string.
 
-		}
 
-		// etc.
 
-	}
 
-*/
 
-package proto
 
-
 
-import (
 
-	"encoding/json"
 
-	"fmt"
 
-	"log"
 
-	"reflect"
 
-	"sort"
 
-	"strconv"
 
-	"sync"
 
-)
 
-
 
-// RequiredNotSetError is an error type returned by either Marshal or Unmarshal.
 
-// Marshal reports this when a required field is not initialized.
 
-// Unmarshal reports this when a required field is missing from the wire data.
 
-type RequiredNotSetError struct{ field string }
 
-
 
-func (e *RequiredNotSetError) Error() string {
 
-	if e.field == "" {
 
-		return fmt.Sprintf("proto: required field not set")
 
-	}
 
-	return fmt.Sprintf("proto: required field %q not set", e.field)
 
-}
 
-func (e *RequiredNotSetError) RequiredNotSet() bool {
 
-	return true
 
-}
 
-
 
-type invalidUTF8Error struct{ field string }
 
-
 
-func (e *invalidUTF8Error) Error() string {
 
-	if e.field == "" {
 
-		return "proto: invalid UTF-8 detected"
 
-	}
 
-	return fmt.Sprintf("proto: field %q contains invalid UTF-8", e.field)
 
-}
 
-func (e *invalidUTF8Error) InvalidUTF8() bool {
 
-	return true
 
-}
 
-
 
-// errInvalidUTF8 is a sentinel error to identify fields with invalid UTF-8.
 
-// This error should not be exposed to the external API as such errors should
 
-// be recreated with the field information.
 
-var errInvalidUTF8 = &invalidUTF8Error{}
 
-
 
-// isNonFatal reports whether the error is either a RequiredNotSet error
 
-// or a InvalidUTF8 error.
 
-func isNonFatal(err error) bool {
 
-	if re, ok := err.(interface{ RequiredNotSet() bool }); ok && re.RequiredNotSet() {
 
-		return true
 
-	}
 
-	if re, ok := err.(interface{ InvalidUTF8() bool }); ok && re.InvalidUTF8() {
 
-		return true
 
-	}
 
-	return false
 
-}
 
-
 
-type nonFatal struct{ E error }
 
-
 
-// Merge merges err into nf and reports whether it was successful.
 
-// Otherwise it returns false for any fatal non-nil errors.
 
-func (nf *nonFatal) Merge(err error) (ok bool) {
 
-	if err == nil {
 
-		return true // not an error
 
-	}
 
-	if !isNonFatal(err) {
 
-		return false // fatal error
 
-	}
 
-	if nf.E == nil {
 
-		nf.E = err // store first instance of non-fatal error
 
-	}
 
-	return true
 
-}
 
-
 
-// Message is implemented by generated protocol buffer messages.
 
-type Message interface {
 
-	Reset()
 
-	String() string
 
-	ProtoMessage()
 
-}
 
-
 
-// A Buffer is a buffer manager for marshaling and unmarshaling
 
-// protocol buffers.  It may be reused between invocations to
 
-// reduce memory usage.  It is not necessary to use a Buffer;
 
-// the global functions Marshal and Unmarshal create a
 
-// temporary Buffer and are fine for most applications.
 
-type Buffer struct {
 
-	buf   []byte // encode/decode byte stream
 
-	index int    // read point
 
-
 
-	deterministic bool
 
-}
 
-
 
-// NewBuffer allocates a new Buffer and initializes its internal data to
 
-// the contents of the argument slice.
 
-func NewBuffer(e []byte) *Buffer {
 
-	return &Buffer{buf: e}
 
-}
 
-
 
-// Reset resets the Buffer, ready for marshaling a new protocol buffer.
 
-func (p *Buffer) Reset() {
 
-	p.buf = p.buf[0:0] // for reading/writing
 
-	p.index = 0        // for reading
 
-}
 
-
 
-// SetBuf replaces the internal buffer with the slice,
 
-// ready for unmarshaling the contents of the slice.
 
-func (p *Buffer) SetBuf(s []byte) {
 
-	p.buf = s
 
-	p.index = 0
 
-}
 
-
 
-// Bytes returns the contents of the Buffer.
 
-func (p *Buffer) Bytes() []byte { return p.buf }
 
-
 
-// SetDeterministic sets whether to use deterministic serialization.
 
-//
 
-// Deterministic serialization guarantees that for a given binary, equal
 
-// messages will always be serialized to the same bytes. This implies:
 
-//
 
-//   - Repeated serialization of a message will return the same bytes.
 
-//   - Different processes of the same binary (which may be executing on
 
-//     different machines) will serialize equal messages to the same bytes.
 
-//
 
-// Note that the deterministic serialization is NOT canonical across
 
-// languages. It is not guaranteed to remain stable over time. It is unstable
 
-// across different builds with schema changes due to unknown fields.
 
-// Users who need canonical serialization (e.g., persistent storage in a
 
-// canonical form, fingerprinting, etc.) should define their own
 
-// canonicalization specification and implement their own serializer rather
 
-// than relying on this API.
 
-//
 
-// If deterministic serialization is requested, map entries will be sorted
 
-// by keys in lexographical order. This is an implementation detail and
 
-// subject to change.
 
-func (p *Buffer) SetDeterministic(deterministic bool) {
 
-	p.deterministic = deterministic
 
-}
 
-
 
-/*
 
- * Helper routines for simplifying the creation of optional fields of basic type.
 
- */
 
-
 
-// Bool is a helper routine that allocates a new bool value
 
-// to store v and returns a pointer to it.
 
-func Bool(v bool) *bool {
 
-	return &v
 
-}
 
-
 
-// Int32 is a helper routine that allocates a new int32 value
 
-// to store v and returns a pointer to it.
 
-func Int32(v int32) *int32 {
 
-	return &v
 
-}
 
-
 
-// Int is a helper routine that allocates a new int32 value
 
-// to store v and returns a pointer to it, but unlike Int32
 
-// its argument value is an int.
 
-func Int(v int) *int32 {
 
-	p := new(int32)
 
-	*p = int32(v)
 
-	return p
 
-}
 
-
 
-// Int64 is a helper routine that allocates a new int64 value
 
-// to store v and returns a pointer to it.
 
-func Int64(v int64) *int64 {
 
-	return &v
 
-}
 
-
 
-// Float32 is a helper routine that allocates a new float32 value
 
-// to store v and returns a pointer to it.
 
-func Float32(v float32) *float32 {
 
-	return &v
 
-}
 
-
 
-// Float64 is a helper routine that allocates a new float64 value
 
-// to store v and returns a pointer to it.
 
-func Float64(v float64) *float64 {
 
-	return &v
 
-}
 
-
 
-// Uint32 is a helper routine that allocates a new uint32 value
 
-// to store v and returns a pointer to it.
 
-func Uint32(v uint32) *uint32 {
 
-	return &v
 
-}
 
-
 
-// Uint64 is a helper routine that allocates a new uint64 value
 
-// to store v and returns a pointer to it.
 
-func Uint64(v uint64) *uint64 {
 
-	return &v
 
-}
 
-
 
-// String is a helper routine that allocates a new string value
 
-// to store v and returns a pointer to it.
 
-func String(v string) *string {
 
-	return &v
 
-}
 
-
 
-// EnumName is a helper function to simplify printing protocol buffer enums
 
-// by name.  Given an enum map and a value, it returns a useful string.
 
-func EnumName(m map[int32]string, v int32) string {
 
-	s, ok := m[v]
 
-	if ok {
 
-		return s
 
-	}
 
-	return strconv.Itoa(int(v))
 
-}
 
-
 
-// UnmarshalJSONEnum is a helper function to simplify recovering enum int values
 
-// from their JSON-encoded representation. Given a map from the enum's symbolic
 
-// names to its int values, and a byte buffer containing the JSON-encoded
 
-// value, it returns an int32 that can be cast to the enum type by the caller.
 
-//
 
-// The function can deal with both JSON representations, numeric and symbolic.
 
-func UnmarshalJSONEnum(m map[string]int32, data []byte, enumName string) (int32, error) {
 
-	if data[0] == '"' {
 
-		// New style: enums are strings.
 
-		var repr string
 
-		if err := json.Unmarshal(data, &repr); err != nil {
 
-			return -1, err
 
-		}
 
-		val, ok := m[repr]
 
-		if !ok {
 
-			return 0, fmt.Errorf("unrecognized enum %s value %q", enumName, repr)
 
-		}
 
-		return val, nil
 
-	}
 
-	// Old style: enums are ints.
 
-	var val int32
 
-	if err := json.Unmarshal(data, &val); err != nil {
 
-		return 0, fmt.Errorf("cannot unmarshal %#q into enum %s", data, enumName)
 
-	}
 
-	return val, nil
 
-}
 
-
 
-// DebugPrint dumps the encoded data in b in a debugging format with a header
 
-// including the string s. Used in testing but made available for general debugging.
 
-func (p *Buffer) DebugPrint(s string, b []byte) {
 
-	var u uint64
 
-
 
-	obuf := p.buf
 
-	index := p.index
 
-	p.buf = b
 
-	p.index = 0
 
-	depth := 0
 
-
 
-	fmt.Printf("\n--- %s ---\n", s)
 
-
 
-out:
 
-	for {
 
-		for i := 0; i < depth; i++ {
 
-			fmt.Print("  ")
 
-		}
 
-
 
-		index := p.index
 
-		if index == len(p.buf) {
 
-			break
 
-		}
 
-
 
-		op, err := p.DecodeVarint()
 
-		if err != nil {
 
-			fmt.Printf("%3d: fetching op err %v\n", index, err)
 
-			break out
 
-		}
 
-		tag := op >> 3
 
-		wire := op & 7
 
-
 
-		switch wire {
 
-		default:
 
-			fmt.Printf("%3d: t=%3d unknown wire=%d\n",
 
-				index, tag, wire)
 
-			break out
 
-
 
-		case WireBytes:
 
-			var r []byte
 
-
 
-			r, err = p.DecodeRawBytes(false)
 
-			if err != nil {
 
-				break out
 
-			}
 
-			fmt.Printf("%3d: t=%3d bytes [%d]", index, tag, len(r))
 
-			if len(r) <= 6 {
 
-				for i := 0; i < len(r); i++ {
 
-					fmt.Printf(" %.2x", r[i])
 
-				}
 
-			} else {
 
-				for i := 0; i < 3; i++ {
 
-					fmt.Printf(" %.2x", r[i])
 
-				}
 
-				fmt.Printf(" ..")
 
-				for i := len(r) - 3; i < len(r); i++ {
 
-					fmt.Printf(" %.2x", r[i])
 
-				}
 
-			}
 
-			fmt.Printf("\n")
 
-
 
-		case WireFixed32:
 
-			u, err = p.DecodeFixed32()
 
-			if err != nil {
 
-				fmt.Printf("%3d: t=%3d fix32 err %v\n", index, tag, err)
 
-				break out
 
-			}
 
-			fmt.Printf("%3d: t=%3d fix32 %d\n", index, tag, u)
 
-
 
-		case WireFixed64:
 
-			u, err = p.DecodeFixed64()
 
-			if err != nil {
 
-				fmt.Printf("%3d: t=%3d fix64 err %v\n", index, tag, err)
 
-				break out
 
-			}
 
-			fmt.Printf("%3d: t=%3d fix64 %d\n", index, tag, u)
 
-
 
-		case WireVarint:
 
-			u, err = p.DecodeVarint()
 
-			if err != nil {
 
-				fmt.Printf("%3d: t=%3d varint err %v\n", index, tag, err)
 
-				break out
 
-			}
 
-			fmt.Printf("%3d: t=%3d varint %d\n", index, tag, u)
 
-
 
-		case WireStartGroup:
 
-			fmt.Printf("%3d: t=%3d start\n", index, tag)
 
-			depth++
 
-
 
-		case WireEndGroup:
 
-			depth--
 
-			fmt.Printf("%3d: t=%3d end\n", index, tag)
 
-		}
 
-	}
 
-
 
-	if depth != 0 {
 
-		fmt.Printf("%3d: start-end not balanced %d\n", p.index, depth)
 
-	}
 
-	fmt.Printf("\n")
 
-
 
-	p.buf = obuf
 
-	p.index = index
 
-}
 
-
 
-// SetDefaults sets unset protocol buffer fields to their default values.
 
-// It only modifies fields that are both unset and have defined defaults.
 
-// It recursively sets default values in any non-nil sub-messages.
 
-func SetDefaults(pb Message) {
 
-	setDefaults(reflect.ValueOf(pb), true, false)
 
-}
 
-
 
-// v is a pointer to a struct.
 
-func setDefaults(v reflect.Value, recur, zeros bool) {
 
-	v = v.Elem()
 
-
 
-	defaultMu.RLock()
 
-	dm, ok := defaults[v.Type()]
 
-	defaultMu.RUnlock()
 
-	if !ok {
 
-		dm = buildDefaultMessage(v.Type())
 
-		defaultMu.Lock()
 
-		defaults[v.Type()] = dm
 
-		defaultMu.Unlock()
 
-	}
 
-
 
-	for _, sf := range dm.scalars {
 
-		f := v.Field(sf.index)
 
-		if !f.IsNil() {
 
-			// field already set
 
-			continue
 
-		}
 
-		dv := sf.value
 
-		if dv == nil && !zeros {
 
-			// no explicit default, and don't want to set zeros
 
-			continue
 
-		}
 
-		fptr := f.Addr().Interface() // **T
 
-		// TODO: Consider batching the allocations we do here.
 
-		switch sf.kind {
 
-		case reflect.Bool:
 
-			b := new(bool)
 
-			if dv != nil {
 
-				*b = dv.(bool)
 
-			}
 
-			*(fptr.(**bool)) = b
 
-		case reflect.Float32:
 
-			f := new(float32)
 
-			if dv != nil {
 
-				*f = dv.(float32)
 
-			}
 
-			*(fptr.(**float32)) = f
 
-		case reflect.Float64:
 
-			f := new(float64)
 
-			if dv != nil {
 
-				*f = dv.(float64)
 
-			}
 
-			*(fptr.(**float64)) = f
 
-		case reflect.Int32:
 
-			// might be an enum
 
-			if ft := f.Type(); ft != int32PtrType {
 
-				// enum
 
-				f.Set(reflect.New(ft.Elem()))
 
-				if dv != nil {
 
-					f.Elem().SetInt(int64(dv.(int32)))
 
-				}
 
-			} else {
 
-				// int32 field
 
-				i := new(int32)
 
-				if dv != nil {
 
-					*i = dv.(int32)
 
-				}
 
-				*(fptr.(**int32)) = i
 
-			}
 
-		case reflect.Int64:
 
-			i := new(int64)
 
-			if dv != nil {
 
-				*i = dv.(int64)
 
-			}
 
-			*(fptr.(**int64)) = i
 
-		case reflect.String:
 
-			s := new(string)
 
-			if dv != nil {
 
-				*s = dv.(string)
 
-			}
 
-			*(fptr.(**string)) = s
 
-		case reflect.Uint8:
 
-			// exceptional case: []byte
 
-			var b []byte
 
-			if dv != nil {
 
-				db := dv.([]byte)
 
-				b = make([]byte, len(db))
 
-				copy(b, db)
 
-			} else {
 
-				b = []byte{}
 
-			}
 
-			*(fptr.(*[]byte)) = b
 
-		case reflect.Uint32:
 
-			u := new(uint32)
 
-			if dv != nil {
 
-				*u = dv.(uint32)
 
-			}
 
-			*(fptr.(**uint32)) = u
 
-		case reflect.Uint64:
 
-			u := new(uint64)
 
-			if dv != nil {
 
-				*u = dv.(uint64)
 
-			}
 
-			*(fptr.(**uint64)) = u
 
-		default:
 
-			log.Printf("proto: can't set default for field %v (sf.kind=%v)", f, sf.kind)
 
-		}
 
-	}
 
-
 
-	for _, ni := range dm.nested {
 
-		f := v.Field(ni)
 
-		// f is *T or []*T or map[T]*T
 
-		switch f.Kind() {
 
-		case reflect.Ptr:
 
-			if f.IsNil() {
 
-				continue
 
-			}
 
-			setDefaults(f, recur, zeros)
 
-
 
-		case reflect.Slice:
 
-			for i := 0; i < f.Len(); i++ {
 
-				e := f.Index(i)
 
-				if e.IsNil() {
 
-					continue
 
-				}
 
-				setDefaults(e, recur, zeros)
 
-			}
 
-
 
-		case reflect.Map:
 
-			for _, k := range f.MapKeys() {
 
-				e := f.MapIndex(k)
 
-				if e.IsNil() {
 
-					continue
 
-				}
 
-				setDefaults(e, recur, zeros)
 
-			}
 
-		}
 
-	}
 
-}
 
-
 
-var (
 
-	// defaults maps a protocol buffer struct type to a slice of the fields,
 
-	// with its scalar fields set to their proto-declared non-zero default values.
 
-	defaultMu sync.RWMutex
 
-	defaults  = make(map[reflect.Type]defaultMessage)
 
-
 
-	int32PtrType = reflect.TypeOf((*int32)(nil))
 
-)
 
-
 
-// defaultMessage represents information about the default values of a message.
 
-type defaultMessage struct {
 
-	scalars []scalarField
 
-	nested  []int // struct field index of nested messages
 
-}
 
-
 
-type scalarField struct {
 
-	index int          // struct field index
 
-	kind  reflect.Kind // element type (the T in *T or []T)
 
-	value interface{}  // the proto-declared default value, or nil
 
-}
 
-
 
-// t is a struct type.
 
-func buildDefaultMessage(t reflect.Type) (dm defaultMessage) {
 
-	sprop := GetProperties(t)
 
-	for _, prop := range sprop.Prop {
 
-		fi, ok := sprop.decoderTags.get(prop.Tag)
 
-		if !ok {
 
-			// XXX_unrecognized
 
-			continue
 
-		}
 
-		ft := t.Field(fi).Type
 
-
 
-		sf, nested, err := fieldDefault(ft, prop)
 
-		switch {
 
-		case err != nil:
 
-			log.Print(err)
 
-		case nested:
 
-			dm.nested = append(dm.nested, fi)
 
-		case sf != nil:
 
-			sf.index = fi
 
-			dm.scalars = append(dm.scalars, *sf)
 
-		}
 
-	}
 
-
 
-	return dm
 
-}
 
-
 
-// fieldDefault returns the scalarField for field type ft.
 
-// sf will be nil if the field can not have a default.
 
-// nestedMessage will be true if this is a nested message.
 
-// Note that sf.index is not set on return.
 
-func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMessage bool, err error) {
 
-	var canHaveDefault bool
 
-	switch ft.Kind() {
 
-	case reflect.Ptr:
 
-		if ft.Elem().Kind() == reflect.Struct {
 
-			nestedMessage = true
 
-		} else {
 
-			canHaveDefault = true // proto2 scalar field
 
-		}
 
-
 
-	case reflect.Slice:
 
-		switch ft.Elem().Kind() {
 
-		case reflect.Ptr:
 
-			nestedMessage = true // repeated message
 
-		case reflect.Uint8:
 
-			canHaveDefault = true // bytes field
 
-		}
 
-
 
-	case reflect.Map:
 
-		if ft.Elem().Kind() == reflect.Ptr {
 
-			nestedMessage = true // map with message values
 
-		}
 
-	}
 
-
 
-	if !canHaveDefault {
 
-		if nestedMessage {
 
-			return nil, true, nil
 
-		}
 
-		return nil, false, nil
 
-	}
 
-
 
-	// We now know that ft is a pointer or slice.
 
-	sf = &scalarField{kind: ft.Elem().Kind()}
 
-
 
-	// scalar fields without defaults
 
-	if !prop.HasDefault {
 
-		return sf, false, nil
 
-	}
 
-
 
-	// a scalar field: either *T or []byte
 
-	switch ft.Elem().Kind() {
 
-	case reflect.Bool:
 
-		x, err := strconv.ParseBool(prop.Default)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default bool %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = x
 
-	case reflect.Float32:
 
-		x, err := strconv.ParseFloat(prop.Default, 32)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default float32 %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = float32(x)
 
-	case reflect.Float64:
 
-		x, err := strconv.ParseFloat(prop.Default, 64)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default float64 %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = x
 
-	case reflect.Int32:
 
-		x, err := strconv.ParseInt(prop.Default, 10, 32)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default int32 %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = int32(x)
 
-	case reflect.Int64:
 
-		x, err := strconv.ParseInt(prop.Default, 10, 64)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default int64 %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = x
 
-	case reflect.String:
 
-		sf.value = prop.Default
 
-	case reflect.Uint8:
 
-		// []byte (not *uint8)
 
-		sf.value = []byte(prop.Default)
 
-	case reflect.Uint32:
 
-		x, err := strconv.ParseUint(prop.Default, 10, 32)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default uint32 %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = uint32(x)
 
-	case reflect.Uint64:
 
-		x, err := strconv.ParseUint(prop.Default, 10, 64)
 
-		if err != nil {
 
-			return nil, false, fmt.Errorf("proto: bad default uint64 %q: %v", prop.Default, err)
 
-		}
 
-		sf.value = x
 
-	default:
 
-		return nil, false, fmt.Errorf("proto: unhandled def kind %v", ft.Elem().Kind())
 
-	}
 
-
 
-	return sf, false, nil
 
-}
 
-
 
-// mapKeys returns a sort.Interface to be used for sorting the map keys.
 
-// Map fields may have key types of non-float scalars, strings and enums.
 
-func mapKeys(vs []reflect.Value) sort.Interface {
 
-	s := mapKeySorter{vs: vs}
 
-
 
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps.
 
-	if len(vs) == 0 {
 
-		return s
 
-	}
 
-	switch vs[0].Kind() {
 
-	case reflect.Int32, reflect.Int64:
 
-		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
 
-	case reflect.Uint32, reflect.Uint64:
 
-		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
 
-	case reflect.Bool:
 
-		s.less = func(a, b reflect.Value) bool { return !a.Bool() && b.Bool() } // false < true
 
-	case reflect.String:
 
-		s.less = func(a, b reflect.Value) bool { return a.String() < b.String() }
 
-	default:
 
-		panic(fmt.Sprintf("unsupported map key type: %v", vs[0].Kind()))
 
-	}
 
-
 
-	return s
 
-}
 
-
 
-type mapKeySorter struct {
 
-	vs   []reflect.Value
 
-	less func(a, b reflect.Value) bool
 
-}
 
-
 
-func (s mapKeySorter) Len() int      { return len(s.vs) }
 
-func (s mapKeySorter) Swap(i, j int) { s.vs[i], s.vs[j] = s.vs[j], s.vs[i] }
 
-func (s mapKeySorter) Less(i, j int) bool {
 
-	return s.less(s.vs[i], s.vs[j])
 
-}
 
-
 
-// isProto3Zero reports whether v is a zero proto3 value.
 
-func isProto3Zero(v reflect.Value) bool {
 
-	switch v.Kind() {
 
-	case reflect.Bool:
 
-		return !v.Bool()
 
-	case reflect.Int32, reflect.Int64:
 
-		return v.Int() == 0
 
-	case reflect.Uint32, reflect.Uint64:
 
-		return v.Uint() == 0
 
-	case reflect.Float32, reflect.Float64:
 
-		return v.Float() == 0
 
-	case reflect.String:
 
-		return v.String() == ""
 
-	}
 
-	return false
 
-}
 
-
 
-const (
 
-	// ProtoPackageIsVersion3 is referenced from generated protocol buffer files
 
-	// to assert that that code is compatible with this version of the proto package.
 
-	ProtoPackageIsVersion3 = true
 
-
 
-	// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
 
-	// to assert that that code is compatible with this version of the proto package.
 
-	ProtoPackageIsVersion2 = true
 
-
 
-	// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
 
-	// to assert that that code is compatible with this version of the proto package.
 
-	ProtoPackageIsVersion1 = true
 
-)
 
-
 
-// InternalMessageInfo is a type used internally by generated .pb.go files.
 
-// This type is not intended to be used by non-generated code.
 
-// This type is not subject to any compatibility guarantee.
 
-type InternalMessageInfo struct {
 
-	marshal   *marshalInfo
 
-	unmarshal *unmarshalInfo
 
-	merge     *mergeInfo
 
-	discard   *discardInfo
 
-}

+ 0 - 181
vendor/github.com/golang/protobuf/proto/message_set.go
Просмотреть файл 

@@ -1,181 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-/*
 
- * Support for message sets.
 
- */
 
-
 
-import (
 
-	"errors"
 
-)
 
-
 
-// errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
 
-// A message type ID is required for storing a protocol buffer in a message set.
 
-var errNoMessageTypeID = errors.New("proto does not have a message type ID")
 
-
 
-// The first two types (_MessageSet_Item and messageSet)
 
-// model what the protocol compiler produces for the following protocol message:
 
-//   message MessageSet {
 
-//     repeated group Item = 1 {
 
-//       required int32 type_id = 2;
 
-//       required string message = 3;
 
-//     };
 
-//   }
 
-// That is the MessageSet wire format. We can't use a proto to generate these
 
-// because that would introduce a circular dependency between it and this package.
 
-
 
-type _MessageSet_Item struct {
 
-	TypeId  *int32 `protobuf:"varint,2,req,name=type_id"`
 
-	Message []byte `protobuf:"bytes,3,req,name=message"`
 
-}
 
-
 
-type messageSet struct {
 
-	Item             []*_MessageSet_Item `protobuf:"group,1,rep"`
 
-	XXX_unrecognized []byte
 
-	// TODO: caching?
 
-}
 
-
 
-// Make sure messageSet is a Message.
 
-var _ Message = (*messageSet)(nil)
 
-
 
-// messageTypeIder is an interface satisfied by a protocol buffer type
 
-// that may be stored in a MessageSet.
 
-type messageTypeIder interface {
 
-	MessageTypeId() int32
 
-}
 
-
 
-func (ms *messageSet) find(pb Message) *_MessageSet_Item {
 
-	mti, ok := pb.(messageTypeIder)
 
-	if !ok {
 
-		return nil
 
-	}
 
-	id := mti.MessageTypeId()
 
-	for _, item := range ms.Item {
 
-		if *item.TypeId == id {
 
-			return item
 
-		}
 
-	}
 
-	return nil
 
-}
 
-
 
-func (ms *messageSet) Has(pb Message) bool {
 
-	return ms.find(pb) != nil
 
-}
 
-
 
-func (ms *messageSet) Unmarshal(pb Message) error {
 
-	if item := ms.find(pb); item != nil {
 
-		return Unmarshal(item.Message, pb)
 
-	}
 
-	if _, ok := pb.(messageTypeIder); !ok {
 
-		return errNoMessageTypeID
 
-	}
 
-	return nil // TODO: return error instead?
 
-}
 
-
 
-func (ms *messageSet) Marshal(pb Message) error {
 
-	msg, err := Marshal(pb)
 
-	if err != nil {
 
-		return err
 
-	}
 
-	if item := ms.find(pb); item != nil {
 
-		// reuse existing item
 
-		item.Message = msg
 
-		return nil
 
-	}
 
-
 
-	mti, ok := pb.(messageTypeIder)
 
-	if !ok {
 
-		return errNoMessageTypeID
 
-	}
 
-
 
-	mtid := mti.MessageTypeId()
 
-	ms.Item = append(ms.Item, &_MessageSet_Item{
 
-		TypeId:  &mtid,
 
-		Message: msg,
 
-	})
 
-	return nil
 
-}
 
-
 
-func (ms *messageSet) Reset()         { *ms = messageSet{} }
 
-func (ms *messageSet) String() string { return CompactTextString(ms) }
 
-func (*messageSet) ProtoMessage()     {}
 
-
 
-// Support for the message_set_wire_format message option.
 
-
 
-func skipVarint(buf []byte) []byte {
 
-	i := 0
 
-	for ; buf[i]&0x80 != 0; i++ {
 
-	}
 
-	return buf[i+1:]
 
-}
 
-
 
-// unmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
 
-// It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
 
-func unmarshalMessageSet(buf []byte, exts interface{}) error {
 
-	var m map[int32]Extension
 
-	switch exts := exts.(type) {
 
-	case *XXX_InternalExtensions:
 
-		m = exts.extensionsWrite()
 
-	case map[int32]Extension:
 
-		m = exts
 
-	default:
 
-		return errors.New("proto: not an extension map")
 
-	}
 
-
 
-	ms := new(messageSet)
 
-	if err := Unmarshal(buf, ms); err != nil {
 
-		return err
 
-	}
 
-	for _, item := range ms.Item {
 
-		id := *item.TypeId
 
-		msg := item.Message
 
-
 
-		// Restore wire type and field number varint, plus length varint.
 
-		// Be careful to preserve duplicate items.
 
-		b := EncodeVarint(uint64(id)<<3 | WireBytes)
 
-		if ext, ok := m[id]; ok {
 
-			// Existing data; rip off the tag and length varint
 
-			// so we join the new data correctly.
 
-			// We can assume that ext.enc is set because we are unmarshaling.
 
-			o := ext.enc[len(b):]   // skip wire type and field number
 
-			_, n := DecodeVarint(o) // calculate length of length varint
 
-			o = o[n:]               // skip length varint
 
-			msg = append(o, msg...) // join old data and new data
 
-		}
 
-		b = append(b, EncodeVarint(uint64(len(msg)))...)
 
-		b = append(b, msg...)
 
-
 
-		m[id] = Extension{enc: b}
 
-	}
 
-	return nil
 
-}

+ 0 - 360
vendor/github.com/golang/protobuf/proto/pointer_reflect.go
Просмотреть файл 

@@ -1,360 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2012 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-// +build purego appengine js
 
-
 
-// This file contains an implementation of proto field accesses using package reflect.
 
-// It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
 
-// be used on App Engine.
 
-
 
-package proto
 
-
 
-import (
 
-	"reflect"
 
-	"sync"
 
-)
 
-
 
-const unsafeAllowed = false
 
-
 
-// A field identifies a field in a struct, accessible from a pointer.
 
-// In this implementation, a field is identified by the sequence of field indices
 
-// passed to reflect's FieldByIndex.
 
-type field []int
 
-
 
-// toField returns a field equivalent to the given reflect field.
 
-func toField(f *reflect.StructField) field {
 
-	return f.Index
 
-}
 
-
 
-// invalidField is an invalid field identifier.
 
-var invalidField = field(nil)
 
-
 
-// zeroField is a noop when calling pointer.offset.
 
-var zeroField = field([]int{})
 
-
 
-// IsValid reports whether the field identifier is valid.
 
-func (f field) IsValid() bool { return f != nil }
 
-
 
-// The pointer type is for the table-driven decoder.
 
-// The implementation here uses a reflect.Value of pointer type to
 
-// create a generic pointer. In pointer_unsafe.go we use unsafe
 
-// instead of reflect to implement the same (but faster) interface.
 
-type pointer struct {
 
-	v reflect.Value
 
-}
 
-
 
-// toPointer converts an interface of pointer type to a pointer
 
-// that points to the same target.
 
-func toPointer(i *Message) pointer {
 
-	return pointer{v: reflect.ValueOf(*i)}
 
-}
 
-
 
-// toAddrPointer converts an interface to a pointer that points to
 
-// the interface data.
 
-func toAddrPointer(i *interface{}, isptr, deref bool) pointer {
 
-	v := reflect.ValueOf(*i)
 
-	u := reflect.New(v.Type())
 
-	u.Elem().Set(v)
 
-	if deref {
 
-		u = u.Elem()
 
-	}
 
-	return pointer{v: u}
 
-}
 
-
 
-// valToPointer converts v to a pointer.  v must be of pointer type.
 
-func valToPointer(v reflect.Value) pointer {
 
-	return pointer{v: v}
 
-}
 
-
 
-// offset converts from a pointer to a structure to a pointer to
 
-// one of its fields.
 
-func (p pointer) offset(f field) pointer {
 
-	return pointer{v: p.v.Elem().FieldByIndex(f).Addr()}
 
-}
 
-
 
-func (p pointer) isNil() bool {
 
-	return p.v.IsNil()
 
-}
 
-
 
-// grow updates the slice s in place to make it one element longer.
 
-// s must be addressable.
 
-// Returns the (addressable) new element.
 
-func grow(s reflect.Value) reflect.Value {
 
-	n, m := s.Len(), s.Cap()
 
-	if n < m {
 
-		s.SetLen(n + 1)
 
-	} else {
 
-		s.Set(reflect.Append(s, reflect.Zero(s.Type().Elem())))
 
-	}
 
-	return s.Index(n)
 
-}
 
-
 
-func (p pointer) toInt64() *int64 {
 
-	return p.v.Interface().(*int64)
 
-}
 
-func (p pointer) toInt64Ptr() **int64 {
 
-	return p.v.Interface().(**int64)
 
-}
 
-func (p pointer) toInt64Slice() *[]int64 {
 
-	return p.v.Interface().(*[]int64)
 
-}
 
-
 
-var int32ptr = reflect.TypeOf((*int32)(nil))
 
-
 
-func (p pointer) toInt32() *int32 {
 
-	return p.v.Convert(int32ptr).Interface().(*int32)
 
-}
 
-
 
-// The toInt32Ptr/Slice methods don't work because of enums.
 
-// Instead, we must use set/get methods for the int32ptr/slice case.
 
-/*
 
-	func (p pointer) toInt32Ptr() **int32 {
 
-		return p.v.Interface().(**int32)
 
-}
 
-	func (p pointer) toInt32Slice() *[]int32 {
 
-		return p.v.Interface().(*[]int32)
 
-}
 
-*/
 
-func (p pointer) getInt32Ptr() *int32 {
 
-	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
 
-		// raw int32 type
 
-		return p.v.Elem().Interface().(*int32)
 
-	}
 
-	// an enum
 
-	return p.v.Elem().Convert(int32PtrType).Interface().(*int32)
 
-}
 
-func (p pointer) setInt32Ptr(v int32) {
 
-	// Allocate value in a *int32. Possibly convert that to a *enum.
 
-	// Then assign it to a **int32 or **enum.
 
-	// Note: we can convert *int32 to *enum, but we can't convert
 
-	// **int32 to **enum!
 
-	p.v.Elem().Set(reflect.ValueOf(&v).Convert(p.v.Type().Elem()))
 
-}
 
-
 
-// getInt32Slice copies []int32 from p as a new slice.
 
-// This behavior differs from the implementation in pointer_unsafe.go.
 
-func (p pointer) getInt32Slice() []int32 {
 
-	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
 
-		// raw int32 type
 
-		return p.v.Elem().Interface().([]int32)
 
-	}
 
-	// an enum
 
-	// Allocate a []int32, then assign []enum's values into it.
 
-	// Note: we can't convert []enum to []int32.
 
-	slice := p.v.Elem()
 
-	s := make([]int32, slice.Len())
 
-	for i := 0; i < slice.Len(); i++ {
 
-		s[i] = int32(slice.Index(i).Int())
 
-	}
 
-	return s
 
-}
 
-
 
-// setInt32Slice copies []int32 into p as a new slice.
 
-// This behavior differs from the implementation in pointer_unsafe.go.
 
-func (p pointer) setInt32Slice(v []int32) {
 
-	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
 
-		// raw int32 type
 
-		p.v.Elem().Set(reflect.ValueOf(v))
 
-		return
 
-	}
 
-	// an enum
 
-	// Allocate a []enum, then assign []int32's values into it.
 
-	// Note: we can't convert []enum to []int32.
 
-	slice := reflect.MakeSlice(p.v.Type().Elem(), len(v), cap(v))
 
-	for i, x := range v {
 
-		slice.Index(i).SetInt(int64(x))
 
-	}
 
-	p.v.Elem().Set(slice)
 
-}
 
-func (p pointer) appendInt32Slice(v int32) {
 
-	grow(p.v.Elem()).SetInt(int64(v))
 
-}
 
-
 
-func (p pointer) toUint64() *uint64 {
 
-	return p.v.Interface().(*uint64)
 
-}
 
-func (p pointer) toUint64Ptr() **uint64 {
 
-	return p.v.Interface().(**uint64)
 
-}
 
-func (p pointer) toUint64Slice() *[]uint64 {
 
-	return p.v.Interface().(*[]uint64)
 
-}
 
-func (p pointer) toUint32() *uint32 {
 
-	return p.v.Interface().(*uint32)
 
-}
 
-func (p pointer) toUint32Ptr() **uint32 {
 
-	return p.v.Interface().(**uint32)
 
-}
 
-func (p pointer) toUint32Slice() *[]uint32 {
 
-	return p.v.Interface().(*[]uint32)
 
-}
 
-func (p pointer) toBool() *bool {
 
-	return p.v.Interface().(*bool)
 
-}
 
-func (p pointer) toBoolPtr() **bool {
 
-	return p.v.Interface().(**bool)
 
-}
 
-func (p pointer) toBoolSlice() *[]bool {
 
-	return p.v.Interface().(*[]bool)
 
-}
 
-func (p pointer) toFloat64() *float64 {
 
-	return p.v.Interface().(*float64)
 
-}
 
-func (p pointer) toFloat64Ptr() **float64 {
 
-	return p.v.Interface().(**float64)
 
-}
 
-func (p pointer) toFloat64Slice() *[]float64 {
 
-	return p.v.Interface().(*[]float64)
 
-}
 
-func (p pointer) toFloat32() *float32 {
 
-	return p.v.Interface().(*float32)
 
-}
 
-func (p pointer) toFloat32Ptr() **float32 {
 
-	return p.v.Interface().(**float32)
 
-}
 
-func (p pointer) toFloat32Slice() *[]float32 {
 
-	return p.v.Interface().(*[]float32)
 
-}
 
-func (p pointer) toString() *string {
 
-	return p.v.Interface().(*string)
 
-}
 
-func (p pointer) toStringPtr() **string {
 
-	return p.v.Interface().(**string)
 
-}
 
-func (p pointer) toStringSlice() *[]string {
 
-	return p.v.Interface().(*[]string)
 
-}
 
-func (p pointer) toBytes() *[]byte {
 
-	return p.v.Interface().(*[]byte)
 
-}
 
-func (p pointer) toBytesSlice() *[][]byte {
 
-	return p.v.Interface().(*[][]byte)
 
-}
 
-func (p pointer) toExtensions() *XXX_InternalExtensions {
 
-	return p.v.Interface().(*XXX_InternalExtensions)
 
-}
 
-func (p pointer) toOldExtensions() *map[int32]Extension {
 
-	return p.v.Interface().(*map[int32]Extension)
 
-}
 
-func (p pointer) getPointer() pointer {
 
-	return pointer{v: p.v.Elem()}
 
-}
 
-func (p pointer) setPointer(q pointer) {
 
-	p.v.Elem().Set(q.v)
 
-}
 
-func (p pointer) appendPointer(q pointer) {
 
-	grow(p.v.Elem()).Set(q.v)
 
-}
 
-
 
-// getPointerSlice copies []*T from p as a new []pointer.
 
-// This behavior differs from the implementation in pointer_unsafe.go.
 
-func (p pointer) getPointerSlice() []pointer {
 
-	if p.v.IsNil() {
 
-		return nil
 
-	}
 
-	n := p.v.Elem().Len()
 
-	s := make([]pointer, n)
 
-	for i := 0; i < n; i++ {
 
-		s[i] = pointer{v: p.v.Elem().Index(i)}
 
-	}
 
-	return s
 
-}
 
-
 
-// setPointerSlice copies []pointer into p as a new []*T.
 
-// This behavior differs from the implementation in pointer_unsafe.go.
 
-func (p pointer) setPointerSlice(v []pointer) {
 
-	if v == nil {
 
-		p.v.Elem().Set(reflect.New(p.v.Elem().Type()).Elem())
 
-		return
 
-	}
 
-	s := reflect.MakeSlice(p.v.Elem().Type(), 0, len(v))
 
-	for _, p := range v {
 
-		s = reflect.Append(s, p.v)
 
-	}
 
-	p.v.Elem().Set(s)
 
-}
 
-
 
-// getInterfacePointer returns a pointer that points to the
 
-// interface data of the interface pointed by p.
 
-func (p pointer) getInterfacePointer() pointer {
 
-	if p.v.Elem().IsNil() {
 
-		return pointer{v: p.v.Elem()}
 
-	}
 
-	return pointer{v: p.v.Elem().Elem().Elem().Field(0).Addr()} // *interface -> interface -> *struct -> struct
 
-}
 
-
 
-func (p pointer) asPointerTo(t reflect.Type) reflect.Value {
 
-	// TODO: check that p.v.Type().Elem() == t?
 
-	return p.v
 
-}
 
-
 
-func atomicLoadUnmarshalInfo(p **unmarshalInfo) *unmarshalInfo {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	return *p
 
-}
 
-func atomicStoreUnmarshalInfo(p **unmarshalInfo, v *unmarshalInfo) {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	*p = v
 
-}
 
-func atomicLoadMarshalInfo(p **marshalInfo) *marshalInfo {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	return *p
 
-}
 
-func atomicStoreMarshalInfo(p **marshalInfo, v *marshalInfo) {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	*p = v
 
-}
 
-func atomicLoadMergeInfo(p **mergeInfo) *mergeInfo {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	return *p
 
-}
 
-func atomicStoreMergeInfo(p **mergeInfo, v *mergeInfo) {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	*p = v
 
-}
 
-func atomicLoadDiscardInfo(p **discardInfo) *discardInfo {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	return *p
 
-}
 
-func atomicStoreDiscardInfo(p **discardInfo, v *discardInfo) {
 
-	atomicLock.Lock()
 
-	defer atomicLock.Unlock()
 
-	*p = v
 
-}
 
-
 
-var atomicLock sync.Mutex

+ 0 - 313
vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
Просмотреть файл 

@@ -1,313 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2012 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-// +build !purego,!appengine,!js
 
-
 
-// This file contains the implementation of the proto field accesses using package unsafe.
 
-
 
-package proto
 
-
 
-import (
 
-	"reflect"
 
-	"sync/atomic"
 
-	"unsafe"
 
-)
 
-
 
-const unsafeAllowed = true
 
-
 
-// A field identifies a field in a struct, accessible from a pointer.
 
-// In this implementation, a field is identified by its byte offset from the start of the struct.
 
-type field uintptr
 
-
 
-// toField returns a field equivalent to the given reflect field.
 
-func toField(f *reflect.StructField) field {
 
-	return field(f.Offset)
 
-}
 
-
 
-// invalidField is an invalid field identifier.
 
-const invalidField = ^field(0)
 
-
 
-// zeroField is a noop when calling pointer.offset.
 
-const zeroField = field(0)
 
-
 
-// IsValid reports whether the field identifier is valid.
 
-func (f field) IsValid() bool {
 
-	return f != invalidField
 
-}
 
-
 
-// The pointer type below is for the new table-driven encoder/decoder.
 
-// The implementation here uses unsafe.Pointer to create a generic pointer.
 
-// In pointer_reflect.go we use reflect instead of unsafe to implement
 
-// the same (but slower) interface.
 
-type pointer struct {
 
-	p unsafe.Pointer
 
-}
 
-
 
-// size of pointer
 
-var ptrSize = unsafe.Sizeof(uintptr(0))
 
-
 
-// toPointer converts an interface of pointer type to a pointer
 
-// that points to the same target.
 
-func toPointer(i *Message) pointer {
 
-	// Super-tricky - read pointer out of data word of interface value.
 
-	// Saves ~25ns over the equivalent:
 
-	// return valToPointer(reflect.ValueOf(*i))
 
-	return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 
-}
 
-
 
-// toAddrPointer converts an interface to a pointer that points to
 
-// the interface data.
 
-func toAddrPointer(i *interface{}, isptr, deref bool) (p pointer) {
 
-	// Super-tricky - read or get the address of data word of interface value.
 
-	if isptr {
 
-		// The interface is of pointer type, thus it is a direct interface.
 
-		// The data word is the pointer data itself. We take its address.
 
-		p = pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
 
-	} else {
 
-		// The interface is not of pointer type. The data word is the pointer
 
-		// to the data.
 
-		p = pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 
-	}
 
-	if deref {
 
-		p.p = *(*unsafe.Pointer)(p.p)
 
-	}
 
-	return p
 
-}
 
-
 
-// valToPointer converts v to a pointer. v must be of pointer type.
 
-func valToPointer(v reflect.Value) pointer {
 
-	return pointer{p: unsafe.Pointer(v.Pointer())}
 
-}
 
-
 
-// offset converts from a pointer to a structure to a pointer to
 
-// one of its fields.
 
-func (p pointer) offset(f field) pointer {
 
-	// For safety, we should panic if !f.IsValid, however calling panic causes
 
-	// this to no longer be inlineable, which is a serious performance cost.
 
-	/*
 
-		if !f.IsValid() {
 
-			panic("invalid field")
 
-		}
 
-	*/
 
-	return pointer{p: unsafe.Pointer(uintptr(p.p) + uintptr(f))}
 
-}
 
-
 
-func (p pointer) isNil() bool {
 
-	return p.p == nil
 
-}
 
-
 
-func (p pointer) toInt64() *int64 {
 
-	return (*int64)(p.p)
 
-}
 
-func (p pointer) toInt64Ptr() **int64 {
 
-	return (**int64)(p.p)
 
-}
 
-func (p pointer) toInt64Slice() *[]int64 {
 
-	return (*[]int64)(p.p)
 
-}
 
-func (p pointer) toInt32() *int32 {
 
-	return (*int32)(p.p)
 
-}
 
-
 
-// See pointer_reflect.go for why toInt32Ptr/Slice doesn't exist.
 
-/*
 
-	func (p pointer) toInt32Ptr() **int32 {
 
-		return (**int32)(p.p)
 
-	}
 
-	func (p pointer) toInt32Slice() *[]int32 {
 
-		return (*[]int32)(p.p)
 
-	}
 
-*/
 
-func (p pointer) getInt32Ptr() *int32 {
 
-	return *(**int32)(p.p)
 
-}
 
-func (p pointer) setInt32Ptr(v int32) {
 
-	*(**int32)(p.p) = &v
 
-}
 
-
 
-// getInt32Slice loads a []int32 from p.
 
-// The value returned is aliased with the original slice.
 
-// This behavior differs from the implementation in pointer_reflect.go.
 
-func (p pointer) getInt32Slice() []int32 {
 
-	return *(*[]int32)(p.p)
 
-}
 
-
 
-// setInt32Slice stores a []int32 to p.
 
-// The value set is aliased with the input slice.
 
-// This behavior differs from the implementation in pointer_reflect.go.
 
-func (p pointer) setInt32Slice(v []int32) {
 
-	*(*[]int32)(p.p) = v
 
-}
 
-
 
-// TODO: Can we get rid of appendInt32Slice and use setInt32Slice instead?
 
-func (p pointer) appendInt32Slice(v int32) {
 
-	s := (*[]int32)(p.p)
 
-	*s = append(*s, v)
 
-}
 
-
 
-func (p pointer) toUint64() *uint64 {
 
-	return (*uint64)(p.p)
 
-}
 
-func (p pointer) toUint64Ptr() **uint64 {
 
-	return (**uint64)(p.p)
 
-}
 
-func (p pointer) toUint64Slice() *[]uint64 {
 
-	return (*[]uint64)(p.p)
 
-}
 
-func (p pointer) toUint32() *uint32 {
 
-	return (*uint32)(p.p)
 
-}
 
-func (p pointer) toUint32Ptr() **uint32 {
 
-	return (**uint32)(p.p)
 
-}
 
-func (p pointer) toUint32Slice() *[]uint32 {
 
-	return (*[]uint32)(p.p)
 
-}
 
-func (p pointer) toBool() *bool {
 
-	return (*bool)(p.p)
 
-}
 
-func (p pointer) toBoolPtr() **bool {
 
-	return (**bool)(p.p)
 
-}
 
-func (p pointer) toBoolSlice() *[]bool {
 
-	return (*[]bool)(p.p)
 
-}
 
-func (p pointer) toFloat64() *float64 {
 
-	return (*float64)(p.p)
 
-}
 
-func (p pointer) toFloat64Ptr() **float64 {
 
-	return (**float64)(p.p)
 
-}
 
-func (p pointer) toFloat64Slice() *[]float64 {
 
-	return (*[]float64)(p.p)
 
-}
 
-func (p pointer) toFloat32() *float32 {
 
-	return (*float32)(p.p)
 
-}
 
-func (p pointer) toFloat32Ptr() **float32 {
 
-	return (**float32)(p.p)
 
-}
 
-func (p pointer) toFloat32Slice() *[]float32 {
 
-	return (*[]float32)(p.p)
 
-}
 
-func (p pointer) toString() *string {
 
-	return (*string)(p.p)
 
-}
 
-func (p pointer) toStringPtr() **string {
 
-	return (**string)(p.p)
 
-}
 
-func (p pointer) toStringSlice() *[]string {
 
-	return (*[]string)(p.p)
 
-}
 
-func (p pointer) toBytes() *[]byte {
 
-	return (*[]byte)(p.p)
 
-}
 
-func (p pointer) toBytesSlice() *[][]byte {
 
-	return (*[][]byte)(p.p)
 
-}
 
-func (p pointer) toExtensions() *XXX_InternalExtensions {
 
-	return (*XXX_InternalExtensions)(p.p)
 
-}
 
-func (p pointer) toOldExtensions() *map[int32]Extension {
 
-	return (*map[int32]Extension)(p.p)
 
-}
 
-
 
-// getPointerSlice loads []*T from p as a []pointer.
 
-// The value returned is aliased with the original slice.
 
-// This behavior differs from the implementation in pointer_reflect.go.
 
-func (p pointer) getPointerSlice() []pointer {
 
-	// Super-tricky - p should point to a []*T where T is a
 
-	// message type. We load it as []pointer.
 
-	return *(*[]pointer)(p.p)
 
-}
 
-
 
-// setPointerSlice stores []pointer into p as a []*T.
 
-// The value set is aliased with the input slice.
 
-// This behavior differs from the implementation in pointer_reflect.go.
 
-func (p pointer) setPointerSlice(v []pointer) {
 
-	// Super-tricky - p should point to a []*T where T is a
 
-	// message type. We store it as []pointer.
 
-	*(*[]pointer)(p.p) = v
 
-}
 
-
 
-// getPointer loads the pointer at p and returns it.
 
-func (p pointer) getPointer() pointer {
 
-	return pointer{p: *(*unsafe.Pointer)(p.p)}
 
-}
 
-
 
-// setPointer stores the pointer q at p.
 
-func (p pointer) setPointer(q pointer) {
 
-	*(*unsafe.Pointer)(p.p) = q.p
 
-}
 
-
 
-// append q to the slice pointed to by p.
 
-func (p pointer) appendPointer(q pointer) {
 
-	s := (*[]unsafe.Pointer)(p.p)
 
-	*s = append(*s, q.p)
 
-}
 
-
 
-// getInterfacePointer returns a pointer that points to the
 
-// interface data of the interface pointed by p.
 
-func (p pointer) getInterfacePointer() pointer {
 
-	// Super-tricky - read pointer out of data word of interface value.
 
-	return pointer{p: (*(*[2]unsafe.Pointer)(p.p))[1]}
 
-}
 
-
 
-// asPointerTo returns a reflect.Value that is a pointer to an
 
-// object of type t stored at p.
 
-func (p pointer) asPointerTo(t reflect.Type) reflect.Value {
 
-	return reflect.NewAt(t, p.p)
 
-}
 
-
 
-func atomicLoadUnmarshalInfo(p **unmarshalInfo) *unmarshalInfo {
 
-	return (*unmarshalInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
 
-}
 
-func atomicStoreUnmarshalInfo(p **unmarshalInfo, v *unmarshalInfo) {
 
-	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
 
-}
 
-func atomicLoadMarshalInfo(p **marshalInfo) *marshalInfo {
 
-	return (*marshalInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
 
-}
 
-func atomicStoreMarshalInfo(p **marshalInfo, v *marshalInfo) {
 
-	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
 
-}
 
-func atomicLoadMergeInfo(p **mergeInfo) *mergeInfo {
 
-	return (*mergeInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
 
-}
 
-func atomicStoreMergeInfo(p **mergeInfo, v *mergeInfo) {
 
-	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
 
-}
 
-func atomicLoadDiscardInfo(p **discardInfo) *discardInfo {
 
-	return (*discardInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
 
-}
 
-func atomicStoreDiscardInfo(p **discardInfo, v *discardInfo) {
 
-	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
 
-}

+ 205 - 444
vendor/github.com/golang/protobuf/proto/properties.go
Просмотреть файл 

@@ -1,163 +1,104 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// Copyright 2010 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
 
 package proto
 
 
-/*
 
- * Routines for encoding data into the wire format for protocol buffers.
 
- */
 
-
 
 import (
 
 	"fmt"
 
-	"log"
 
-	"os"
 
 	"reflect"
 
-	"sort"
 
 	"strconv"
 
 	"strings"
 
 	"sync"
 
-)
 
-
 
-const debug bool = false
 
 
-// Constants that identify the encoding of a value on the wire.
 
-const (
 
-	WireVarint     = 0
 
-	WireFixed64    = 1
 
-	WireBytes      = 2
 
-	WireStartGroup = 3
 
-	WireEndGroup   = 4
 
-	WireFixed32    = 5
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
+	"google.golang.org/protobuf/runtime/protoimpl"
 
 )
 
 
-// tagMap is an optimization over map[int]int for typical protocol buffer
 
-// use-cases. Encoded protocol buffers are often in tag order with small tag
 
-// numbers.
 
-type tagMap struct {
 
-	fastTags []int
 
-	slowTags map[int]int
 
-}
 
-
 
-// tagMapFastLimit is the upper bound on the tag number that will be stored in
 
-// the tagMap slice rather than its map.
 
-const tagMapFastLimit = 1024
 
-
 
-func (p *tagMap) get(t int) (int, bool) {
 
-	if t > 0 && t < tagMapFastLimit {
 
-		if t >= len(p.fastTags) {
 
-			return 0, false
 
-		}
 
-		fi := p.fastTags[t]
 
-		return fi, fi >= 0
 
-	}
 
-	fi, ok := p.slowTags[t]
 
-	return fi, ok
 
-}
 
-
 
-func (p *tagMap) put(t int, fi int) {
 
-	if t > 0 && t < tagMapFastLimit {
 
-		for len(p.fastTags) < t+1 {
 
-			p.fastTags = append(p.fastTags, -1)
 
-		}
 
-		p.fastTags[t] = fi
 
-		return
 
-	}
 
-	if p.slowTags == nil {
 
-		p.slowTags = make(map[int]int)
 
-	}
 
-	p.slowTags[t] = fi
 
-}
 
-
 
-// StructProperties represents properties for all the fields of a struct.
 
-// decoderTags and decoderOrigNames should only be used by the decoder.
 
+// StructProperties represents protocol buffer type information for a
 
+// generated protobuf message in the open-struct API.
 
+//
 
+// Deprecated: Do not use.
 
 type StructProperties struct {
 
-	Prop             []*Properties  // properties for each field
 
-	reqCount         int            // required count
 
-	decoderTags      tagMap         // map from proto tag to struct field number
 
-	decoderOrigNames map[string]int // map from original name to struct field number
 
-	order            []int          // list of struct field numbers in tag order
 
+	// Prop are the properties for each field.
 
+	//
 
+	// Fields belonging to a oneof are stored in OneofTypes instead, with a
 
+	// single Properties representing the parent oneof held here.
 
+	//
 
+	// The order of Prop matches the order of fields in the Go struct.
 
+	// Struct fields that are not related to protobufs have a "XXX_" prefix
 
+	// in the Properties.Name and must be ignored by the user.
 
+	Prop []*Properties
 
 
 	// OneofTypes contains information about the oneof fields in this message.
 
-	// It is keyed by the original name of a field.
 
+	// It is keyed by the protobuf field name.
 
 	OneofTypes map[string]*OneofProperties
 
 }
 
 
-// OneofProperties represents information about a specific field in a oneof.
 
-type OneofProperties struct {
 
-	Type  reflect.Type // pointer to generated struct type for this oneof field
 
-	Field int          // struct field number of the containing oneof in the message
 
-	Prop  *Properties
 
-}
 
-
 
-// Implement the sorting interface so we can sort the fields in tag order, as recommended by the spec.
 
-// See encode.go, (*Buffer).enc_struct.
 
-
 
-func (sp *StructProperties) Len() int { return len(sp.order) }
 
-func (sp *StructProperties) Less(i, j int) bool {
 
-	return sp.Prop[sp.order[i]].Tag < sp.Prop[sp.order[j]].Tag
 
-}
 
-func (sp *StructProperties) Swap(i, j int) { sp.order[i], sp.order[j] = sp.order[j], sp.order[i] }
 
-
 
-// Properties represents the protocol-specific behavior of a single struct field.
 
+// Properties represents the type information for a protobuf message field.
 
+//
 
+// Deprecated: Do not use.
 
 type Properties struct {
 
-	Name     string // name of the field, for error messages
 
-	OrigName string // original name before protocol compiler (always set)
 
-	JSONName string // name to use for JSON; determined by protoc
 
-	Wire     string
 
+	// Name is a placeholder name with little meaningful semantic value.
 
+	// If the name has an "XXX_" prefix, the entire Properties must be ignored.
 
+	Name string
 
+	// OrigName is the protobuf field name or oneof name.
 
+	OrigName string
 
+	// JSONName is the JSON name for the protobuf field.
 
+	JSONName string
 
+	// Enum is a placeholder name for enums.
 
+	// For historical reasons, this is neither the Go name for the enum,
 
+	// nor the protobuf name for the enum.
 
+	Enum string // Deprecated: Do not use.
 
+	// Weak contains the full name of the weakly referenced message.
 
+	Weak string
 
+	// Wire is a string representation of the wire type.
 
+	Wire string
 
+	// WireType is the protobuf wire type for the field.
 
 	WireType int
 
-	Tag      int
 
+	// Tag is the protobuf field number.
 
+	Tag int
 
+	// Required reports whether this is a required field.
 
 	Required bool
 
+	// Optional reports whether this is a optional field.
 
 	Optional bool
 
+	// Repeated reports whether this is a repeated field.
 
 	Repeated bool
 
-	Packed   bool   // relevant for repeated primitives only
 
-	Enum     string // set for enum types only
 
-	proto3   bool   // whether this is known to be a proto3 field
 
-	oneof    bool   // whether this is a oneof field
 
-
 
-	Default    string // default value
 
-	HasDefault bool   // whether an explicit default was provided
 
-
 
-	stype reflect.Type      // set for struct types only
 
-	sprop *StructProperties // set for struct types only
 
+	// Packed reports whether this is a packed repeated field of scalars.
 
+	Packed bool
 
+	// Proto3 reports whether this field operates under the proto3 syntax.
 
+	Proto3 bool
 
+	// Oneof reports whether this field belongs within a oneof.
 
+	Oneof bool
 
+
 
+	// Default is the default value in string form.
 
+	Default string
 
+	// HasDefault reports whether the field has a default value.
 
+	HasDefault bool
 
+
 
+	// MapKeyProp is the properties for the key field for a map field.
 
+	MapKeyProp *Properties
 
+	// MapValProp is the properties for the value field for a map field.
 
+	MapValProp *Properties
 
+}
 
 
-	mtype      reflect.Type // set for map types only
 
-	MapKeyProp *Properties  // set for map types only
 
-	MapValProp *Properties  // set for map types only
 
+// OneofProperties represents the type information for a protobuf oneof.
 
+//
 
+// Deprecated: Do not use.
 
+type OneofProperties struct {
 
+	// Type is a pointer to the generated wrapper type for the field value.
 
+	// This is nil for messages that are not in the open-struct API.
 
+	Type reflect.Type
 
+	// Field is the index into StructProperties.Prop for the containing oneof.
 
+	Field int
 
+	// Prop is the properties for the field.
 
+	Prop *Properties
 
 }
 
 
 // String formats the properties in the protobuf struct field tag style.
 
 func (p *Properties) String() string {
 
 	s := p.Wire
 
-	s += ","
 
-	s += strconv.Itoa(p.Tag)
 
+	s += "," + strconv.Itoa(p.Tag)
 
 	if p.Required {
 
 		s += ",req"
 
 	}
 
@@ -171,18 +112,21 @@ func (p *Properties) String() string {
 
 		s += ",packed"
 
 	}
 
 	s += ",name=" + p.OrigName
 
-	if p.JSONName != p.OrigName {
 
+	if p.JSONName != "" {
 
 		s += ",json=" + p.JSONName
 
 	}
 
-	if p.proto3 {
 
+	if len(p.Enum) > 0 {
 
+		s += ",enum=" + p.Enum
 
+	}
 
+	if len(p.Weak) > 0 {
 
+		s += ",weak=" + p.Weak
 
+	}
 
+	if p.Proto3 {
 
 		s += ",proto3"
 
 	}
 
-	if p.oneof {
 
+	if p.Oneof {
 
 		s += ",oneof"
 
 	}
 
-	if len(p.Enum) > 0 {
 
-		s += ",enum=" + p.Enum
 
-	}
 
 	if p.HasDefault {
 
 		s += ",def=" + p.Default
 
 	}
 
@@ -190,356 +134,173 @@ func (p *Properties) String() string {
 
 }
 
 
 // Parse populates p by parsing a string in the protobuf struct field tag style.
 
-func (p *Properties) Parse(s string) {
 
-	// "bytes,49,opt,name=foo,def=hello!"
 
-	fields := strings.Split(s, ",") // breaks def=, but handled below.
 
-	if len(fields) < 2 {
 
-		fmt.Fprintf(os.Stderr, "proto: tag has too few fields: %q\n", s)
 
-		return
 
-	}
 
-
 
-	p.Wire = fields[0]
 
-	switch p.Wire {
 
-	case "varint":
 
-		p.WireType = WireVarint
 
-	case "fixed32":
 
-		p.WireType = WireFixed32
 
-	case "fixed64":
 
-		p.WireType = WireFixed64
 
-	case "zigzag32":
 
-		p.WireType = WireVarint
 
-	case "zigzag64":
 
-		p.WireType = WireVarint
 
-	case "bytes", "group":
 
-		p.WireType = WireBytes
 
-		// no numeric converter for non-numeric types
 
-	default:
 
-		fmt.Fprintf(os.Stderr, "proto: tag has unknown wire type: %q\n", s)
 
-		return
 
-	}
 
-
 
-	var err error
 
-	p.Tag, err = strconv.Atoi(fields[1])
 
-	if err != nil {
 
-		return
 
-	}
 
-
 
-outer:
 
-	for i := 2; i < len(fields); i++ {
 
-		f := fields[i]
 
-		switch {
 
-		case f == "req":
 
-			p.Required = true
 
-		case f == "opt":
 
+func (p *Properties) Parse(tag string) {
 
+	// For example: "bytes,49,opt,name=foo,def=hello!"
 
+	for len(tag) > 0 {
 
+		i := strings.IndexByte(tag, ',')
 
+		if i < 0 {
 
+			i = len(tag)
 
+		}
 
+		switch s := tag[:i]; {
 
+		case strings.HasPrefix(s, "name="):
 
+			p.OrigName = s[len("name="):]
 
+		case strings.HasPrefix(s, "json="):
 
+			p.JSONName = s[len("json="):]
 
+		case strings.HasPrefix(s, "enum="):
 
+			p.Enum = s[len("enum="):]
 
+		case strings.HasPrefix(s, "weak="):
 
+			p.Weak = s[len("weak="):]
 
+		case strings.Trim(s, "0123456789") == "":
 
+			n, _ := strconv.ParseUint(s, 10, 32)
 
+			p.Tag = int(n)
 
+		case s == "opt":
 
 			p.Optional = true
 
-		case f == "rep":
 
+		case s == "req":
 
+			p.Required = true
 
+		case s == "rep":
 
 			p.Repeated = true
 
-		case f == "packed":
 
+		case s == "varint" || s == "zigzag32" || s == "zigzag64":
 
+			p.Wire = s
 
+			p.WireType = WireVarint
 
+		case s == "fixed32":
 
+			p.Wire = s
 
+			p.WireType = WireFixed32
 
+		case s == "fixed64":
 
+			p.Wire = s
 
+			p.WireType = WireFixed64
 
+		case s == "bytes":
 
+			p.Wire = s
 
+			p.WireType = WireBytes
 
+		case s == "group":
 
+			p.Wire = s
 
+			p.WireType = WireStartGroup
 
+		case s == "packed":
 
 			p.Packed = true
 
-		case strings.HasPrefix(f, "name="):
 
-			p.OrigName = f[5:]
 
-		case strings.HasPrefix(f, "json="):
 
-			p.JSONName = f[5:]
 
-		case strings.HasPrefix(f, "enum="):
 
-			p.Enum = f[5:]
 
-		case f == "proto3":
 
-			p.proto3 = true
 
-		case f == "oneof":
 
-			p.oneof = true
 
-		case strings.HasPrefix(f, "def="):
 
+		case s == "proto3":
 
+			p.Proto3 = true
 
+		case s == "oneof":
 
+			p.Oneof = true
 
+		case strings.HasPrefix(s, "def="):
 
+			// The default tag is special in that everything afterwards is the
 
+			// default regardless of the presence of commas.
 
 			p.HasDefault = true
 
-			p.Default = f[4:] // rest of string
 
-			if i+1 < len(fields) {
 
-				// Commas aren't escaped, and def is always last.
 
-				p.Default += "," + strings.Join(fields[i+1:], ",")
 
-				break outer
 
-			}
 
-		}
 
-	}
 
-}
 
-
 
-var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
 
-
 
-// setFieldProps initializes the field properties for submessages and maps.
 
-func (p *Properties) setFieldProps(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
 
-	switch t1 := typ; t1.Kind() {
 
-	case reflect.Ptr:
 
-		if t1.Elem().Kind() == reflect.Struct {
 
-			p.stype = t1.Elem()
 
-		}
 
-
 
-	case reflect.Slice:
 
-		if t2 := t1.Elem(); t2.Kind() == reflect.Ptr && t2.Elem().Kind() == reflect.Struct {
 
-			p.stype = t2.Elem()
 
-		}
 
-
 
-	case reflect.Map:
 
-		p.mtype = t1
 
-		p.MapKeyProp = &Properties{}
 
-		p.MapKeyProp.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
 
-		p.MapValProp = &Properties{}
 
-		vtype := p.mtype.Elem()
 
-		if vtype.Kind() != reflect.Ptr && vtype.Kind() != reflect.Slice {
 
-			// The value type is not a message (*T) or bytes ([]byte),
 
-			// so we need encoders for the pointer to this type.
 
-			vtype = reflect.PtrTo(vtype)
 
-		}
 
-		p.MapValProp.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
 
-	}
 
-
 
-	if p.stype != nil {
 
-		if lockGetProp {
 
-			p.sprop = GetProperties(p.stype)
 
-		} else {
 
-			p.sprop = getPropertiesLocked(p.stype)
 
+			p.Default, i = tag[len("def="):], len(tag)
 
 		}
 
+		tag = strings.TrimPrefix(tag[i:], ",")
 
 	}
 
 }
 
 
-var (
 
-	marshalerType = reflect.TypeOf((*Marshaler)(nil)).Elem()
 
-)
 
-
 
 // Init populates the properties from a protocol buffer struct tag.
 
+//
 
+// Deprecated: Do not use.
 
 func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
 
-	p.init(typ, name, tag, f, true)
 
-}
 
-
 
-func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructField, lockGetProp bool) {
 
-	// "bytes,49,opt,def=hello!"
 
 	p.Name = name
 
 	p.OrigName = name
 
 	if tag == "" {
 
 		return
 
 	}
 
 	p.Parse(tag)
 
-	p.setFieldProps(typ, f, lockGetProp)
 
+
 
+	if typ != nil && typ.Kind() == reflect.Map {
 
+		p.MapKeyProp = new(Properties)
 
+		p.MapKeyProp.Init(nil, "Key", f.Tag.Get("protobuf_key"), nil)
 
+		p.MapValProp = new(Properties)
 
+		p.MapValProp.Init(nil, "Value", f.Tag.Get("protobuf_val"), nil)
 
+	}
 
 }
 
 
-var (
 
-	propertiesMu  sync.RWMutex
 
-	propertiesMap = make(map[reflect.Type]*StructProperties)
 
-)
 
+var propertiesCache sync.Map // map[reflect.Type]*StructProperties
 
 
-// GetProperties returns the list of properties for the type represented by t.
 
-// t must represent a generated struct type of a protocol message.
 
+// GetProperties returns the list of properties for the type represented by t,
 
+// which must be a generated protocol buffer message in the open-struct API,
 
+// where protobuf message fields are represented by exported Go struct fields.
 
+//
 
+// Deprecated: Use protobuf reflection instead.
 
 func GetProperties(t reflect.Type) *StructProperties {
 
-	if t.Kind() != reflect.Struct {
 
-		panic("proto: type must have kind struct")
 
-	}
 
-
 
-	// Most calls to GetProperties in a long-running program will be
 
-	// retrieving details for types we have seen before.
 
-	propertiesMu.RLock()
 
-	sprop, ok := propertiesMap[t]
 
-	propertiesMu.RUnlock()
 
-	if ok {
 
-		return sprop
 
+	if p, ok := propertiesCache.Load(t); ok {
 
+		return p.(*StructProperties)
 
 	}
 
-
 
-	propertiesMu.Lock()
 
-	sprop = getPropertiesLocked(t)
 
-	propertiesMu.Unlock()
 
-	return sprop
 
+	p, _ := propertiesCache.LoadOrStore(t, newProperties(t))
 
+	return p.(*StructProperties)
 
 }
 
 
-type (
 
-	oneofFuncsIface interface {
 
-		XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
 
-	}
 
-	oneofWrappersIface interface {
 
-		XXX_OneofWrappers() []interface{}
 
-	}
 
-)
 
-
 
-// getPropertiesLocked requires that propertiesMu is held.
 
-func getPropertiesLocked(t reflect.Type) *StructProperties {
 
-	if prop, ok := propertiesMap[t]; ok {
 
-		return prop
 
+func newProperties(t reflect.Type) *StructProperties {
 
+	if t.Kind() != reflect.Struct {
 
+		panic(fmt.Sprintf("%v is not a generated message in the open-struct API", t))
 
 	}
 
 
+	var hasOneof bool
 
 	prop := new(StructProperties)
 
-	// in case of recursive protos, fill this in now.
 
-	propertiesMap[t] = prop
 
-
 
-	// build properties
 
-	prop.Prop = make([]*Properties, t.NumField())
 
-	prop.order = make([]int, t.NumField())
 
 
+	// Construct a list of properties for each field in the struct.
 
 	for i := 0; i < t.NumField(); i++ {
 
-		f := t.Field(i)
 
 		p := new(Properties)
 
-		name := f.Name
 
-		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
 
+		f := t.Field(i)
 
+		tagField := f.Tag.Get("protobuf")
 
+		p.Init(f.Type, f.Name, tagField, &f)
 
 
-		oneof := f.Tag.Get("protobuf_oneof") // special case
 
-		if oneof != "" {
 
-			// Oneof fields don't use the traditional protobuf tag.
 
-			p.OrigName = oneof
 
+		tagOneof := f.Tag.Get("protobuf_oneof")
 
+		if tagOneof != "" {
 
+			hasOneof = true
 
+			p.OrigName = tagOneof
 
 		}
 
-		prop.Prop[i] = p
 
-		prop.order[i] = i
 
-		if debug {
 
-			print(i, " ", f.Name, " ", t.String(), " ")
 
-			if p.Tag > 0 {
 
-				print(p.String())
 
-			}
 
-			print("\n")
 
+
 
+		// Rename unrelated struct fields with the "XXX_" prefix since so much
 
+		// user code simply checks for this to exclude special fields.
 
+		if tagField == "" && tagOneof == "" && !strings.HasPrefix(p.Name, "XXX_") {
 
+			p.Name = "XXX_" + p.Name
 
+			p.OrigName = "XXX_" + p.OrigName
 
+		} else if p.Weak != "" {
 
+			p.Name = p.OrigName // avoid possible "XXX_" prefix on weak field
 
 		}
 
+
 
+		prop.Prop = append(prop.Prop, p)
 
 	}
 
 
-	// Re-order prop.order.
 
-	sort.Sort(prop)
 
+	// Construct a mapping of oneof field names to properties.
 
+	if hasOneof {
 
+		var oneofWrappers []interface{}
 
+		if fn, ok := reflect.PtrTo(t).MethodByName("XXX_OneofFuncs"); ok {
 
+			oneofWrappers = fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))})[3].Interface().([]interface{})
 
+		}
 
+		if fn, ok := reflect.PtrTo(t).MethodByName("XXX_OneofWrappers"); ok {
 
+			oneofWrappers = fn.Func.Call([]reflect.Value{reflect.Zero(fn.Type.In(0))})[0].Interface().([]interface{})
 
+		}
 
+		if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(protoreflect.ProtoMessage); ok {
 
+			if m, ok := m.ProtoReflect().(interface{ ProtoMessageInfo() *protoimpl.MessageInfo }); ok {
 
+				oneofWrappers = m.ProtoMessageInfo().OneofWrappers
 
+			}
 
+		}
 
 
-	var oots []interface{}
 
-	switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
 
-	case oneofFuncsIface:
 
-		_, _, _, oots = m.XXX_OneofFuncs()
 
-	case oneofWrappersIface:
 
-		oots = m.XXX_OneofWrappers()
 
-	}
 
-	if len(oots) > 0 {
 
-		// Interpret oneof metadata.
 
 		prop.OneofTypes = make(map[string]*OneofProperties)
 
-		for _, oot := range oots {
 
-			oop := &OneofProperties{
 
-				Type: reflect.ValueOf(oot).Type(), // *T
 
+		for _, wrapper := range oneofWrappers {
 
+			p := &OneofProperties{
 
+				Type: reflect.ValueOf(wrapper).Type(), // *T
 
 				Prop: new(Properties),
 
 			}
 
-			sft := oop.Type.Elem().Field(0)
 
-			oop.Prop.Name = sft.Name
 
-			oop.Prop.Parse(sft.Tag.Get("protobuf"))
 
-			// There will be exactly one interface field that
 
-			// this new value is assignable to.
 
-			for i := 0; i < t.NumField(); i++ {
 
-				f := t.Field(i)
 
-				if f.Type.Kind() != reflect.Interface {
 
-					continue
 
+			f := p.Type.Elem().Field(0)
 
+			p.Prop.Name = f.Name
 
+			p.Prop.Parse(f.Tag.Get("protobuf"))
 
+
 
+			// Determine the struct field that contains this oneof.
 
+			// Each wrapper is assignable to exactly one parent field.
 
+			var foundOneof bool
 
+			for i := 0; i < t.NumField() && !foundOneof; i++ {
 
+				if p.Type.AssignableTo(t.Field(i).Type) {
 
+					p.Field = i
 
+					foundOneof = true
 
 				}
 
-				if !oop.Type.AssignableTo(f.Type) {
 
-					continue
 
-				}
 
-				oop.Field = i
 
-				break
 
 			}
 
-			prop.OneofTypes[oop.Prop.OrigName] = oop
 
-		}
 
-	}
 
-
 
-	// build required counts
 
-	// build tags
 
-	reqCount := 0
 
-	prop.decoderOrigNames = make(map[string]int)
 
-	for i, p := range prop.Prop {
 
-		if strings.HasPrefix(p.Name, "XXX_") {
 
-			// Internal fields should not appear in tags/origNames maps.
 
-			// They are handled specially when encoding and decoding.
 
-			continue
 
-		}
 
-		if p.Required {
 
-			reqCount++
 
+			if !foundOneof {
 
+				panic(fmt.Sprintf("%v is not a generated message in the open-struct API", t))
 
+			}
 
+			prop.OneofTypes[p.Prop.OrigName] = p
 
 		}
 
-		prop.decoderTags.put(p.Tag, i)
 
-		prop.decoderOrigNames[p.OrigName] = i
 
 	}
 
-	prop.reqCount = reqCount
 
 
 	return prop
 
 }
 
 
-// A global registry of enum types.
 
-// The generated code will register the generated maps by calling RegisterEnum.
 
-
 
-var enumValueMaps = make(map[string]map[string]int32)
 
-
 
-// RegisterEnum is called from the generated code to install the enum descriptor
 
-// maps into the global table to aid parsing text format protocol buffers.
 
-func RegisterEnum(typeName string, unusedNameMap map[int32]string, valueMap map[string]int32) {
 
-	if _, ok := enumValueMaps[typeName]; ok {
 
-		panic("proto: duplicate enum registered: " + typeName)
 
-	}
 
-	enumValueMaps[typeName] = valueMap
 
-}
 
-
 
-// EnumValueMap returns the mapping from names to integers of the
 
-// enum type enumType, or a nil if not found.
 
-func EnumValueMap(enumType string) map[string]int32 {
 
-	return enumValueMaps[enumType]
 
-}
 
-
 
-// A registry of all linked message types.
 
-// The string is a fully-qualified proto name ("pkg.Message").
 
-var (
 
-	protoTypedNils = make(map[string]Message)      // a map from proto names to typed nil pointers
 
-	protoMapTypes  = make(map[string]reflect.Type) // a map from proto names to map types
 
-	revProtoTypes  = make(map[reflect.Type]string)
 
-)
 
-
 
-// RegisterType is called from generated code and maps from the fully qualified
 
-// proto name to the type (pointer to struct) of the protocol buffer.
 
-func RegisterType(x Message, name string) {
 
-	if _, ok := protoTypedNils[name]; ok {
 
-		// TODO: Some day, make this a panic.
 
-		log.Printf("proto: duplicate proto type registered: %s", name)
 
-		return
 
-	}
 
-	t := reflect.TypeOf(x)
 
-	if v := reflect.ValueOf(x); v.Kind() == reflect.Ptr && v.Pointer() == 0 {
 
-		// Generated code always calls RegisterType with nil x.
 
-		// This check is just for extra safety.
 
-		protoTypedNils[name] = x
 
-	} else {
 
-		protoTypedNils[name] = reflect.Zero(t).Interface().(Message)
 
-	}
 
-	revProtoTypes[t] = name
 
-}
 
-
 
-// RegisterMapType is called from generated code and maps from the fully qualified
 
-// proto name to the native map type of the proto map definition.
 
-func RegisterMapType(x interface{}, name string) {
 
-	if reflect.TypeOf(x).Kind() != reflect.Map {
 
-		panic(fmt.Sprintf("RegisterMapType(%T, %q); want map", x, name))
 
-	}
 
-	if _, ok := protoMapTypes[name]; ok {
 
-		log.Printf("proto: duplicate proto type registered: %s", name)
 
-		return
 
-	}
 
-	t := reflect.TypeOf(x)
 
-	protoMapTypes[name] = t
 
-	revProtoTypes[t] = name
 
-}
 
-
 
-// MessageName returns the fully-qualified proto name for the given message type.
 
-func MessageName(x Message) string {
 
-	type xname interface {
 
-		XXX_MessageName() string
 
-	}
 
-	if m, ok := x.(xname); ok {
 
-		return m.XXX_MessageName()
 
-	}
 
-	return revProtoTypes[reflect.TypeOf(x)]
 
-}
 
-
 
-// MessageType returns the message type (pointer to struct) for a named message.
 
-// The type is not guaranteed to implement proto.Message if the name refers to a
 
-// map entry.
 
-func MessageType(name string) reflect.Type {
 
-	if t, ok := protoTypedNils[name]; ok {
 
-		return reflect.TypeOf(t)
 
-	}
 
-	return protoMapTypes[name]
 
-}
 
-
 
-// A registry of all linked proto files.
 
-var (
 
-	protoFiles = make(map[string][]byte) // file name => fileDescriptor
 
-)
 
-
 
-// RegisterFile is called from generated code and maps from the
 
-// full file name of a .proto file to its compressed FileDescriptorProto.
 
-func RegisterFile(filename string, fileDescriptor []byte) {
 
-	protoFiles[filename] = fileDescriptor
 
-}
 
-
 
-// FileDescriptor returns the compressed FileDescriptorProto for a .proto file.
 
-func FileDescriptor(filename string) []byte { return protoFiles[filename] }
 
+func (sp *StructProperties) Len() int           { return len(sp.Prop) }
 
+func (sp *StructProperties) Less(i, j int) bool { return false }
 
+func (sp *StructProperties) Swap(i, j int)      { return }

+ 167 - 0
vendor/github.com/golang/protobuf/proto/proto.go
Просмотреть файл 

@@ -0,0 +1,167 @@
 
+// Copyright 2019 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
+
 
+// Package proto provides functionality for handling protocol buffer messages.
 
+// In particular, it provides marshaling and unmarshaling between a protobuf
 
+// message and the binary wire format.
 
+//
 
+// See https://developers.google.com/protocol-buffers/docs/gotutorial for
 
+// more information.
 
+//
 
+// Deprecated: Use the "google.golang.org/protobuf/proto" package instead.
 
+package proto
 
+
 
+import (
 
+	protoV2 "google.golang.org/protobuf/proto"
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
+	"google.golang.org/protobuf/runtime/protoiface"
 
+	"google.golang.org/protobuf/runtime/protoimpl"
 
+)
 
+
 
+const (
 
+	ProtoPackageIsVersion1 = true
 
+	ProtoPackageIsVersion2 = true
 
+	ProtoPackageIsVersion3 = true
 
+	ProtoPackageIsVersion4 = true
 
+)
 
+
 
+// GeneratedEnum is any enum type generated by protoc-gen-go
 
+// which is a named int32 kind.
 
+// This type exists for documentation purposes.
 
+type GeneratedEnum interface{}
 
+
 
+// GeneratedMessage is any message type generated by protoc-gen-go
 
+// which is a pointer to a named struct kind.
 
+// This type exists for documentation purposes.
 
+type GeneratedMessage interface{}
 
+
 
+// Message is a protocol buffer message.
 
+//
 
+// This is the v1 version of the message interface and is marginally better
 
+// than an empty interface as it lacks any method to programatically interact
 
+// with the contents of the message.
 
+//
 
+// A v2 message is declared in "google.golang.org/protobuf/proto".Message and
 
+// exposes protobuf reflection as a first-class feature of the interface.
 
+//
 
+// To convert a v1 message to a v2 message, use the MessageV2 function.
 
+// To convert a v2 message to a v1 message, use the MessageV1 function.
 
+type Message = protoiface.MessageV1
 
+
 
+// MessageV1 converts either a v1 or v2 message to a v1 message.
 
+// It returns nil if m is nil.
 
+func MessageV1(m GeneratedMessage) protoiface.MessageV1 {
 
+	return protoimpl.X.ProtoMessageV1Of(m)
 
+}
 
+
 
+// MessageV2 converts either a v1 or v2 message to a v2 message.
 
+// It returns nil if m is nil.
 
+func MessageV2(m GeneratedMessage) protoV2.Message {
 
+	return protoimpl.X.ProtoMessageV2Of(m)
 
+}
 
+
 
+// MessageReflect returns a reflective view for a message.
 
+// It returns nil if m is nil.
 
+func MessageReflect(m Message) protoreflect.Message {
 
+	return protoimpl.X.MessageOf(m)
 
+}
 
+
 
+// Marshaler is implemented by messages that can marshal themselves.
 
+// This interface is used by the following functions: Size, Marshal,
 
+// Buffer.Marshal, and Buffer.EncodeMessage.
 
+//
 
+// Deprecated: Do not implement.
 
+type Marshaler interface {
 
+	// Marshal formats the encoded bytes of the message.
 
+	// It should be deterministic and emit valid protobuf wire data.
 
+	// The caller takes ownership of the returned buffer.
 
+	Marshal() ([]byte, error)
 
+}
 
+
 
+// Unmarshaler is implemented by messages that can unmarshal themselves.
 
+// This interface is used by the following functions: Unmarshal, UnmarshalMerge,
 
+// Buffer.Unmarshal, Buffer.DecodeMessage, and Buffer.DecodeGroup.
 
+//
 
+// Deprecated: Do not implement.
 
+type Unmarshaler interface {
 
+	// Unmarshal parses the encoded bytes of the protobuf wire input.
 
+	// The provided buffer is only valid for during method call.
 
+	// It should not reset the receiver message.
 
+	Unmarshal([]byte) error
 
+}
 
+
 
+// Merger is implemented by messages that can merge themselves.
 
+// This interface is used by the following functions: Clone and Merge.
 
+//
 
+// Deprecated: Do not implement.
 
+type Merger interface {
 
+	// Merge merges the contents of src into the receiver message.
 
+	// It clones all data structures in src such that it aliases no mutable
 
+	// memory referenced by src.
 
+	Merge(src Message)
 
+}
 
+
 
+// RequiredNotSetError is an error type returned when
 
+// marshaling or unmarshaling a message with missing required fields.
 
+type RequiredNotSetError struct {
 
+	err error
 
+}
 
+
 
+func (e *RequiredNotSetError) Error() string {
 
+	if e.err != nil {
 
+		return e.err.Error()
 
+	}
 
+	return "proto: required field not set"
 
+}
 
+func (e *RequiredNotSetError) RequiredNotSet() bool {
 
+	return true
 
+}
 
+
 
+func checkRequiredNotSet(m protoV2.Message) error {
 
+	if err := protoV2.CheckInitialized(m); err != nil {
 
+		return &RequiredNotSetError{err: err}
 
+	}
 
+	return nil
 
+}
 
+
 
+// Clone returns a deep copy of src.
 
+func Clone(src Message) Message {
 
+	return MessageV1(protoV2.Clone(MessageV2(src)))
 
+}
 
+
 
+// Merge merges src into dst, which must be messages of the same type.
 
+//
 
+// Populated scalar fields in src are copied to dst, while populated
 
+// singular messages in src are merged into dst by recursively calling Merge.
 
+// The elements of every list field in src is appended to the corresponded
 
+// list fields in dst. The entries of every map field in src is copied into
 
+// the corresponding map field in dst, possibly replacing existing entries.
 
+// The unknown fields of src are appended to the unknown fields of dst.
 
+func Merge(dst, src Message) {
 
+	protoV2.Merge(MessageV2(dst), MessageV2(src))
 
+}
 
+
 
+// Equal reports whether two messages are equal.
 
+// If two messages marshal to the same bytes under deterministic serialization,
 
+// then Equal is guaranteed to report true.
 
+//
 
+// Two messages are equal if they are the same protobuf message type,
 
+// have the same set of populated known and extension field values,
 
+// and the same set of unknown fields values.
 
+//
 
+// Scalar values are compared with the equivalent of the == operator in Go,
 
+// except bytes values which are compared using bytes.Equal and
 
+// floating point values which specially treat NaNs as equal.
 
+// Message values are compared by recursively calling Equal.
 
+// Lists are equal if each element value is also equal.
 
+// Maps are equal if they have the same set of keys, where the pair of values
 
+// for each key is also equal.
 
+func Equal(x, y Message) bool {
 
+	return protoV2.Equal(MessageV2(x), MessageV2(y))
 
+}
 
+
 
+func isMessageSet(md protoreflect.MessageDescriptor) bool {
 
+	ms, ok := md.(interface{ IsMessageSet() bool })
 
+	return ok && ms.IsMessageSet()
 
+}

+ 323 - 0
vendor/github.com/golang/protobuf/proto/registry.go
Просмотреть файл 

@@ -0,0 +1,323 @@
 
+// Copyright 2019 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
+
 
+package proto
 
+
 
+import (
 
+	"bytes"
 
+	"compress/gzip"
 
+	"fmt"
 
+	"io/ioutil"
 
+	"reflect"
 
+	"strings"
 
+	"sync"
 
+
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
+	"google.golang.org/protobuf/reflect/protoregistry"
 
+	"google.golang.org/protobuf/runtime/protoimpl"
 
+)
 
+
 
+// filePath is the path to the proto source file.
 
+type filePath = string // e.g., "google/protobuf/descriptor.proto"
 
+
 
+// fileDescGZIP is the compressed contents of the encoded FileDescriptorProto.
 
+type fileDescGZIP = []byte
 
+
 
+var fileCache sync.Map // map[filePath]fileDescGZIP
 
+
 
+// RegisterFile is called from generated code to register the compressed
 
+// FileDescriptorProto with the file path for a proto source file.
 
+//
 
+// Deprecated: Use protoregistry.GlobalFiles.RegisterFile instead.
 
+func RegisterFile(s filePath, d fileDescGZIP) {
 
+	// Decompress the descriptor.
 
+	zr, err := gzip.NewReader(bytes.NewReader(d))
 
+	if err != nil {
 
+		panic(fmt.Sprintf("proto: invalid compressed file descriptor: %v", err))
 
+	}
 
+	b, err := ioutil.ReadAll(zr)
 
+	if err != nil {
 
+		panic(fmt.Sprintf("proto: invalid compressed file descriptor: %v", err))
 
+	}
 
+
 
+	// Construct a protoreflect.FileDescriptor from the raw descriptor.
 
+	// Note that DescBuilder.Build automatically registers the constructed
 
+	// file descriptor with the v2 registry.
 
+	protoimpl.DescBuilder{RawDescriptor: b}.Build()
 
+
 
+	// Locally cache the raw descriptor form for the file.
 
+	fileCache.Store(s, d)
 
+}
 
+
 
+// FileDescriptor returns the compressed FileDescriptorProto given the file path
 
+// for a proto source file. It returns nil if not found.
 
+//
 
+// Deprecated: Use protoregistry.GlobalFiles.FindFileByPath instead.
 
+func FileDescriptor(s filePath) fileDescGZIP {
 
+	if v, ok := fileCache.Load(s); ok {
 
+		return v.(fileDescGZIP)
 
+	}
 
+
 
+	// Find the descriptor in the v2 registry.
 
+	var b []byte
 
+	if fd, _ := protoregistry.GlobalFiles.FindFileByPath(s); fd != nil {
 
+		if fd, ok := fd.(interface{ ProtoLegacyRawDesc() []byte }); ok {
 
+			b = fd.ProtoLegacyRawDesc()
 
+		} else {
 
+			// TODO: Use protodesc.ToFileDescriptorProto to construct
 
+			// a descriptorpb.FileDescriptorProto and marshal it.
 
+			// However, doing so causes the proto package to have a dependency
 
+			// on descriptorpb, leading to cyclic dependency issues.
 
+		}
 
+	}
 
+
 
+	// Locally cache the raw descriptor form for the file.
 
+	if len(b) > 0 {
 
+		v, _ := fileCache.LoadOrStore(s, protoimpl.X.CompressGZIP(b))
 
+		return v.(fileDescGZIP)
 
+	}
 
+	return nil
 
+}
 
+
 
+// enumName is the name of an enum. For historical reasons, the enum name is
 
+// neither the full Go name nor the full protobuf name of the enum.
 
+// The name is the dot-separated combination of just the proto package that the
 
+// enum is declared within followed by the Go type name of the generated enum.
 
+type enumName = string // e.g., "my.proto.package.GoMessage_GoEnum"
 
+
 
+// enumsByName maps enum values by name to their numeric counterpart.
 
+type enumsByName = map[string]int32
 
+
 
+// enumsByNumber maps enum values by number to their name counterpart.
 
+type enumsByNumber = map[int32]string
 
+
 
+var enumCache sync.Map     // map[enumName]enumsByName
 
+var numFilesCache sync.Map // map[protoreflect.FullName]int
 
+
 
+// RegisterEnum is called from the generated code to register the mapping of
 
+// enum value names to enum numbers for the enum identified by s.
 
+//
 
+// Deprecated: Use protoregistry.GlobalTypes.RegisterEnum instead.
 
+func RegisterEnum(s enumName, _ enumsByNumber, m enumsByName) {
 
+	if _, ok := enumCache.Load(s); ok {
 
+		panic("proto: duplicate enum registered: " + s)
 
+	}
 
+	enumCache.Store(s, m)
 
+
 
+	// This does not forward registration to the v2 registry since this API
 
+	// lacks sufficient information to construct a complete v2 enum descriptor.
 
+}
 
+
 
+// EnumValueMap returns the mapping from enum value names to enum numbers for
 
+// the enum of the given name. It returns nil if not found.
 
+//
 
+// Deprecated: Use protoregistry.GlobalTypes.FindEnumByName instead.
 
+func EnumValueMap(s enumName) enumsByName {
 
+	if v, ok := enumCache.Load(s); ok {
 
+		return v.(enumsByName)
 
+	}
 
+
 
+	// Check whether the cache is stale. If the number of files in the current
 
+	// package differs, then it means that some enums may have been recently
 
+	// registered upstream that we do not know about.
 
+	var protoPkg protoreflect.FullName
 
+	if i := strings.LastIndexByte(s, '.'); i >= 0 {
 
+		protoPkg = protoreflect.FullName(s[:i])
 
+	}
 
+	v, _ := numFilesCache.Load(protoPkg)
 
+	numFiles, _ := v.(int)
 
+	if protoregistry.GlobalFiles.NumFilesByPackage(protoPkg) == numFiles {
 
+		return nil // cache is up-to-date; was not found earlier
 
+	}
 
+
 
+	// Update the enum cache for all enums declared in the given proto package.
 
+	numFiles = 0
 
+	protoregistry.GlobalFiles.RangeFilesByPackage(protoPkg, func(fd protoreflect.FileDescriptor) bool {
 
+		walkEnums(fd, func(ed protoreflect.EnumDescriptor) {
 
+			name := protoimpl.X.LegacyEnumName(ed)
 
+			if _, ok := enumCache.Load(name); !ok {
 
+				m := make(enumsByName)
 
+				evs := ed.Values()
 
+				for i := evs.Len() - 1; i >= 0; i-- {
 
+					ev := evs.Get(i)
 
+					m[string(ev.Name())] = int32(ev.Number())
 
+				}
 
+				enumCache.LoadOrStore(name, m)
 
+			}
 
+		})
 
+		numFiles++
 
+		return true
 
+	})
 
+	numFilesCache.Store(protoPkg, numFiles)
 
+
 
+	// Check cache again for enum map.
 
+	if v, ok := enumCache.Load(s); ok {
 
+		return v.(enumsByName)
 
+	}
 
+	return nil
 
+}
 
+
 
+// walkEnums recursively walks all enums declared in d.
 
+func walkEnums(d interface {
 
+	Enums() protoreflect.EnumDescriptors
 
+	Messages() protoreflect.MessageDescriptors
 
+}, f func(protoreflect.EnumDescriptor)) {
 
+	eds := d.Enums()
 
+	for i := eds.Len() - 1; i >= 0; i-- {
 
+		f(eds.Get(i))
 
+	}
 
+	mds := d.Messages()
 
+	for i := mds.Len() - 1; i >= 0; i-- {
 
+		walkEnums(mds.Get(i), f)
 
+	}
 
+}
 
+
 
+// messageName is the full name of protobuf message.
 
+type messageName = string
 
+
 
+var messageTypeCache sync.Map // map[messageName]reflect.Type
 
+
 
+// RegisterType is called from generated code to register the message Go type
 
+// for a message of the given name.
 
+//
 
+// Deprecated: Use protoregistry.GlobalTypes.RegisterMessage instead.
 
+func RegisterType(m Message, s messageName) {
 
+	mt := protoimpl.X.LegacyMessageTypeOf(m, protoreflect.FullName(s))
 
+	if err := protoregistry.GlobalTypes.RegisterMessage(mt); err != nil {
 
+		panic(err)
 
+	}
 
+	messageTypeCache.Store(s, reflect.TypeOf(m))
 
+}
 
+
 
+// RegisterMapType is called from generated code to register the Go map type
 
+// for a protobuf message representing a map entry.
 
+//
 
+// Deprecated: Do not use.
 
+func RegisterMapType(m interface{}, s messageName) {
 
+	t := reflect.TypeOf(m)
 
+	if t.Kind() != reflect.Map {
 
+		panic(fmt.Sprintf("invalid map kind: %v", t))
 
+	}
 
+	if _, ok := messageTypeCache.Load(s); ok {
 
+		panic(fmt.Errorf("proto: duplicate proto message registered: %s", s))
 
+	}
 
+	messageTypeCache.Store(s, t)
 
+}
 
+
 
+// MessageType returns the message type for a named message.
 
+// It returns nil if not found.
 
+//
 
+// Deprecated: Use protoregistry.GlobalTypes.FindMessageByName instead.
 
+func MessageType(s messageName) reflect.Type {
 
+	if v, ok := messageTypeCache.Load(s); ok {
 
+		return v.(reflect.Type)
 
+	}
 
+
 
+	// Derive the message type from the v2 registry.
 
+	var t reflect.Type
 
+	if mt, _ := protoregistry.GlobalTypes.FindMessageByName(protoreflect.FullName(s)); mt != nil {
 
+		t = messageGoType(mt)
 
+	}
 
+
 
+	// If we could not get a concrete type, it is possible that it is a
 
+	// pseudo-message for a map entry.
 
+	if t == nil {
 
+		d, _ := protoregistry.GlobalFiles.FindDescriptorByName(protoreflect.FullName(s))
 
+		if md, _ := d.(protoreflect.MessageDescriptor); md != nil && md.IsMapEntry() {
 
+			kt := goTypeForField(md.Fields().ByNumber(1))
 
+			vt := goTypeForField(md.Fields().ByNumber(2))
 
+			t = reflect.MapOf(kt, vt)
 
+		}
 
+	}
 
+
 
+	// Locally cache the message type for the given name.
 
+	if t != nil {
 
+		v, _ := messageTypeCache.LoadOrStore(s, t)
 
+		return v.(reflect.Type)
 
+	}
 
+	return nil
 
+}
 
+
 
+func goTypeForField(fd protoreflect.FieldDescriptor) reflect.Type {
 
+	switch k := fd.Kind(); k {
 
+	case protoreflect.EnumKind:
 
+		if et, _ := protoregistry.GlobalTypes.FindEnumByName(fd.Enum().FullName()); et != nil {
 
+			return enumGoType(et)
 
+		}
 
+		return reflect.TypeOf(protoreflect.EnumNumber(0))
 
+	case protoreflect.MessageKind, protoreflect.GroupKind:
 
+		if mt, _ := protoregistry.GlobalTypes.FindMessageByName(fd.Message().FullName()); mt != nil {
 
+			return messageGoType(mt)
 
+		}
 
+		return reflect.TypeOf((*protoreflect.Message)(nil)).Elem()
 
+	default:
 
+		return reflect.TypeOf(fd.Default().Interface())
 
+	}
 
+}
 
+
 
+func enumGoType(et protoreflect.EnumType) reflect.Type {
 
+	return reflect.TypeOf(et.New(0))
 
+}
 
+
 
+func messageGoType(mt protoreflect.MessageType) reflect.Type {
 
+	return reflect.TypeOf(MessageV1(mt.Zero().Interface()))
 
+}
 
+
 
+// MessageName returns the full protobuf name for the given message type.
 
+//
 
+// Deprecated: Use protoreflect.MessageDescriptor.FullName instead.
 
+func MessageName(m Message) messageName {
 
+	if m == nil {
 
+		return ""
 
+	}
 
+	if m, ok := m.(interface{ XXX_MessageName() messageName }); ok {
 
+		return m.XXX_MessageName()
 
+	}
 
+	return messageName(protoimpl.X.MessageDescriptorOf(m).FullName())
 
+}
 
+
 
+// RegisterExtension is called from the generated code to register
 
+// the extension descriptor.
 
+//
 
+// Deprecated: Use protoregistry.GlobalTypes.RegisterExtension instead.
 
+func RegisterExtension(d *ExtensionDesc) {
 
+	if err := protoregistry.GlobalTypes.RegisterExtension(d); err != nil {
 
+		panic(err)
 
+	}
 
+}
 
+
 
+type extensionsByNumber = map[int32]*ExtensionDesc
 
+
 
+var extensionCache sync.Map // map[messageName]extensionsByNumber
 
+
 
+// RegisteredExtensions returns a map of the registered extensions for the
 
+// provided protobuf message, indexed by the extension field number.
 
+//
 
+// Deprecated: Use protoregistry.GlobalTypes.RangeExtensionsByMessage instead.
 
+func RegisteredExtensions(m Message) extensionsByNumber {
 
+	// Check whether the cache is stale. If the number of extensions for
 
+	// the given message differs, then it means that some extensions were
 
+	// recently registered upstream that we do not know about.
 
+	s := MessageName(m)
 
+	v, _ := extensionCache.Load(s)
 
+	xs, _ := v.(extensionsByNumber)
 
+	if protoregistry.GlobalTypes.NumExtensionsByMessage(protoreflect.FullName(s)) == len(xs) {
 
+		return xs // cache is up-to-date
 
+	}
 
+
 
+	// Cache is stale, re-compute the extensions map.
 
+	xs = make(extensionsByNumber)
 
+	protoregistry.GlobalTypes.RangeExtensionsByMessage(protoreflect.FullName(s), func(xt protoreflect.ExtensionType) bool {
 
+		if xd, ok := xt.(*ExtensionDesc); ok {
 
+			xs[int32(xt.TypeDescriptor().Number())] = xd
 
+		} else {
 
+			// TODO: This implies that the protoreflect.ExtensionType is a
 
+			// custom type not generated by protoc-gen-go. We could try and
 
+			// convert the type to an ExtensionDesc.
 
+		}
 
+		return true
 
+	})
 
+	extensionCache.Store(s, xs)
 
+	return xs
 
+}

+ 0 - 2776
vendor/github.com/golang/protobuf/proto/table_marshal.go
Просмотреть файл 

@@ -1,2776 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2016 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-import (
 
-	"errors"
 
-	"fmt"
 
-	"math"
 
-	"reflect"
 
-	"sort"
 
-	"strconv"
 
-	"strings"
 
-	"sync"
 
-	"sync/atomic"
 
-	"unicode/utf8"
 
-)
 
-
 
-// a sizer takes a pointer to a field and the size of its tag, computes the size of
 
-// the encoded data.
 
-type sizer func(pointer, int) int
 
-
 
-// a marshaler takes a byte slice, a pointer to a field, and its tag (in wire format),
 
-// marshals the field to the end of the slice, returns the slice and error (if any).
 
-type marshaler func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error)
 
-
 
-// marshalInfo is the information used for marshaling a message.
 
-type marshalInfo struct {
 
-	typ          reflect.Type
 
-	fields       []*marshalFieldInfo
 
-	unrecognized field                      // offset of XXX_unrecognized
 
-	extensions   field                      // offset of XXX_InternalExtensions
 
-	v1extensions field                      // offset of XXX_extensions
 
-	sizecache    field                      // offset of XXX_sizecache
 
-	initialized  int32                      // 0 -- only typ is set, 1 -- fully initialized
 
-	messageset   bool                       // uses message set wire format
 
-	hasmarshaler bool                       // has custom marshaler
 
-	sync.RWMutex                            // protect extElems map, also for initialization
 
-	extElems     map[int32]*marshalElemInfo // info of extension elements
 
-}
 
-
 
-// marshalFieldInfo is the information used for marshaling a field of a message.
 
-type marshalFieldInfo struct {
 
-	field      field
 
-	wiretag    uint64 // tag in wire format
 
-	tagsize    int    // size of tag in wire format
 
-	sizer      sizer
 
-	marshaler  marshaler
 
-	isPointer  bool
 
-	required   bool                              // field is required
 
-	name       string                            // name of the field, for error reporting
 
-	oneofElems map[reflect.Type]*marshalElemInfo // info of oneof elements
 
-}
 
-
 
-// marshalElemInfo is the information used for marshaling an extension or oneof element.
 
-type marshalElemInfo struct {
 
-	wiretag   uint64 // tag in wire format
 
-	tagsize   int    // size of tag in wire format
 
-	sizer     sizer
 
-	marshaler marshaler
 
-	isptr     bool // elem is pointer typed, thus interface of this type is a direct interface (extension only)
 
-	deref     bool // dereference the pointer before operating on it; implies isptr
 
-}
 
-
 
-var (
 
-	marshalInfoMap  = map[reflect.Type]*marshalInfo{}
 
-	marshalInfoLock sync.Mutex
 
-)
 
-
 
-// getMarshalInfo returns the information to marshal a given type of message.
 
-// The info it returns may not necessarily initialized.
 
-// t is the type of the message (NOT the pointer to it).
 
-func getMarshalInfo(t reflect.Type) *marshalInfo {
 
-	marshalInfoLock.Lock()
 
-	u, ok := marshalInfoMap[t]
 
-	if !ok {
 
-		u = &marshalInfo{typ: t}
 
-		marshalInfoMap[t] = u
 
-	}
 
-	marshalInfoLock.Unlock()
 
-	return u
 
-}
 
-
 
-// Size is the entry point from generated code,
 
-// and should be ONLY called by generated code.
 
-// It computes the size of encoded data of msg.
 
-// a is a pointer to a place to store cached marshal info.
 
-func (a *InternalMessageInfo) Size(msg Message) int {
 
-	u := getMessageMarshalInfo(msg, a)
 
-	ptr := toPointer(&msg)
 
-	if ptr.isNil() {
 
-		// We get here if msg is a typed nil ((*SomeMessage)(nil)),
 
-		// so it satisfies the interface, and msg == nil wouldn't
 
-		// catch it. We don't want crash in this case.
 
-		return 0
 
-	}
 
-	return u.size(ptr)
 
-}
 
-
 
-// Marshal is the entry point from generated code,
 
-// and should be ONLY called by generated code.
 
-// It marshals msg to the end of b.
 
-// a is a pointer to a place to store cached marshal info.
 
-func (a *InternalMessageInfo) Marshal(b []byte, msg Message, deterministic bool) ([]byte, error) {
 
-	u := getMessageMarshalInfo(msg, a)
 
-	ptr := toPointer(&msg)
 
-	if ptr.isNil() {
 
-		// We get here if msg is a typed nil ((*SomeMessage)(nil)),
 
-		// so it satisfies the interface, and msg == nil wouldn't
 
-		// catch it. We don't want crash in this case.
 
-		return b, ErrNil
 
-	}
 
-	return u.marshal(b, ptr, deterministic)
 
-}
 
-
 
-func getMessageMarshalInfo(msg interface{}, a *InternalMessageInfo) *marshalInfo {
 
-	// u := a.marshal, but atomically.
 
-	// We use an atomic here to ensure memory consistency.
 
-	u := atomicLoadMarshalInfo(&a.marshal)
 
-	if u == nil {
 
-		// Get marshal information from type of message.
 
-		t := reflect.ValueOf(msg).Type()
 
-		if t.Kind() != reflect.Ptr {
 
-			panic(fmt.Sprintf("cannot handle non-pointer message type %v", t))
 
-		}
 
-		u = getMarshalInfo(t.Elem())
 
-		// Store it in the cache for later users.
 
-		// a.marshal = u, but atomically.
 
-		atomicStoreMarshalInfo(&a.marshal, u)
 
-	}
 
-	return u
 
-}
 
-
 
-// size is the main function to compute the size of the encoded data of a message.
 
-// ptr is the pointer to the message.
 
-func (u *marshalInfo) size(ptr pointer) int {
 
-	if atomic.LoadInt32(&u.initialized) == 0 {
 
-		u.computeMarshalInfo()
 
-	}
 
-
 
-	// If the message can marshal itself, let it do it, for compatibility.
 
-	// NOTE: This is not efficient.
 
-	if u.hasmarshaler {
 
-		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
 
-		b, _ := m.Marshal()
 
-		return len(b)
 
-	}
 
-
 
-	n := 0
 
-	for _, f := range u.fields {
 
-		if f.isPointer && ptr.offset(f.field).getPointer().isNil() {
 
-			// nil pointer always marshals to nothing
 
-			continue
 
-		}
 
-		n += f.sizer(ptr.offset(f.field), f.tagsize)
 
-	}
 
-	if u.extensions.IsValid() {
 
-		e := ptr.offset(u.extensions).toExtensions()
 
-		if u.messageset {
 
-			n += u.sizeMessageSet(e)
 
-		} else {
 
-			n += u.sizeExtensions(e)
 
-		}
 
-	}
 
-	if u.v1extensions.IsValid() {
 
-		m := *ptr.offset(u.v1extensions).toOldExtensions()
 
-		n += u.sizeV1Extensions(m)
 
-	}
 
-	if u.unrecognized.IsValid() {
 
-		s := *ptr.offset(u.unrecognized).toBytes()
 
-		n += len(s)
 
-	}
 
-	// cache the result for use in marshal
 
-	if u.sizecache.IsValid() {
 
-		atomic.StoreInt32(ptr.offset(u.sizecache).toInt32(), int32(n))
 
-	}
 
-	return n
 
-}
 
-
 
-// cachedsize gets the size from cache. If there is no cache (i.e. message is not generated),
 
-// fall back to compute the size.
 
-func (u *marshalInfo) cachedsize(ptr pointer) int {
 
-	if u.sizecache.IsValid() {
 
-		return int(atomic.LoadInt32(ptr.offset(u.sizecache).toInt32()))
 
-	}
 
-	return u.size(ptr)
 
-}
 
-
 
-// marshal is the main function to marshal a message. It takes a byte slice and appends
 
-// the encoded data to the end of the slice, returns the slice and error (if any).
 
-// ptr is the pointer to the message.
 
-// If deterministic is true, map is marshaled in deterministic order.
 
-func (u *marshalInfo) marshal(b []byte, ptr pointer, deterministic bool) ([]byte, error) {
 
-	if atomic.LoadInt32(&u.initialized) == 0 {
 
-		u.computeMarshalInfo()
 
-	}
 
-
 
-	// If the message can marshal itself, let it do it, for compatibility.
 
-	// NOTE: This is not efficient.
 
-	if u.hasmarshaler {
 
-		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
 
-		b1, err := m.Marshal()
 
-		b = append(b, b1...)
 
-		return b, err
 
-	}
 
-
 
-	var err, errLater error
 
-	// The old marshaler encodes extensions at beginning.
 
-	if u.extensions.IsValid() {
 
-		e := ptr.offset(u.extensions).toExtensions()
 
-		if u.messageset {
 
-			b, err = u.appendMessageSet(b, e, deterministic)
 
-		} else {
 
-			b, err = u.appendExtensions(b, e, deterministic)
 
-		}
 
-		if err != nil {
 
-			return b, err
 
-		}
 
-	}
 
-	if u.v1extensions.IsValid() {
 
-		m := *ptr.offset(u.v1extensions).toOldExtensions()
 
-		b, err = u.appendV1Extensions(b, m, deterministic)
 
-		if err != nil {
 
-			return b, err
 
-		}
 
-	}
 
-	for _, f := range u.fields {
 
-		if f.required {
 
-			if ptr.offset(f.field).getPointer().isNil() {
 
-				// Required field is not set.
 
-				// We record the error but keep going, to give a complete marshaling.
 
-				if errLater == nil {
 
-					errLater = &RequiredNotSetError{f.name}
 
-				}
 
-				continue
 
-			}
 
-		}
 
-		if f.isPointer && ptr.offset(f.field).getPointer().isNil() {
 
-			// nil pointer always marshals to nothing
 
-			continue
 
-		}
 
-		b, err = f.marshaler(b, ptr.offset(f.field), f.wiretag, deterministic)
 
-		if err != nil {
 
-			if err1, ok := err.(*RequiredNotSetError); ok {
 
-				// Required field in submessage is not set.
 
-				// We record the error but keep going, to give a complete marshaling.
 
-				if errLater == nil {
 
-					errLater = &RequiredNotSetError{f.name + "." + err1.field}
 
-				}
 
-				continue
 
-			}
 
-			if err == errRepeatedHasNil {
 
-				err = errors.New("proto: repeated field " + f.name + " has nil element")
 
-			}
 
-			if err == errInvalidUTF8 {
 
-				if errLater == nil {
 
-					fullName := revProtoTypes[reflect.PtrTo(u.typ)] + "." + f.name
 
-					errLater = &invalidUTF8Error{fullName}
 
-				}
 
-				continue
 
-			}
 
-			return b, err
 
-		}
 
-	}
 
-	if u.unrecognized.IsValid() {
 
-		s := *ptr.offset(u.unrecognized).toBytes()
 
-		b = append(b, s...)
 
-	}
 
-	return b, errLater
 
-}
 
-
 
-// computeMarshalInfo initializes the marshal info.
 
-func (u *marshalInfo) computeMarshalInfo() {
 
-	u.Lock()
 
-	defer u.Unlock()
 
-	if u.initialized != 0 { // non-atomic read is ok as it is protected by the lock
 
-		return
 
-	}
 
-
 
-	t := u.typ
 
-	u.unrecognized = invalidField
 
-	u.extensions = invalidField
 
-	u.v1extensions = invalidField
 
-	u.sizecache = invalidField
 
-
 
-	// If the message can marshal itself, let it do it, for compatibility.
 
-	// NOTE: This is not efficient.
 
-	if reflect.PtrTo(t).Implements(marshalerType) {
 
-		u.hasmarshaler = true
 
-		atomic.StoreInt32(&u.initialized, 1)
 
-		return
 
-	}
 
-
 
-	// get oneof implementers
 
-	var oneofImplementers []interface{}
 
-	switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
 
-	case oneofFuncsIface:
 
-		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
 
-	case oneofWrappersIface:
 
-		oneofImplementers = m.XXX_OneofWrappers()
 
-	}
 
-
 
-	n := t.NumField()
 
-
 
-	// deal with XXX fields first
 
-	for i := 0; i < t.NumField(); i++ {
 
-		f := t.Field(i)
 
-		if !strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
-		}
 
-		switch f.Name {
 
-		case "XXX_sizecache":
 
-			u.sizecache = toField(&f)
 
-		case "XXX_unrecognized":
 
-			u.unrecognized = toField(&f)
 
-		case "XXX_InternalExtensions":
 
-			u.extensions = toField(&f)
 
-			u.messageset = f.Tag.Get("protobuf_messageset") == "1"
 
-		case "XXX_extensions":
 
-			u.v1extensions = toField(&f)
 
-		case "XXX_NoUnkeyedLiteral":
 
-			// nothing to do
 
-		default:
 
-			panic("unknown XXX field: " + f.Name)
 
-		}
 
-		n--
 
-	}
 
-
 
-	// normal fields
 
-	fields := make([]marshalFieldInfo, n) // batch allocation
 
-	u.fields = make([]*marshalFieldInfo, 0, n)
 
-	for i, j := 0, 0; i < t.NumField(); i++ {
 
-		f := t.Field(i)
 
-
 
-		if strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
-		}
 
-		field := &fields[j]
 
-		j++
 
-		field.name = f.Name
 
-		u.fields = append(u.fields, field)
 
-		if f.Tag.Get("protobuf_oneof") != "" {
 
-			field.computeOneofFieldInfo(&f, oneofImplementers)
 
-			continue
 
-		}
 
-		if f.Tag.Get("protobuf") == "" {
 
-			// field has no tag (not in generated message), ignore it
 
-			u.fields = u.fields[:len(u.fields)-1]
 
-			j--
 
-			continue
 
-		}
 
-		field.computeMarshalFieldInfo(&f)
 
-	}
 
-
 
-	// fields are marshaled in tag order on the wire.
 
-	sort.Sort(byTag(u.fields))
 
-
 
-	atomic.StoreInt32(&u.initialized, 1)
 
-}
 
-
 
-// helper for sorting fields by tag
 
-type byTag []*marshalFieldInfo
 
-
 
-func (a byTag) Len() int           { return len(a) }
 
-func (a byTag) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 
-func (a byTag) Less(i, j int) bool { return a[i].wiretag < a[j].wiretag }
 
-
 
-// getExtElemInfo returns the information to marshal an extension element.
 
-// The info it returns is initialized.
 
-func (u *marshalInfo) getExtElemInfo(desc *ExtensionDesc) *marshalElemInfo {
 
-	// get from cache first
 
-	u.RLock()
 
-	e, ok := u.extElems[desc.Field]
 
-	u.RUnlock()
 
-	if ok {
 
-		return e
 
-	}
 
-
 
-	t := reflect.TypeOf(desc.ExtensionType) // pointer or slice to basic type or struct
 
-	tags := strings.Split(desc.Tag, ",")
 
-	tag, err := strconv.Atoi(tags[1])
 
-	if err != nil {
 
-		panic("tag is not an integer")
 
-	}
 
-	wt := wiretype(tags[0])
 
-	if t.Kind() == reflect.Ptr && t.Elem().Kind() != reflect.Struct {
 
-		t = t.Elem()
 
-	}
 
-	sizer, marshaler := typeMarshaler(t, tags, false, false)
 
-	var deref bool
 
-	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
 
-		t = reflect.PtrTo(t)
 
-		deref = true
 
-	}
 
-	e = &marshalElemInfo{
 
-		wiretag:   uint64(tag)<<3 | wt,
 
-		tagsize:   SizeVarint(uint64(tag) << 3),
 
-		sizer:     sizer,
 
-		marshaler: marshaler,
 
-		isptr:     t.Kind() == reflect.Ptr,
 
-		deref:     deref,
 
-	}
 
-
 
-	// update cache
 
-	u.Lock()
 
-	if u.extElems == nil {
 
-		u.extElems = make(map[int32]*marshalElemInfo)
 
-	}
 
-	u.extElems[desc.Field] = e
 
-	u.Unlock()
 
-	return e
 
-}
 
-
 
-// computeMarshalFieldInfo fills up the information to marshal a field.
 
-func (fi *marshalFieldInfo) computeMarshalFieldInfo(f *reflect.StructField) {
 
-	// parse protobuf tag of the field.
 
-	// tag has format of "bytes,49,opt,name=foo,def=hello!"
 
-	tags := strings.Split(f.Tag.Get("protobuf"), ",")
 
-	if tags[0] == "" {
 
-		return
 
-	}
 
-	tag, err := strconv.Atoi(tags[1])
 
-	if err != nil {
 
-		panic("tag is not an integer")
 
-	}
 
-	wt := wiretype(tags[0])
 
-	if tags[2] == "req" {
 
-		fi.required = true
 
-	}
 
-	fi.setTag(f, tag, wt)
 
-	fi.setMarshaler(f, tags)
 
-}
 
-
 
-func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofImplementers []interface{}) {
 
-	fi.field = toField(f)
 
-	fi.wiretag = math.MaxInt32 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire.
 
-	fi.isPointer = true
 
-	fi.sizer, fi.marshaler = makeOneOfMarshaler(fi, f)
 
-	fi.oneofElems = make(map[reflect.Type]*marshalElemInfo)
 
-
 
-	ityp := f.Type // interface type
 
-	for _, o := range oneofImplementers {
 
-		t := reflect.TypeOf(o)
 
-		if !t.Implements(ityp) {
 
-			continue
 
-		}
 
-		sf := t.Elem().Field(0) // oneof implementer is a struct with a single field
 
-		tags := strings.Split(sf.Tag.Get("protobuf"), ",")
 
-		tag, err := strconv.Atoi(tags[1])
 
-		if err != nil {
 
-			panic("tag is not an integer")
 
-		}
 
-		wt := wiretype(tags[0])
 
-		sizer, marshaler := typeMarshaler(sf.Type, tags, false, true) // oneof should not omit any zero value
 
-		fi.oneofElems[t.Elem()] = &marshalElemInfo{
 
-			wiretag:   uint64(tag)<<3 | wt,
 
-			tagsize:   SizeVarint(uint64(tag) << 3),
 
-			sizer:     sizer,
 
-			marshaler: marshaler,
 
-		}
 
-	}
 
-}
 
-
 
-// wiretype returns the wire encoding of the type.
 
-func wiretype(encoding string) uint64 {
 
-	switch encoding {
 
-	case "fixed32":
 
-		return WireFixed32
 
-	case "fixed64":
 
-		return WireFixed64
 
-	case "varint", "zigzag32", "zigzag64":
 
-		return WireVarint
 
-	case "bytes":
 
-		return WireBytes
 
-	case "group":
 
-		return WireStartGroup
 
-	}
 
-	panic("unknown wire type " + encoding)
 
-}
 
-
 
-// setTag fills up the tag (in wire format) and its size in the info of a field.
 
-func (fi *marshalFieldInfo) setTag(f *reflect.StructField, tag int, wt uint64) {
 
-	fi.field = toField(f)
 
-	fi.wiretag = uint64(tag)<<3 | wt
 
-	fi.tagsize = SizeVarint(uint64(tag) << 3)
 
-}
 
-
 
-// setMarshaler fills up the sizer and marshaler in the info of a field.
 
-func (fi *marshalFieldInfo) setMarshaler(f *reflect.StructField, tags []string) {
 
-	switch f.Type.Kind() {
 
-	case reflect.Map:
 
-		// map field
 
-		fi.isPointer = true
 
-		fi.sizer, fi.marshaler = makeMapMarshaler(f)
 
-		return
 
-	case reflect.Ptr, reflect.Slice:
 
-		fi.isPointer = true
 
-	}
 
-	fi.sizer, fi.marshaler = typeMarshaler(f.Type, tags, true, false)
 
-}
 
-
 
-// typeMarshaler returns the sizer and marshaler of a given field.
 
-// t is the type of the field.
 
-// tags is the generated "protobuf" tag of the field.
 
-// If nozero is true, zero value is not marshaled to the wire.
 
-// If oneof is true, it is a oneof field.
 
-func typeMarshaler(t reflect.Type, tags []string, nozero, oneof bool) (sizer, marshaler) {
 
-	encoding := tags[0]
 
-
 
-	pointer := false
 
-	slice := false
 
-	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
 
-		slice = true
 
-		t = t.Elem()
 
-	}
 
-	if t.Kind() == reflect.Ptr {
 
-		pointer = true
 
-		t = t.Elem()
 
-	}
 
-
 
-	packed := false
 
-	proto3 := false
 
-	validateUTF8 := true
 
-	for i := 2; i < len(tags); i++ {
 
-		if tags[i] == "packed" {
 
-			packed = true
 
-		}
 
-		if tags[i] == "proto3" {
 
-			proto3 = true
 
-		}
 
-	}
 
-	validateUTF8 = validateUTF8 && proto3
 
-
 
-	switch t.Kind() {
 
-	case reflect.Bool:
 
-		if pointer {
 
-			return sizeBoolPtr, appendBoolPtr
 
-		}
 
-		if slice {
 
-			if packed {
 
-				return sizeBoolPackedSlice, appendBoolPackedSlice
 
-			}
 
-			return sizeBoolSlice, appendBoolSlice
 
-		}
 
-		if nozero {
 
-			return sizeBoolValueNoZero, appendBoolValueNoZero
 
-		}
 
-		return sizeBoolValue, appendBoolValue
 
-	case reflect.Uint32:
 
-		switch encoding {
 
-		case "fixed32":
 
-			if pointer {
 
-				return sizeFixed32Ptr, appendFixed32Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeFixed32PackedSlice, appendFixed32PackedSlice
 
-				}
 
-				return sizeFixed32Slice, appendFixed32Slice
 
-			}
 
-			if nozero {
 
-				return sizeFixed32ValueNoZero, appendFixed32ValueNoZero
 
-			}
 
-			return sizeFixed32Value, appendFixed32Value
 
-		case "varint":
 
-			if pointer {
 
-				return sizeVarint32Ptr, appendVarint32Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeVarint32PackedSlice, appendVarint32PackedSlice
 
-				}
 
-				return sizeVarint32Slice, appendVarint32Slice
 
-			}
 
-			if nozero {
 
-				return sizeVarint32ValueNoZero, appendVarint32ValueNoZero
 
-			}
 
-			return sizeVarint32Value, appendVarint32Value
 
-		}
 
-	case reflect.Int32:
 
-		switch encoding {
 
-		case "fixed32":
 
-			if pointer {
 
-				return sizeFixedS32Ptr, appendFixedS32Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeFixedS32PackedSlice, appendFixedS32PackedSlice
 
-				}
 
-				return sizeFixedS32Slice, appendFixedS32Slice
 
-			}
 
-			if nozero {
 
-				return sizeFixedS32ValueNoZero, appendFixedS32ValueNoZero
 
-			}
 
-			return sizeFixedS32Value, appendFixedS32Value
 
-		case "varint":
 
-			if pointer {
 
-				return sizeVarintS32Ptr, appendVarintS32Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeVarintS32PackedSlice, appendVarintS32PackedSlice
 
-				}
 
-				return sizeVarintS32Slice, appendVarintS32Slice
 
-			}
 
-			if nozero {
 
-				return sizeVarintS32ValueNoZero, appendVarintS32ValueNoZero
 
-			}
 
-			return sizeVarintS32Value, appendVarintS32Value
 
-		case "zigzag32":
 
-			if pointer {
 
-				return sizeZigzag32Ptr, appendZigzag32Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeZigzag32PackedSlice, appendZigzag32PackedSlice
 
-				}
 
-				return sizeZigzag32Slice, appendZigzag32Slice
 
-			}
 
-			if nozero {
 
-				return sizeZigzag32ValueNoZero, appendZigzag32ValueNoZero
 
-			}
 
-			return sizeZigzag32Value, appendZigzag32Value
 
-		}
 
-	case reflect.Uint64:
 
-		switch encoding {
 
-		case "fixed64":
 
-			if pointer {
 
-				return sizeFixed64Ptr, appendFixed64Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeFixed64PackedSlice, appendFixed64PackedSlice
 
-				}
 
-				return sizeFixed64Slice, appendFixed64Slice
 
-			}
 
-			if nozero {
 
-				return sizeFixed64ValueNoZero, appendFixed64ValueNoZero
 
-			}
 
-			return sizeFixed64Value, appendFixed64Value
 
-		case "varint":
 
-			if pointer {
 
-				return sizeVarint64Ptr, appendVarint64Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeVarint64PackedSlice, appendVarint64PackedSlice
 
-				}
 
-				return sizeVarint64Slice, appendVarint64Slice
 
-			}
 
-			if nozero {
 
-				return sizeVarint64ValueNoZero, appendVarint64ValueNoZero
 
-			}
 
-			return sizeVarint64Value, appendVarint64Value
 
-		}
 
-	case reflect.Int64:
 
-		switch encoding {
 
-		case "fixed64":
 
-			if pointer {
 
-				return sizeFixedS64Ptr, appendFixedS64Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeFixedS64PackedSlice, appendFixedS64PackedSlice
 
-				}
 
-				return sizeFixedS64Slice, appendFixedS64Slice
 
-			}
 
-			if nozero {
 
-				return sizeFixedS64ValueNoZero, appendFixedS64ValueNoZero
 
-			}
 
-			return sizeFixedS64Value, appendFixedS64Value
 
-		case "varint":
 
-			if pointer {
 
-				return sizeVarintS64Ptr, appendVarintS64Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeVarintS64PackedSlice, appendVarintS64PackedSlice
 
-				}
 
-				return sizeVarintS64Slice, appendVarintS64Slice
 
-			}
 
-			if nozero {
 
-				return sizeVarintS64ValueNoZero, appendVarintS64ValueNoZero
 
-			}
 
-			return sizeVarintS64Value, appendVarintS64Value
 
-		case "zigzag64":
 
-			if pointer {
 
-				return sizeZigzag64Ptr, appendZigzag64Ptr
 
-			}
 
-			if slice {
 
-				if packed {
 
-					return sizeZigzag64PackedSlice, appendZigzag64PackedSlice
 
-				}
 
-				return sizeZigzag64Slice, appendZigzag64Slice
 
-			}
 
-			if nozero {
 
-				return sizeZigzag64ValueNoZero, appendZigzag64ValueNoZero
 
-			}
 
-			return sizeZigzag64Value, appendZigzag64Value
 
-		}
 
-	case reflect.Float32:
 
-		if pointer {
 
-			return sizeFloat32Ptr, appendFloat32Ptr
 
-		}
 
-		if slice {
 
-			if packed {
 
-				return sizeFloat32PackedSlice, appendFloat32PackedSlice
 
-			}
 
-			return sizeFloat32Slice, appendFloat32Slice
 
-		}
 
-		if nozero {
 
-			return sizeFloat32ValueNoZero, appendFloat32ValueNoZero
 
-		}
 
-		return sizeFloat32Value, appendFloat32Value
 
-	case reflect.Float64:
 
-		if pointer {
 
-			return sizeFloat64Ptr, appendFloat64Ptr
 
-		}
 
-		if slice {
 
-			if packed {
 
-				return sizeFloat64PackedSlice, appendFloat64PackedSlice
 
-			}
 
-			return sizeFloat64Slice, appendFloat64Slice
 
-		}
 
-		if nozero {
 
-			return sizeFloat64ValueNoZero, appendFloat64ValueNoZero
 
-		}
 
-		return sizeFloat64Value, appendFloat64Value
 
-	case reflect.String:
 
-		if validateUTF8 {
 
-			if pointer {
 
-				return sizeStringPtr, appendUTF8StringPtr
 
-			}
 
-			if slice {
 
-				return sizeStringSlice, appendUTF8StringSlice
 
-			}
 
-			if nozero {
 
-				return sizeStringValueNoZero, appendUTF8StringValueNoZero
 
-			}
 
-			return sizeStringValue, appendUTF8StringValue
 
-		}
 
-		if pointer {
 
-			return sizeStringPtr, appendStringPtr
 
-		}
 
-		if slice {
 
-			return sizeStringSlice, appendStringSlice
 
-		}
 
-		if nozero {
 
-			return sizeStringValueNoZero, appendStringValueNoZero
 
-		}
 
-		return sizeStringValue, appendStringValue
 
-	case reflect.Slice:
 
-		if slice {
 
-			return sizeBytesSlice, appendBytesSlice
 
-		}
 
-		if oneof {
 
-			// Oneof bytes field may also have "proto3" tag.
 
-			// We want to marshal it as a oneof field. Do this
 
-			// check before the proto3 check.
 
-			return sizeBytesOneof, appendBytesOneof
 
-		}
 
-		if proto3 {
 
-			return sizeBytes3, appendBytes3
 
-		}
 
-		return sizeBytes, appendBytes
 
-	case reflect.Struct:
 
-		switch encoding {
 
-		case "group":
 
-			if slice {
 
-				return makeGroupSliceMarshaler(getMarshalInfo(t))
 
-			}
 
-			return makeGroupMarshaler(getMarshalInfo(t))
 
-		case "bytes":
 
-			if slice {
 
-				return makeMessageSliceMarshaler(getMarshalInfo(t))
 
-			}
 
-			return makeMessageMarshaler(getMarshalInfo(t))
 
-		}
 
-	}
 
-	panic(fmt.Sprintf("unknown or mismatched type: type: %v, wire type: %v", t, encoding))
 
-}
 
-
 
-// Below are functions to size/marshal a specific type of a field.
 
-// They are stored in the field's info, and called by function pointers.
 
-// They have type sizer or marshaler.
 
-
 
-func sizeFixed32Value(_ pointer, tagsize int) int {
 
-	return 4 + tagsize
 
-}
 
-func sizeFixed32ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toUint32()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return 4 + tagsize
 
-}
 
-func sizeFixed32Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toUint32Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 4 + tagsize
 
-}
 
-func sizeFixed32Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint32Slice()
 
-	return (4 + tagsize) * len(s)
 
-}
 
-func sizeFixed32PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint32Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
 
-}
 
-func sizeFixedS32Value(_ pointer, tagsize int) int {
 
-	return 4 + tagsize
 
-}
 
-func sizeFixedS32ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt32()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return 4 + tagsize
 
-}
 
-func sizeFixedS32Ptr(ptr pointer, tagsize int) int {
 
-	p := ptr.getInt32Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 4 + tagsize
 
-}
 
-func sizeFixedS32Slice(ptr pointer, tagsize int) int {
 
-	s := ptr.getInt32Slice()
 
-	return (4 + tagsize) * len(s)
 
-}
 
-func sizeFixedS32PackedSlice(ptr pointer, tagsize int) int {
 
-	s := ptr.getInt32Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
 
-}
 
-func sizeFloat32Value(_ pointer, tagsize int) int {
 
-	return 4 + tagsize
 
-}
 
-func sizeFloat32ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := math.Float32bits(*ptr.toFloat32())
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return 4 + tagsize
 
-}
 
-func sizeFloat32Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toFloat32Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 4 + tagsize
 
-}
 
-func sizeFloat32Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toFloat32Slice()
 
-	return (4 + tagsize) * len(s)
 
-}
 
-func sizeFloat32PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toFloat32Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
 
-}
 
-func sizeFixed64Value(_ pointer, tagsize int) int {
 
-	return 8 + tagsize
 
-}
 
-func sizeFixed64ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toUint64()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return 8 + tagsize
 
-}
 
-func sizeFixed64Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toUint64Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 8 + tagsize
 
-}
 
-func sizeFixed64Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint64Slice()
 
-	return (8 + tagsize) * len(s)
 
-}
 
-func sizeFixed64PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint64Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
 
-}
 
-func sizeFixedS64Value(_ pointer, tagsize int) int {
 
-	return 8 + tagsize
 
-}
 
-func sizeFixedS64ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt64()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return 8 + tagsize
 
-}
 
-func sizeFixedS64Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toInt64Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 8 + tagsize
 
-}
 
-func sizeFixedS64Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toInt64Slice()
 
-	return (8 + tagsize) * len(s)
 
-}
 
-func sizeFixedS64PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toInt64Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
 
-}
 
-func sizeFloat64Value(_ pointer, tagsize int) int {
 
-	return 8 + tagsize
 
-}
 
-func sizeFloat64ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := math.Float64bits(*ptr.toFloat64())
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return 8 + tagsize
 
-}
 
-func sizeFloat64Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toFloat64Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 8 + tagsize
 
-}
 
-func sizeFloat64Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toFloat64Slice()
 
-	return (8 + tagsize) * len(s)
 
-}
 
-func sizeFloat64PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toFloat64Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
 
-}
 
-func sizeVarint32Value(ptr pointer, tagsize int) int {
 
-	v := *ptr.toUint32()
 
-	return SizeVarint(uint64(v)) + tagsize
 
-}
 
-func sizeVarint32ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toUint32()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(v)) + tagsize
 
-}
 
-func sizeVarint32Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toUint32Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(*p)) + tagsize
 
-}
 
-func sizeVarint32Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint32Slice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v)) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeVarint32PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint32Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v))
 
-	}
 
-	return n + SizeVarint(uint64(n)) + tagsize
 
-}
 
-func sizeVarintS32Value(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt32()
 
-	return SizeVarint(uint64(v)) + tagsize
 
-}
 
-func sizeVarintS32ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt32()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(v)) + tagsize
 
-}
 
-func sizeVarintS32Ptr(ptr pointer, tagsize int) int {
 
-	p := ptr.getInt32Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(*p)) + tagsize
 
-}
 
-func sizeVarintS32Slice(ptr pointer, tagsize int) int {
 
-	s := ptr.getInt32Slice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v)) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeVarintS32PackedSlice(ptr pointer, tagsize int) int {
 
-	s := ptr.getInt32Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v))
 
-	}
 
-	return n + SizeVarint(uint64(n)) + tagsize
 
-}
 
-func sizeVarint64Value(ptr pointer, tagsize int) int {
 
-	v := *ptr.toUint64()
 
-	return SizeVarint(v) + tagsize
 
-}
 
-func sizeVarint64ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toUint64()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return SizeVarint(v) + tagsize
 
-}
 
-func sizeVarint64Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toUint64Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return SizeVarint(*p) + tagsize
 
-}
 
-func sizeVarint64Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint64Slice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(v) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeVarint64PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toUint64Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(v)
 
-	}
 
-	return n + SizeVarint(uint64(n)) + tagsize
 
-}
 
-func sizeVarintS64Value(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt64()
 
-	return SizeVarint(uint64(v)) + tagsize
 
-}
 
-func sizeVarintS64ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt64()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(v)) + tagsize
 
-}
 
-func sizeVarintS64Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toInt64Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(*p)) + tagsize
 
-}
 
-func sizeVarintS64Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toInt64Slice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v)) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeVarintS64PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toInt64Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v))
 
-	}
 
-	return n + SizeVarint(uint64(n)) + tagsize
 
-}
 
-func sizeZigzag32Value(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt32()
 
-	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
 
-}
 
-func sizeZigzag32ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt32()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
 
-}
 
-func sizeZigzag32Ptr(ptr pointer, tagsize int) int {
 
-	p := ptr.getInt32Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	v := *p
 
-	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
 
-}
 
-func sizeZigzag32Slice(ptr pointer, tagsize int) int {
 
-	s := ptr.getInt32Slice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeZigzag32PackedSlice(ptr pointer, tagsize int) int {
 
-	s := ptr.getInt32Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
 
-	}
 
-	return n + SizeVarint(uint64(n)) + tagsize
 
-}
 
-func sizeZigzag64Value(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt64()
 
-	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
 
-}
 
-func sizeZigzag64ValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toInt64()
 
-	if v == 0 {
 
-		return 0
 
-	}
 
-	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
 
-}
 
-func sizeZigzag64Ptr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toInt64Ptr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	v := *p
 
-	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
 
-}
 
-func sizeZigzag64Slice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toInt64Slice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeZigzag64PackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toInt64Slice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v<<1) ^ uint64((int64(v) >> 63)))
 
-	}
 
-	return n + SizeVarint(uint64(n)) + tagsize
 
-}
 
-func sizeBoolValue(_ pointer, tagsize int) int {
 
-	return 1 + tagsize
 
-}
 
-func sizeBoolValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toBool()
 
-	if !v {
 
-		return 0
 
-	}
 
-	return 1 + tagsize
 
-}
 
-func sizeBoolPtr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toBoolPtr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	return 1 + tagsize
 
-}
 
-func sizeBoolSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toBoolSlice()
 
-	return (1 + tagsize) * len(s)
 
-}
 
-func sizeBoolPackedSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toBoolSlice()
 
-	if len(s) == 0 {
 
-		return 0
 
-	}
 
-	return len(s) + SizeVarint(uint64(len(s))) + tagsize
 
-}
 
-func sizeStringValue(ptr pointer, tagsize int) int {
 
-	v := *ptr.toString()
 
-	return len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-}
 
-func sizeStringValueNoZero(ptr pointer, tagsize int) int {
 
-	v := *ptr.toString()
 
-	if v == "" {
 
-		return 0
 
-	}
 
-	return len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-}
 
-func sizeStringPtr(ptr pointer, tagsize int) int {
 
-	p := *ptr.toStringPtr()
 
-	if p == nil {
 
-		return 0
 
-	}
 
-	v := *p
 
-	return len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-}
 
-func sizeStringSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toStringSlice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-	}
 
-	return n
 
-}
 
-func sizeBytes(ptr pointer, tagsize int) int {
 
-	v := *ptr.toBytes()
 
-	if v == nil {
 
-		return 0
 
-	}
 
-	return len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-}
 
-func sizeBytes3(ptr pointer, tagsize int) int {
 
-	v := *ptr.toBytes()
 
-	if len(v) == 0 {
 
-		return 0
 
-	}
 
-	return len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-}
 
-func sizeBytesOneof(ptr pointer, tagsize int) int {
 
-	v := *ptr.toBytes()
 
-	return len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-}
 
-func sizeBytesSlice(ptr pointer, tagsize int) int {
 
-	s := *ptr.toBytesSlice()
 
-	n := 0
 
-	for _, v := range s {
 
-		n += len(v) + SizeVarint(uint64(len(v))) + tagsize
 
-	}
 
-	return n
 
-}
 
-
 
-// appendFixed32 appends an encoded fixed32 to b.
 
-func appendFixed32(b []byte, v uint32) []byte {
 
-	b = append(b,
 
-		byte(v),
 
-		byte(v>>8),
 
-		byte(v>>16),
 
-		byte(v>>24))
 
-	return b
 
-}
 
-
 
-// appendFixed64 appends an encoded fixed64 to b.
 
-func appendFixed64(b []byte, v uint64) []byte {
 
-	b = append(b,
 
-		byte(v),
 
-		byte(v>>8),
 
-		byte(v>>16),
 
-		byte(v>>24),
 
-		byte(v>>32),
 
-		byte(v>>40),
 
-		byte(v>>48),
 
-		byte(v>>56))
 
-	return b
 
-}
 
-
 
-// appendVarint appends an encoded varint to b.
 
-func appendVarint(b []byte, v uint64) []byte {
 
-	// TODO: make 1-byte (maybe 2-byte) case inline-able, once we
 
-	// have non-leaf inliner.
 
-	switch {
 
-	case v < 1<<7:
 
-		b = append(b, byte(v))
 
-	case v < 1<<14:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte(v>>7))
 
-	case v < 1<<21:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte(v>>14))
 
-	case v < 1<<28:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte(v>>21))
 
-	case v < 1<<35:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte((v>>21)&0x7f|0x80),
 
-			byte(v>>28))
 
-	case v < 1<<42:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte((v>>21)&0x7f|0x80),
 
-			byte((v>>28)&0x7f|0x80),
 
-			byte(v>>35))
 
-	case v < 1<<49:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte((v>>21)&0x7f|0x80),
 
-			byte((v>>28)&0x7f|0x80),
 
-			byte((v>>35)&0x7f|0x80),
 
-			byte(v>>42))
 
-	case v < 1<<56:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte((v>>21)&0x7f|0x80),
 
-			byte((v>>28)&0x7f|0x80),
 
-			byte((v>>35)&0x7f|0x80),
 
-			byte((v>>42)&0x7f|0x80),
 
-			byte(v>>49))
 
-	case v < 1<<63:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte((v>>21)&0x7f|0x80),
 
-			byte((v>>28)&0x7f|0x80),
 
-			byte((v>>35)&0x7f|0x80),
 
-			byte((v>>42)&0x7f|0x80),
 
-			byte((v>>49)&0x7f|0x80),
 
-			byte(v>>56))
 
-	default:
 
-		b = append(b,
 
-			byte(v&0x7f|0x80),
 
-			byte((v>>7)&0x7f|0x80),
 
-			byte((v>>14)&0x7f|0x80),
 
-			byte((v>>21)&0x7f|0x80),
 
-			byte((v>>28)&0x7f|0x80),
 
-			byte((v>>35)&0x7f|0x80),
 
-			byte((v>>42)&0x7f|0x80),
 
-			byte((v>>49)&0x7f|0x80),
 
-			byte((v>>56)&0x7f|0x80),
 
-			1)
 
-	}
 
-	return b
 
-}
 
-
 
-func appendFixed32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint32()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, v)
 
-	return b, nil
 
-}
 
-func appendFixed32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint32()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, v)
 
-	return b, nil
 
-}
 
-func appendFixed32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toUint32Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, *p)
 
-	return b, nil
 
-}
 
-func appendFixed32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint32Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendFixed32(b, v)
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixed32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint32Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(4*len(s)))
 
-	for _, v := range s {
 
-		b = appendFixed32(b, v)
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixedS32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt32()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, uint32(v))
 
-	return b, nil
 
-}
 
-func appendFixedS32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt32()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, uint32(v))
 
-	return b, nil
 
-}
 
-func appendFixedS32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := ptr.getInt32Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, uint32(*p))
 
-	return b, nil
 
-}
 
-func appendFixedS32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := ptr.getInt32Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendFixed32(b, uint32(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixedS32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := ptr.getInt32Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(4*len(s)))
 
-	for _, v := range s {
 
-		b = appendFixed32(b, uint32(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFloat32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := math.Float32bits(*ptr.toFloat32())
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, v)
 
-	return b, nil
 
-}
 
-func appendFloat32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := math.Float32bits(*ptr.toFloat32())
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, v)
 
-	return b, nil
 
-}
 
-func appendFloat32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toFloat32Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed32(b, math.Float32bits(*p))
 
-	return b, nil
 
-}
 
-func appendFloat32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toFloat32Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendFixed32(b, math.Float32bits(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFloat32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toFloat32Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(4*len(s)))
 
-	for _, v := range s {
 
-		b = appendFixed32(b, math.Float32bits(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixed64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint64()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, v)
 
-	return b, nil
 
-}
 
-func appendFixed64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint64()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, v)
 
-	return b, nil
 
-}
 
-func appendFixed64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toUint64Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, *p)
 
-	return b, nil
 
-}
 
-func appendFixed64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint64Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendFixed64(b, v)
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixed64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint64Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(8*len(s)))
 
-	for _, v := range s {
 
-		b = appendFixed64(b, v)
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixedS64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt64()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendFixedS64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt64()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendFixedS64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toInt64Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, uint64(*p))
 
-	return b, nil
 
-}
 
-func appendFixedS64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toInt64Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendFixed64(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFixedS64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toInt64Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(8*len(s)))
 
-	for _, v := range s {
 
-		b = appendFixed64(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFloat64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := math.Float64bits(*ptr.toFloat64())
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, v)
 
-	return b, nil
 
-}
 
-func appendFloat64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := math.Float64bits(*ptr.toFloat64())
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, v)
 
-	return b, nil
 
-}
 
-func appendFloat64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toFloat64Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendFixed64(b, math.Float64bits(*p))
 
-	return b, nil
 
-}
 
-func appendFloat64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toFloat64Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendFixed64(b, math.Float64bits(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendFloat64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toFloat64Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(8*len(s)))
 
-	for _, v := range s {
 
-		b = appendFixed64(b, math.Float64bits(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarint32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint32()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendVarint32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint32()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendVarint32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toUint32Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(*p))
 
-	return b, nil
 
-}
 
-func appendVarint32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint32Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarint32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint32Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	// compute size
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v))
 
-	}
 
-	b = appendVarint(b, uint64(n))
 
-	for _, v := range s {
 
-		b = appendVarint(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarintS32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt32()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendVarintS32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt32()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendVarintS32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := ptr.getInt32Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(*p))
 
-	return b, nil
 
-}
 
-func appendVarintS32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := ptr.getInt32Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarintS32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := ptr.getInt32Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	// compute size
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v))
 
-	}
 
-	b = appendVarint(b, uint64(n))
 
-	for _, v := range s {
 
-		b = appendVarint(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarint64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint64()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, v)
 
-	return b, nil
 
-}
 
-func appendVarint64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toUint64()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, v)
 
-	return b, nil
 
-}
 
-func appendVarint64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toUint64Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, *p)
 
-	return b, nil
 
-}
 
-func appendVarint64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint64Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, v)
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarint64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toUint64Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	// compute size
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(v)
 
-	}
 
-	b = appendVarint(b, uint64(n))
 
-	for _, v := range s {
 
-		b = appendVarint(b, v)
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarintS64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt64()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendVarintS64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt64()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v))
 
-	return b, nil
 
-}
 
-func appendVarintS64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toInt64Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(*p))
 
-	return b, nil
 
-}
 
-func appendVarintS64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toInt64Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendVarintS64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toInt64Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	// compute size
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v))
 
-	}
 
-	b = appendVarint(b, uint64(n))
 
-	for _, v := range s {
 
-		b = appendVarint(b, uint64(v))
 
-	}
 
-	return b, nil
 
-}
 
-func appendZigzag32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt32()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
 
-	return b, nil
 
-}
 
-func appendZigzag32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt32()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
 
-	return b, nil
 
-}
 
-func appendZigzag32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := ptr.getInt32Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	v := *p
 
-	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
 
-	return b, nil
 
-}
 
-func appendZigzag32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := ptr.getInt32Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
 
-	}
 
-	return b, nil
 
-}
 
-func appendZigzag32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := ptr.getInt32Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	// compute size
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
 
-	}
 
-	b = appendVarint(b, uint64(n))
 
-	for _, v := range s {
 
-		b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
 
-	}
 
-	return b, nil
 
-}
 
-func appendZigzag64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt64()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
 
-	return b, nil
 
-}
 
-func appendZigzag64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toInt64()
 
-	if v == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
 
-	return b, nil
 
-}
 
-func appendZigzag64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toInt64Ptr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	v := *p
 
-	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
 
-	return b, nil
 
-}
 
-func appendZigzag64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toInt64Slice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
 
-	}
 
-	return b, nil
 
-}
 
-func appendZigzag64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toInt64Slice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	// compute size
 
-	n := 0
 
-	for _, v := range s {
 
-		n += SizeVarint(uint64(v<<1) ^ uint64((int64(v) >> 63)))
 
-	}
 
-	b = appendVarint(b, uint64(n))
 
-	for _, v := range s {
 
-		b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
 
-	}
 
-	return b, nil
 
-}
 
-func appendBoolValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toBool()
 
-	b = appendVarint(b, wiretag)
 
-	if v {
 
-		b = append(b, 1)
 
-	} else {
 
-		b = append(b, 0)
 
-	}
 
-	return b, nil
 
-}
 
-func appendBoolValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toBool()
 
-	if !v {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = append(b, 1)
 
-	return b, nil
 
-}
 
-
 
-func appendBoolPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toBoolPtr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	if *p {
 
-		b = append(b, 1)
 
-	} else {
 
-		b = append(b, 0)
 
-	}
 
-	return b, nil
 
-}
 
-func appendBoolSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toBoolSlice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		if v {
 
-			b = append(b, 1)
 
-		} else {
 
-			b = append(b, 0)
 
-		}
 
-	}
 
-	return b, nil
 
-}
 
-func appendBoolPackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toBoolSlice()
 
-	if len(s) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag&^7|WireBytes)
 
-	b = appendVarint(b, uint64(len(s)))
 
-	for _, v := range s {
 
-		if v {
 
-			b = append(b, 1)
 
-		} else {
 
-			b = append(b, 0)
 
-		}
 
-	}
 
-	return b, nil
 
-}
 
-func appendStringValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toString()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	return b, nil
 
-}
 
-func appendStringValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toString()
 
-	if v == "" {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	return b, nil
 
-}
 
-func appendStringPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	p := *ptr.toStringPtr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	v := *p
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	return b, nil
 
-}
 
-func appendStringSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toStringSlice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(len(v)))
 
-		b = append(b, v...)
 
-	}
 
-	return b, nil
 
-}
 
-func appendUTF8StringValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	var invalidUTF8 bool
 
-	v := *ptr.toString()
 
-	if !utf8.ValidString(v) {
 
-		invalidUTF8 = true
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	if invalidUTF8 {
 
-		return b, errInvalidUTF8
 
-	}
 
-	return b, nil
 
-}
 
-func appendUTF8StringValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	var invalidUTF8 bool
 
-	v := *ptr.toString()
 
-	if v == "" {
 
-		return b, nil
 
-	}
 
-	if !utf8.ValidString(v) {
 
-		invalidUTF8 = true
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	if invalidUTF8 {
 
-		return b, errInvalidUTF8
 
-	}
 
-	return b, nil
 
-}
 
-func appendUTF8StringPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	var invalidUTF8 bool
 
-	p := *ptr.toStringPtr()
 
-	if p == nil {
 
-		return b, nil
 
-	}
 
-	v := *p
 
-	if !utf8.ValidString(v) {
 
-		invalidUTF8 = true
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	if invalidUTF8 {
 
-		return b, errInvalidUTF8
 
-	}
 
-	return b, nil
 
-}
 
-func appendUTF8StringSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	var invalidUTF8 bool
 
-	s := *ptr.toStringSlice()
 
-	for _, v := range s {
 
-		if !utf8.ValidString(v) {
 
-			invalidUTF8 = true
 
-		}
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(len(v)))
 
-		b = append(b, v...)
 
-	}
 
-	if invalidUTF8 {
 
-		return b, errInvalidUTF8
 
-	}
 
-	return b, nil
 
-}
 
-func appendBytes(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toBytes()
 
-	if v == nil {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	return b, nil
 
-}
 
-func appendBytes3(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toBytes()
 
-	if len(v) == 0 {
 
-		return b, nil
 
-	}
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	return b, nil
 
-}
 
-func appendBytesOneof(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	v := *ptr.toBytes()
 
-	b = appendVarint(b, wiretag)
 
-	b = appendVarint(b, uint64(len(v)))
 
-	b = append(b, v...)
 
-	return b, nil
 
-}
 
-func appendBytesSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
 
-	s := *ptr.toBytesSlice()
 
-	for _, v := range s {
 
-		b = appendVarint(b, wiretag)
 
-		b = appendVarint(b, uint64(len(v)))
 
-		b = append(b, v...)
 
-	}
 
-	return b, nil
 
-}
 
-
 
-// makeGroupMarshaler returns the sizer and marshaler for a group.
 
-// u is the marshal info of the underlying message.
 
-func makeGroupMarshaler(u *marshalInfo) (sizer, marshaler) {
 
-	return func(ptr pointer, tagsize int) int {
 
-			p := ptr.getPointer()
 
-			if p.isNil() {
 
-				return 0
 
-			}
 
-			return u.size(p) + 2*tagsize
 
-		},
 
-		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
 
-			p := ptr.getPointer()
 
-			if p.isNil() {
 
-				return b, nil
 
-			}
 
-			var err error
 
-			b = appendVarint(b, wiretag) // start group
 
-			b, err = u.marshal(b, p, deterministic)
 
-			b = appendVarint(b, wiretag+(WireEndGroup-WireStartGroup)) // end group
 
-			return b, err
 
-		}
 
-}
 
-
 
-// makeGroupSliceMarshaler returns the sizer and marshaler for a group slice.
 
-// u is the marshal info of the underlying message.
 
-func makeGroupSliceMarshaler(u *marshalInfo) (sizer, marshaler) {
 
-	return func(ptr pointer, tagsize int) int {
 
-			s := ptr.getPointerSlice()
 
-			n := 0
 
-			for _, v := range s {
 
-				if v.isNil() {
 
-					continue
 
-				}
 
-				n += u.size(v) + 2*tagsize
 
-			}
 
-			return n
 
-		},
 
-		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
 
-			s := ptr.getPointerSlice()
 
-			var err error
 
-			var nerr nonFatal
 
-			for _, v := range s {
 
-				if v.isNil() {
 
-					return b, errRepeatedHasNil
 
-				}
 
-				b = appendVarint(b, wiretag) // start group
 
-				b, err = u.marshal(b, v, deterministic)
 
-				b = appendVarint(b, wiretag+(WireEndGroup-WireStartGroup)) // end group
 
-				if !nerr.Merge(err) {
 
-					if err == ErrNil {
 
-						err = errRepeatedHasNil
 
-					}
 
-					return b, err
 
-				}
 
-			}
 
-			return b, nerr.E
 
-		}
 
-}
 
-
 
-// makeMessageMarshaler returns the sizer and marshaler for a message field.
 
-// u is the marshal info of the message.
 
-func makeMessageMarshaler(u *marshalInfo) (sizer, marshaler) {
 
-	return func(ptr pointer, tagsize int) int {
 
-			p := ptr.getPointer()
 
-			if p.isNil() {
 
-				return 0
 
-			}
 
-			siz := u.size(p)
 
-			return siz + SizeVarint(uint64(siz)) + tagsize
 
-		},
 
-		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
 
-			p := ptr.getPointer()
 
-			if p.isNil() {
 
-				return b, nil
 
-			}
 
-			b = appendVarint(b, wiretag)
 
-			siz := u.cachedsize(p)
 
-			b = appendVarint(b, uint64(siz))
 
-			return u.marshal(b, p, deterministic)
 
-		}
 
-}
 
-
 
-// makeMessageSliceMarshaler returns the sizer and marshaler for a message slice.
 
-// u is the marshal info of the message.
 
-func makeMessageSliceMarshaler(u *marshalInfo) (sizer, marshaler) {
 
-	return func(ptr pointer, tagsize int) int {
 
-			s := ptr.getPointerSlice()
 
-			n := 0
 
-			for _, v := range s {
 
-				if v.isNil() {
 
-					continue
 
-				}
 
-				siz := u.size(v)
 
-				n += siz + SizeVarint(uint64(siz)) + tagsize
 
-			}
 
-			return n
 
-		},
 
-		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
 
-			s := ptr.getPointerSlice()
 
-			var err error
 
-			var nerr nonFatal
 
-			for _, v := range s {
 
-				if v.isNil() {
 
-					return b, errRepeatedHasNil
 
-				}
 
-				b = appendVarint(b, wiretag)
 
-				siz := u.cachedsize(v)
 
-				b = appendVarint(b, uint64(siz))
 
-				b, err = u.marshal(b, v, deterministic)
 
-
 
-				if !nerr.Merge(err) {
 
-					if err == ErrNil {
 
-						err = errRepeatedHasNil
 
-					}
 
-					return b, err
 
-				}
 
-			}
 
-			return b, nerr.E
 
-		}
 
-}
 
-
 
-// makeMapMarshaler returns the sizer and marshaler for a map field.
 
-// f is the pointer to the reflect data structure of the field.
 
-func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) {
 
-	// figure out key and value type
 
-	t := f.Type
 
-	keyType := t.Key()
 
-	valType := t.Elem()
 
-	keyTags := strings.Split(f.Tag.Get("protobuf_key"), ",")
 
-	valTags := strings.Split(f.Tag.Get("protobuf_val"), ",")
 
-	keySizer, keyMarshaler := typeMarshaler(keyType, keyTags, false, false) // don't omit zero value in map
 
-	valSizer, valMarshaler := typeMarshaler(valType, valTags, false, false) // don't omit zero value in map
 
-	keyWireTag := 1<<3 | wiretype(keyTags[0])
 
-	valWireTag := 2<<3 | wiretype(valTags[0])
 
-
 
-	// We create an interface to get the addresses of the map key and value.
 
-	// If value is pointer-typed, the interface is a direct interface, the
 
-	// idata itself is the value. Otherwise, the idata is the pointer to the
 
-	// value.
 
-	// Key cannot be pointer-typed.
 
-	valIsPtr := valType.Kind() == reflect.Ptr
 
-
 
-	// If value is a message with nested maps, calling
 
-	// valSizer in marshal may be quadratic. We should use
 
-	// cached version in marshal (but not in size).
 
-	// If value is not message type, we don't have size cache,
 
-	// but it cannot be nested either. Just use valSizer.
 
-	valCachedSizer := valSizer
 
-	if valIsPtr && valType.Elem().Kind() == reflect.Struct {
 
-		u := getMarshalInfo(valType.Elem())
 
-		valCachedSizer = func(ptr pointer, tagsize int) int {
 
-			// Same as message sizer, but use cache.
 
-			p := ptr.getPointer()
 
-			if p.isNil() {
 
-				return 0
 
-			}
 
-			siz := u.cachedsize(p)
 
-			return siz + SizeVarint(uint64(siz)) + tagsize
 
-		}
 
-	}
 
-	return func(ptr pointer, tagsize int) int {
 
-			m := ptr.asPointerTo(t).Elem() // the map
 
-			n := 0
 
-			for _, k := range m.MapKeys() {
 
-				ki := k.Interface()
 
-				vi := m.MapIndex(k).Interface()
 
-				kaddr := toAddrPointer(&ki, false, false)      // pointer to key
 
-				vaddr := toAddrPointer(&vi, valIsPtr, false)   // pointer to value
 
-				siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
 
-				n += siz + SizeVarint(uint64(siz)) + tagsize
 
-			}
 
-			return n
 
-		},
 
-		func(b []byte, ptr pointer, tag uint64, deterministic bool) ([]byte, error) {
 
-			m := ptr.asPointerTo(t).Elem() // the map
 
-			var err error
 
-			keys := m.MapKeys()
 
-			if len(keys) > 1 && deterministic {
 
-				sort.Sort(mapKeys(keys))
 
-			}
 
-
 
-			var nerr nonFatal
 
-			for _, k := range keys {
 
-				ki := k.Interface()
 
-				vi := m.MapIndex(k).Interface()
 
-				kaddr := toAddrPointer(&ki, false, false)    // pointer to key
 
-				vaddr := toAddrPointer(&vi, valIsPtr, false) // pointer to value
 
-				b = appendVarint(b, tag)
 
-				siz := keySizer(kaddr, 1) + valCachedSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
 
-				b = appendVarint(b, uint64(siz))
 
-				b, err = keyMarshaler(b, kaddr, keyWireTag, deterministic)
 
-				if !nerr.Merge(err) {
 
-					return b, err
 
-				}
 
-				b, err = valMarshaler(b, vaddr, valWireTag, deterministic)
 
-				if err != ErrNil && !nerr.Merge(err) { // allow nil value in map
 
-					return b, err
 
-				}
 
-			}
 
-			return b, nerr.E
 
-		}
 
-}
 
-
 
-// makeOneOfMarshaler returns the sizer and marshaler for a oneof field.
 
-// fi is the marshal info of the field.
 
-// f is the pointer to the reflect data structure of the field.
 
-func makeOneOfMarshaler(fi *marshalFieldInfo, f *reflect.StructField) (sizer, marshaler) {
 
-	// Oneof field is an interface. We need to get the actual data type on the fly.
 
-	t := f.Type
 
-	return func(ptr pointer, _ int) int {
 
-			p := ptr.getInterfacePointer()
 
-			if p.isNil() {
 
-				return 0
 
-			}
 
-			v := ptr.asPointerTo(t).Elem().Elem().Elem() // *interface -> interface -> *struct -> struct
 
-			telem := v.Type()
 
-			e := fi.oneofElems[telem]
 
-			return e.sizer(p, e.tagsize)
 
-		},
 
-		func(b []byte, ptr pointer, _ uint64, deterministic bool) ([]byte, error) {
 
-			p := ptr.getInterfacePointer()
 
-			if p.isNil() {
 
-				return b, nil
 
-			}
 
-			v := ptr.asPointerTo(t).Elem().Elem().Elem() // *interface -> interface -> *struct -> struct
 
-			telem := v.Type()
 
-			if telem.Field(0).Type.Kind() == reflect.Ptr && p.getPointer().isNil() {
 
-				return b, errOneofHasNil
 
-			}
 
-			e := fi.oneofElems[telem]
 
-			return e.marshaler(b, p, e.wiretag, deterministic)
 
-		}
 
-}
 
-
 
-// sizeExtensions computes the size of encoded data for a XXX_InternalExtensions field.
 
-func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int {
 
-	m, mu := ext.extensionsRead()
 
-	if m == nil {
 
-		return 0
 
-	}
 
-	mu.Lock()
 
-
 
-	n := 0
 
-	for _, e := range m {
 
-		if e.value == nil || e.desc == nil {
 
-			// Extension is only in its encoded form.
 
-			n += len(e.enc)
 
-			continue
 
-		}
 
-
 
-		// We don't skip extensions that have an encoded form set,
 
-		// because the extension value may have been mutated after
 
-		// the last time this function was called.
 
-		ei := u.getExtElemInfo(e.desc)
 
-		v := e.value
 
-		p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-		n += ei.sizer(p, ei.tagsize)
 
-	}
 
-	mu.Unlock()
 
-	return n
 
-}
 
-
 
-// appendExtensions marshals a XXX_InternalExtensions field to the end of byte slice b.
 
-func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
 
-	m, mu := ext.extensionsRead()
 
-	if m == nil {
 
-		return b, nil
 
-	}
 
-	mu.Lock()
 
-	defer mu.Unlock()
 
-
 
-	var err error
 
-	var nerr nonFatal
 
-
 
-	// Fast-path for common cases: zero or one extensions.
 
-	// Don't bother sorting the keys.
 
-	if len(m) <= 1 {
 
-		for _, e := range m {
 
-			if e.value == nil || e.desc == nil {
 
-				// Extension is only in its encoded form.
 
-				b = append(b, e.enc...)
 
-				continue
 
-			}
 
-
 
-			// We don't skip extensions that have an encoded form set,
 
-			// because the extension value may have been mutated after
 
-			// the last time this function was called.
 
-
 
-			ei := u.getExtElemInfo(e.desc)
 
-			v := e.value
 
-			p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-			b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
 
-			if !nerr.Merge(err) {
 
-				return b, err
 
-			}
 
-		}
 
-		return b, nerr.E
 
-	}
 
-
 
-	// Sort the keys to provide a deterministic encoding.
 
-	// Not sure this is required, but the old code does it.
 
-	keys := make([]int, 0, len(m))
 
-	for k := range m {
 
-		keys = append(keys, int(k))
 
-	}
 
-	sort.Ints(keys)
 
-
 
-	for _, k := range keys {
 
-		e := m[int32(k)]
 
-		if e.value == nil || e.desc == nil {
 
-			// Extension is only in its encoded form.
 
-			b = append(b, e.enc...)
 
-			continue
 
-		}
 
-
 
-		// We don't skip extensions that have an encoded form set,
 
-		// because the extension value may have been mutated after
 
-		// the last time this function was called.
 
-
 
-		ei := u.getExtElemInfo(e.desc)
 
-		v := e.value
 
-		p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
 
-		if !nerr.Merge(err) {
 
-			return b, err
 
-		}
 
-	}
 
-	return b, nerr.E
 
-}
 
-
 
-// message set format is:
 
-//   message MessageSet {
 
-//     repeated group Item = 1 {
 
-//       required int32 type_id = 2;
 
-//       required string message = 3;
 
-//     };
 
-//   }
 
-
 
-// sizeMessageSet computes the size of encoded data for a XXX_InternalExtensions field
 
-// in message set format (above).
 
-func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int {
 
-	m, mu := ext.extensionsRead()
 
-	if m == nil {
 
-		return 0
 
-	}
 
-	mu.Lock()
 
-
 
-	n := 0
 
-	for id, e := range m {
 
-		n += 2                          // start group, end group. tag = 1 (size=1)
 
-		n += SizeVarint(uint64(id)) + 1 // type_id, tag = 2 (size=1)
 
-
 
-		if e.value == nil || e.desc == nil {
 
-			// Extension is only in its encoded form.
 
-			msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
 
-			siz := len(msgWithLen)
 
-			n += siz + 1 // message, tag = 3 (size=1)
 
-			continue
 
-		}
 
-
 
-		// We don't skip extensions that have an encoded form set,
 
-		// because the extension value may have been mutated after
 
-		// the last time this function was called.
 
-
 
-		ei := u.getExtElemInfo(e.desc)
 
-		v := e.value
 
-		p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-		n += ei.sizer(p, 1) // message, tag = 3 (size=1)
 
-	}
 
-	mu.Unlock()
 
-	return n
 
-}
 
-
 
-// appendMessageSet marshals a XXX_InternalExtensions field in message set format (above)
 
-// to the end of byte slice b.
 
-func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
 
-	m, mu := ext.extensionsRead()
 
-	if m == nil {
 
-		return b, nil
 
-	}
 
-	mu.Lock()
 
-	defer mu.Unlock()
 
-
 
-	var err error
 
-	var nerr nonFatal
 
-
 
-	// Fast-path for common cases: zero or one extensions.
 
-	// Don't bother sorting the keys.
 
-	if len(m) <= 1 {
 
-		for id, e := range m {
 
-			b = append(b, 1<<3|WireStartGroup)
 
-			b = append(b, 2<<3|WireVarint)
 
-			b = appendVarint(b, uint64(id))
 
-
 
-			if e.value == nil || e.desc == nil {
 
-				// Extension is only in its encoded form.
 
-				msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
 
-				b = append(b, 3<<3|WireBytes)
 
-				b = append(b, msgWithLen...)
 
-				b = append(b, 1<<3|WireEndGroup)
 
-				continue
 
-			}
 
-
 
-			// We don't skip extensions that have an encoded form set,
 
-			// because the extension value may have been mutated after
 
-			// the last time this function was called.
 
-
 
-			ei := u.getExtElemInfo(e.desc)
 
-			v := e.value
 
-			p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-			b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
 
-			if !nerr.Merge(err) {
 
-				return b, err
 
-			}
 
-			b = append(b, 1<<3|WireEndGroup)
 
-		}
 
-		return b, nerr.E
 
-	}
 
-
 
-	// Sort the keys to provide a deterministic encoding.
 
-	keys := make([]int, 0, len(m))
 
-	for k := range m {
 
-		keys = append(keys, int(k))
 
-	}
 
-	sort.Ints(keys)
 
-
 
-	for _, id := range keys {
 
-		e := m[int32(id)]
 
-		b = append(b, 1<<3|WireStartGroup)
 
-		b = append(b, 2<<3|WireVarint)
 
-		b = appendVarint(b, uint64(id))
 
-
 
-		if e.value == nil || e.desc == nil {
 
-			// Extension is only in its encoded form.
 
-			msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
 
-			b = append(b, 3<<3|WireBytes)
 
-			b = append(b, msgWithLen...)
 
-			b = append(b, 1<<3|WireEndGroup)
 
-			continue
 
-		}
 
-
 
-		// We don't skip extensions that have an encoded form set,
 
-		// because the extension value may have been mutated after
 
-		// the last time this function was called.
 
-
 
-		ei := u.getExtElemInfo(e.desc)
 
-		v := e.value
 
-		p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-		b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
 
-		b = append(b, 1<<3|WireEndGroup)
 
-		if !nerr.Merge(err) {
 
-			return b, err
 
-		}
 
-	}
 
-	return b, nerr.E
 
-}
 
-
 
-// sizeV1Extensions computes the size of encoded data for a V1-API extension field.
 
-func (u *marshalInfo) sizeV1Extensions(m map[int32]Extension) int {
 
-	if m == nil {
 
-		return 0
 
-	}
 
-
 
-	n := 0
 
-	for _, e := range m {
 
-		if e.value == nil || e.desc == nil {
 
-			// Extension is only in its encoded form.
 
-			n += len(e.enc)
 
-			continue
 
-		}
 
-
 
-		// We don't skip extensions that have an encoded form set,
 
-		// because the extension value may have been mutated after
 
-		// the last time this function was called.
 
-
 
-		ei := u.getExtElemInfo(e.desc)
 
-		v := e.value
 
-		p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-		n += ei.sizer(p, ei.tagsize)
 
-	}
 
-	return n
 
-}
 
-
 
-// appendV1Extensions marshals a V1-API extension field to the end of byte slice b.
 
-func (u *marshalInfo) appendV1Extensions(b []byte, m map[int32]Extension, deterministic bool) ([]byte, error) {
 
-	if m == nil {
 
-		return b, nil
 
-	}
 
-
 
-	// Sort the keys to provide a deterministic encoding.
 
-	keys := make([]int, 0, len(m))
 
-	for k := range m {
 
-		keys = append(keys, int(k))
 
-	}
 
-	sort.Ints(keys)
 
-
 
-	var err error
 
-	var nerr nonFatal
 
-	for _, k := range keys {
 
-		e := m[int32(k)]
 
-		if e.value == nil || e.desc == nil {
 
-			// Extension is only in its encoded form.
 
-			b = append(b, e.enc...)
 
-			continue
 
-		}
 
-
 
-		// We don't skip extensions that have an encoded form set,
 
-		// because the extension value may have been mutated after
 
-		// the last time this function was called.
 
-
 
-		ei := u.getExtElemInfo(e.desc)
 
-		v := e.value
 
-		p := toAddrPointer(&v, ei.isptr, ei.deref)
 
-		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
 
-		if !nerr.Merge(err) {
 
-			return b, err
 
-		}
 
-	}
 
-	return b, nerr.E
 
-}
 
-
 
-// newMarshaler is the interface representing objects that can marshal themselves.
 
-//
 
-// This exists to support protoc-gen-go generated messages.
 
-// The proto package will stop type-asserting to this interface in the future.
 
-//
 
-// DO NOT DEPEND ON THIS.
 
-type newMarshaler interface {
 
-	XXX_Size() int
 
-	XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
 
-}
 
-
 
-// Size returns the encoded size of a protocol buffer message.
 
-// This is the main entry point.
 
-func Size(pb Message) int {
 
-	if m, ok := pb.(newMarshaler); ok {
 
-		return m.XXX_Size()
 
-	}
 
-	if m, ok := pb.(Marshaler); ok {
 
-		// If the message can marshal itself, let it do it, for compatibility.
 
-		// NOTE: This is not efficient.
 
-		b, _ := m.Marshal()
 
-		return len(b)
 
-	}
 
-	// in case somehow we didn't generate the wrapper
 
-	if pb == nil {
 
-		return 0
 
-	}
 
-	var info InternalMessageInfo
 
-	return info.Size(pb)
 
-}
 
-
 
-// Marshal takes a protocol buffer message
 
-// and encodes it into the wire format, returning the data.
 
-// This is the main entry point.
 
-func Marshal(pb Message) ([]byte, error) {
 
-	if m, ok := pb.(newMarshaler); ok {
 
-		siz := m.XXX_Size()
 
-		b := make([]byte, 0, siz)
 
-		return m.XXX_Marshal(b, false)
 
-	}
 
-	if m, ok := pb.(Marshaler); ok {
 
-		// If the message can marshal itself, let it do it, for compatibility.
 
-		// NOTE: This is not efficient.
 
-		return m.Marshal()
 
-	}
 
-	// in case somehow we didn't generate the wrapper
 
-	if pb == nil {
 
-		return nil, ErrNil
 
-	}
 
-	var info InternalMessageInfo
 
-	siz := info.Size(pb)
 
-	b := make([]byte, 0, siz)
 
-	return info.Marshal(b, pb, false)
 
-}
 
-
 
-// Marshal takes a protocol buffer message
 
-// and encodes it into the wire format, writing the result to the
 
-// Buffer.
 
-// This is an alternative entry point. It is not necessary to use
 
-// a Buffer for most applications.
 
-func (p *Buffer) Marshal(pb Message) error {
 
-	var err error
 
-	if m, ok := pb.(newMarshaler); ok {
 
-		siz := m.XXX_Size()
 
-		p.grow(siz) // make sure buf has enough capacity
 
-		p.buf, err = m.XXX_Marshal(p.buf, p.deterministic)
 
-		return err
 
-	}
 
-	if m, ok := pb.(Marshaler); ok {
 
-		// If the message can marshal itself, let it do it, for compatibility.
 
-		// NOTE: This is not efficient.
 
-		b, err := m.Marshal()
 
-		p.buf = append(p.buf, b...)
 
-		return err
 
-	}
 
-	// in case somehow we didn't generate the wrapper
 
-	if pb == nil {
 
-		return ErrNil
 
-	}
 
-	var info InternalMessageInfo
 
-	siz := info.Size(pb)
 
-	p.grow(siz) // make sure buf has enough capacity
 
-	p.buf, err = info.Marshal(p.buf, pb, p.deterministic)
 
-	return err
 
-}
 
-
 
-// grow grows the buffer's capacity, if necessary, to guarantee space for
 
-// another n bytes. After grow(n), at least n bytes can be written to the
 
-// buffer without another allocation.
 
-func (p *Buffer) grow(n int) {
 
-	need := len(p.buf) + n
 
-	if need <= cap(p.buf) {
 
-		return
 
-	}
 
-	newCap := len(p.buf) * 2
 
-	if newCap < need {
 
-		newCap = need
 
-	}
 
-	p.buf = append(make([]byte, 0, newCap), p.buf...)
 
-}

+ 0 - 654
vendor/github.com/golang/protobuf/proto/table_merge.go
Просмотреть файл 

@@ -1,654 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2016 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-import (
 
-	"fmt"
 
-	"reflect"
 
-	"strings"
 
-	"sync"
 
-	"sync/atomic"
 
-)
 
-
 
-// Merge merges the src message into dst.
 
-// This assumes that dst and src of the same type and are non-nil.
 
-func (a *InternalMessageInfo) Merge(dst, src Message) {
 
-	mi := atomicLoadMergeInfo(&a.merge)
 
-	if mi == nil {
 
-		mi = getMergeInfo(reflect.TypeOf(dst).Elem())
 
-		atomicStoreMergeInfo(&a.merge, mi)
 
-	}
 
-	mi.merge(toPointer(&dst), toPointer(&src))
 
-}
 
-
 
-type mergeInfo struct {
 
-	typ reflect.Type
 
-
 
-	initialized int32 // 0: only typ is valid, 1: everything is valid
 
-	lock        sync.Mutex
 
-
 
-	fields       []mergeFieldInfo
 
-	unrecognized field // Offset of XXX_unrecognized
 
-}
 
-
 
-type mergeFieldInfo struct {
 
-	field field // Offset of field, guaranteed to be valid
 
-
 
-	// isPointer reports whether the value in the field is a pointer.
 
-	// This is true for the following situations:
 
-	//	* Pointer to struct
 
-	//	* Pointer to basic type (proto2 only)
 
-	//	* Slice (first value in slice header is a pointer)
 
-	//	* String (first value in string header is a pointer)
 
-	isPointer bool
 
-
 
-	// basicWidth reports the width of the field assuming that it is directly
 
-	// embedded in the struct (as is the case for basic types in proto3).
 
-	// The possible values are:
 
-	// 	0: invalid
 
-	//	1: bool
 
-	//	4: int32, uint32, float32
 
-	//	8: int64, uint64, float64
 
-	basicWidth int
 
-
 
-	// Where dst and src are pointers to the types being merged.
 
-	merge func(dst, src pointer)
 
-}
 
-
 
-var (
 
-	mergeInfoMap  = map[reflect.Type]*mergeInfo{}
 
-	mergeInfoLock sync.Mutex
 
-)
 
-
 
-func getMergeInfo(t reflect.Type) *mergeInfo {
 
-	mergeInfoLock.Lock()
 
-	defer mergeInfoLock.Unlock()
 
-	mi := mergeInfoMap[t]
 
-	if mi == nil {
 
-		mi = &mergeInfo{typ: t}
 
-		mergeInfoMap[t] = mi
 
-	}
 
-	return mi
 
-}
 
-
 
-// merge merges src into dst assuming they are both of type *mi.typ.
 
-func (mi *mergeInfo) merge(dst, src pointer) {
 
-	if dst.isNil() {
 
-		panic("proto: nil destination")
 
-	}
 
-	if src.isNil() {
 
-		return // Nothing to do.
 
-	}
 
-
 
-	if atomic.LoadInt32(&mi.initialized) == 0 {
 
-		mi.computeMergeInfo()
 
-	}
 
-
 
-	for _, fi := range mi.fields {
 
-		sfp := src.offset(fi.field)
 
-
 
-		// As an optimization, we can avoid the merge function call cost
 
-		// if we know for sure that the source will have no effect
 
-		// by checking if it is the zero value.
 
-		if unsafeAllowed {
 
-			if fi.isPointer && sfp.getPointer().isNil() { // Could be slice or string
 
-				continue
 
-			}
 
-			if fi.basicWidth > 0 {
 
-				switch {
 
-				case fi.basicWidth == 1 && !*sfp.toBool():
 
-					continue
 
-				case fi.basicWidth == 4 && *sfp.toUint32() == 0:
 
-					continue
 
-				case fi.basicWidth == 8 && *sfp.toUint64() == 0:
 
-					continue
 
-				}
 
-			}
 
-		}
 
-
 
-		dfp := dst.offset(fi.field)
 
-		fi.merge(dfp, sfp)
 
-	}
 
-
 
-	// TODO: Make this faster?
 
-	out := dst.asPointerTo(mi.typ).Elem()
 
-	in := src.asPointerTo(mi.typ).Elem()
 
-	if emIn, err := extendable(in.Addr().Interface()); err == nil {
 
-		emOut, _ := extendable(out.Addr().Interface())
 
-		mIn, muIn := emIn.extensionsRead()
 
-		if mIn != nil {
 
-			mOut := emOut.extensionsWrite()
 
-			muIn.Lock()
 
-			mergeExtension(mOut, mIn)
 
-			muIn.Unlock()
 
-		}
 
-	}
 
-
 
-	if mi.unrecognized.IsValid() {
 
-		if b := *src.offset(mi.unrecognized).toBytes(); len(b) > 0 {
 
-			*dst.offset(mi.unrecognized).toBytes() = append([]byte(nil), b...)
 
-		}
 
-	}
 
-}
 
-
 
-func (mi *mergeInfo) computeMergeInfo() {
 
-	mi.lock.Lock()
 
-	defer mi.lock.Unlock()
 
-	if mi.initialized != 0 {
 
-		return
 
-	}
 
-	t := mi.typ
 
-	n := t.NumField()
 
-
 
-	props := GetProperties(t)
 
-	for i := 0; i < n; i++ {
 
-		f := t.Field(i)
 
-		if strings.HasPrefix(f.Name, "XXX_") {
 
-			continue
 
-		}
 
-
 
-		mfi := mergeFieldInfo{field: toField(&f)}
 
-		tf := f.Type
 
-
 
-		// As an optimization, we can avoid the merge function call cost
 
-		// if we know for sure that the source will have no effect
 
-		// by checking if it is the zero value.
 
-		if unsafeAllowed {
 
-			switch tf.Kind() {
 
-			case reflect.Ptr, reflect.Slice, reflect.String:
 
-				// As a special case, we assume slices and strings are pointers
 
-				// since we know that the first field in the SliceSlice or
 
-				// StringHeader is a data pointer.
 
-				mfi.isPointer = true
 
-			case reflect.Bool:
 
-				mfi.basicWidth = 1
 
-			case reflect.Int32, reflect.Uint32, reflect.Float32:
 
-				mfi.basicWidth = 4
 
-			case reflect.Int64, reflect.Uint64, reflect.Float64:
 
-				mfi.basicWidth = 8
 
-			}
 
-		}
 
-
 
-		// Unwrap tf to get at its most basic type.
 
-		var isPointer, isSlice bool
 
-		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
 
-			isSlice = true
 
-			tf = tf.Elem()
 
-		}
 
-		if tf.Kind() == reflect.Ptr {
 
-			isPointer = true
 
-			tf = tf.Elem()
 
-		}
 
-		if isPointer && isSlice && tf.Kind() != reflect.Struct {
 
-			panic("both pointer and slice for basic type in " + tf.Name())
 
-		}
 
-
 
-		switch tf.Kind() {
 
-		case reflect.Int32:
 
-			switch {
 
-			case isSlice: // E.g., []int32
 
-				mfi.merge = func(dst, src pointer) {
 
-					// NOTE: toInt32Slice is not defined (see pointer_reflect.go).
 
-					/*
 
-						sfsp := src.toInt32Slice()
 
-						if *sfsp != nil {
 
-							dfsp := dst.toInt32Slice()
 
-							*dfsp = append(*dfsp, *sfsp...)
 
-							if *dfsp == nil {
 
-								*dfsp = []int64{}
 
-							}
 
-						}
 
-					*/
 
-					sfs := src.getInt32Slice()
 
-					if sfs != nil {
 
-						dfs := dst.getInt32Slice()
 
-						dfs = append(dfs, sfs...)
 
-						if dfs == nil {
 
-							dfs = []int32{}
 
-						}
 
-						dst.setInt32Slice(dfs)
 
-					}
 
-				}
 
-			case isPointer: // E.g., *int32
 
-				mfi.merge = func(dst, src pointer) {
 
-					// NOTE: toInt32Ptr is not defined (see pointer_reflect.go).
 
-					/*
 
-						sfpp := src.toInt32Ptr()
 
-						if *sfpp != nil {
 
-							dfpp := dst.toInt32Ptr()
 
-							if *dfpp == nil {
 
-								*dfpp = Int32(**sfpp)
 
-							} else {
 
-								**dfpp = **sfpp
 
-							}
 
-						}
 
-					*/
 
-					sfp := src.getInt32Ptr()
 
-					if sfp != nil {
 
-						dfp := dst.getInt32Ptr()
 
-						if dfp == nil {
 
-							dst.setInt32Ptr(*sfp)
 
-						} else {
 
-							*dfp = *sfp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., int32
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toInt32(); v != 0 {
 
-						*dst.toInt32() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Int64:
 
-			switch {
 
-			case isSlice: // E.g., []int64
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toInt64Slice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toInt64Slice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []int64{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *int64
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toInt64Ptr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toInt64Ptr()
 
-						if *dfpp == nil {
 
-							*dfpp = Int64(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., int64
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toInt64(); v != 0 {
 
-						*dst.toInt64() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Uint32:
 
-			switch {
 
-			case isSlice: // E.g., []uint32
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toUint32Slice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toUint32Slice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []uint32{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *uint32
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toUint32Ptr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toUint32Ptr()
 
-						if *dfpp == nil {
 
-							*dfpp = Uint32(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., uint32
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toUint32(); v != 0 {
 
-						*dst.toUint32() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Uint64:
 
-			switch {
 
-			case isSlice: // E.g., []uint64
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toUint64Slice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toUint64Slice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []uint64{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *uint64
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toUint64Ptr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toUint64Ptr()
 
-						if *dfpp == nil {
 
-							*dfpp = Uint64(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., uint64
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toUint64(); v != 0 {
 
-						*dst.toUint64() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Float32:
 
-			switch {
 
-			case isSlice: // E.g., []float32
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toFloat32Slice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toFloat32Slice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []float32{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *float32
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toFloat32Ptr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toFloat32Ptr()
 
-						if *dfpp == nil {
 
-							*dfpp = Float32(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., float32
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toFloat32(); v != 0 {
 
-						*dst.toFloat32() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Float64:
 
-			switch {
 
-			case isSlice: // E.g., []float64
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toFloat64Slice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toFloat64Slice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []float64{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *float64
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toFloat64Ptr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toFloat64Ptr()
 
-						if *dfpp == nil {
 
-							*dfpp = Float64(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., float64
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toFloat64(); v != 0 {
 
-						*dst.toFloat64() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Bool:
 
-			switch {
 
-			case isSlice: // E.g., []bool
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toBoolSlice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toBoolSlice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []bool{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *bool
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toBoolPtr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toBoolPtr()
 
-						if *dfpp == nil {
 
-							*dfpp = Bool(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., bool
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toBool(); v {
 
-						*dst.toBool() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.String:
 
-			switch {
 
-			case isSlice: // E.g., []string
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfsp := src.toStringSlice()
 
-					if *sfsp != nil {
 
-						dfsp := dst.toStringSlice()
 
-						*dfsp = append(*dfsp, *sfsp...)
 
-						if *dfsp == nil {
 
-							*dfsp = []string{}
 
-						}
 
-					}
 
-				}
 
-			case isPointer: // E.g., *string
 
-				mfi.merge = func(dst, src pointer) {
 
-					sfpp := src.toStringPtr()
 
-					if *sfpp != nil {
 
-						dfpp := dst.toStringPtr()
 
-						if *dfpp == nil {
 
-							*dfpp = String(**sfpp)
 
-						} else {
 
-							**dfpp = **sfpp
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., string
 
-				mfi.merge = func(dst, src pointer) {
 
-					if v := *src.toString(); v != "" {
 
-						*dst.toString() = v
 
-					}
 
-				}
 
-			}
 
-		case reflect.Slice:
 
-			isProto3 := props.Prop[i].proto3
 
-			switch {
 
-			case isPointer:
 
-				panic("bad pointer in byte slice case in " + tf.Name())
 
-			case tf.Elem().Kind() != reflect.Uint8:
 
-				panic("bad element kind in byte slice case in " + tf.Name())
 
-			case isSlice: // E.g., [][]byte
 
-				mfi.merge = func(dst, src pointer) {
 
-					sbsp := src.toBytesSlice()
 
-					if *sbsp != nil {
 
-						dbsp := dst.toBytesSlice()
 
-						for _, sb := range *sbsp {
 
-							if sb == nil {
 
-								*dbsp = append(*dbsp, nil)
 
-							} else {
 
-								*dbsp = append(*dbsp, append([]byte{}, sb...))
 
-							}
 
-						}
 
-						if *dbsp == nil {
 
-							*dbsp = [][]byte{}
 
-						}
 
-					}
 
-				}
 
-			default: // E.g., []byte
 
-				mfi.merge = func(dst, src pointer) {
 
-					sbp := src.toBytes()
 
-					if *sbp != nil {
 
-						dbp := dst.toBytes()
 
-						if !isProto3 || len(*sbp) > 0 {
 
-							*dbp = append([]byte{}, *sbp...)
 
-						}
 
-					}
 
-				}
 
-			}
 
-		case reflect.Struct:
 
-			switch {
 
-			case !isPointer:
 
-				panic(fmt.Sprintf("message field %s without pointer", tf))
 
-			case isSlice: // E.g., []*pb.T
 
-				mi := getMergeInfo(tf)
 
-				mfi.merge = func(dst, src pointer) {
 
-					sps := src.getPointerSlice()
 
-					if sps != nil {
 
-						dps := dst.getPointerSlice()
 
-						for _, sp := range sps {
 
-							var dp pointer
 
-							if !sp.isNil() {
 
-								dp = valToPointer(reflect.New(tf))
 
-								mi.merge(dp, sp)
 
-							}
 
-							dps = append(dps, dp)
 
-						}
 
-						if dps == nil {
 
-							dps = []pointer{}
 
-						}
 
-						dst.setPointerSlice(dps)
 
-					}
 
-				}
 
-			default: // E.g., *pb.T
 
-				mi := getMergeInfo(tf)
 
-				mfi.merge = func(dst, src pointer) {
 
-					sp := src.getPointer()
 
-					if !sp.isNil() {
 
-						dp := dst.getPointer()
 
-						if dp.isNil() {
 
-							dp = valToPointer(reflect.New(tf))
 
-							dst.setPointer(dp)
 
-						}
 
-						mi.merge(dp, sp)
 
-					}
 
-				}
 
-			}
 
-		case reflect.Map:
 
-			switch {
 
-			case isPointer || isSlice:
 
-				panic("bad pointer or slice in map case in " + tf.Name())
 
-			default: // E.g., map[K]V
 
-				mfi.merge = func(dst, src pointer) {
 
-					sm := src.asPointerTo(tf).Elem()
 
-					if sm.Len() == 0 {
 
-						return
 
-					}
 
-					dm := dst.asPointerTo(tf).Elem()
 
-					if dm.IsNil() {
 
-						dm.Set(reflect.MakeMap(tf))
 
-					}
 
-
 
-					switch tf.Elem().Kind() {
 
-					case reflect.Ptr: // Proto struct (e.g., *T)
 
-						for _, key := range sm.MapKeys() {
 
-							val := sm.MapIndex(key)
 
-							val = reflect.ValueOf(Clone(val.Interface().(Message)))
 
-							dm.SetMapIndex(key, val)
 
-						}
 
-					case reflect.Slice: // E.g. Bytes type (e.g., []byte)
 
-						for _, key := range sm.MapKeys() {
 
-							val := sm.MapIndex(key)
 
-							val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
 
-							dm.SetMapIndex(key, val)
 
-						}
 
-					default: // Basic type (e.g., string)
 
-						for _, key := range sm.MapKeys() {
 
-							val := sm.MapIndex(key)
 
-							dm.SetMapIndex(key, val)
 
-						}
 
-					}
 
-				}
 
-			}
 
-		case reflect.Interface:
 
-			// Must be oneof field.
 
-			switch {
 
-			case isPointer || isSlice:
 
-				panic("bad pointer or slice in interface case in " + tf.Name())
 
-			default: // E.g., interface{}
 
-				// TODO: Make this faster?
 
-				mfi.merge = func(dst, src pointer) {
 
-					su := src.asPointerTo(tf).Elem()
 
-					if !su.IsNil() {
 
-						du := dst.asPointerTo(tf).Elem()
 
-						typ := su.Elem().Type()
 
-						if du.IsNil() || du.Elem().Type() != typ {
 
-							du.Set(reflect.New(typ.Elem())) // Initialize interface if empty
 
-						}
 
-						sv := su.Elem().Elem().Field(0)
 
-						if sv.Kind() == reflect.Ptr && sv.IsNil() {
 
-							return
 
-						}
 
-						dv := du.Elem().Elem().Field(0)
 
-						if dv.Kind() == reflect.Ptr && dv.IsNil() {
 
-							dv.Set(reflect.New(sv.Type().Elem())) // Initialize proto message if empty
 
-						}
 
-						switch sv.Type().Kind() {
 
-						case reflect.Ptr: // Proto struct (e.g., *T)
 
-							Merge(dv.Interface().(Message), sv.Interface().(Message))
 
-						case reflect.Slice: // E.g. Bytes type (e.g., []byte)
 
-							dv.Set(reflect.ValueOf(append([]byte{}, sv.Bytes()...)))
 
-						default: // Basic type (e.g., string)
 
-							dv.Set(sv)
 
-						}
 
-					}
 
-				}
 
-			}
 
-		default:
 
-			panic(fmt.Sprintf("merger not found for type:%s", tf))
 
-		}
 
-		mi.fields = append(mi.fields, mfi)
 
-	}
 
-
 
-	mi.unrecognized = invalidField
 
-	if f, ok := t.FieldByName("XXX_unrecognized"); ok {
 
-		if f.Type != reflect.TypeOf([]byte{}) {
 
-			panic("expected XXX_unrecognized to be of type []byte")
 
-		}
 
-		mi.unrecognized = toField(&f)
 
-	}
 
-
 
-	atomic.StoreInt32(&mi.initialized, 1)
 
-}

+ 0 - 2053
vendor/github.com/golang/protobuf/proto/table_unmarshal.go
Просмотреть файл 

@@ -1,2053 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2016 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-import (
 
-	"errors"
 
-	"fmt"
 
-	"io"
 
-	"math"
 
-	"reflect"
 
-	"strconv"
 
-	"strings"
 
-	"sync"
 
-	"sync/atomic"
 
-	"unicode/utf8"
 
-)
 
-
 
-// Unmarshal is the entry point from the generated .pb.go files.
 
-// This function is not intended to be used by non-generated code.
 
-// This function is not subject to any compatibility guarantee.
 
-// msg contains a pointer to a protocol buffer struct.
 
-// b is the data to be unmarshaled into the protocol buffer.
 
-// a is a pointer to a place to store cached unmarshal information.
 
-func (a *InternalMessageInfo) Unmarshal(msg Message, b []byte) error {
 
-	// Load the unmarshal information for this message type.
 
-	// The atomic load ensures memory consistency.
 
-	u := atomicLoadUnmarshalInfo(&a.unmarshal)
 
-	if u == nil {
 
-		// Slow path: find unmarshal info for msg, update a with it.
 
-		u = getUnmarshalInfo(reflect.TypeOf(msg).Elem())
 
-		atomicStoreUnmarshalInfo(&a.unmarshal, u)
 
-	}
 
-	// Then do the unmarshaling.
 
-	err := u.unmarshal(toPointer(&msg), b)
 
-	return err
 
-}
 
-
 
-type unmarshalInfo struct {
 
-	typ reflect.Type // type of the protobuf struct
 
-
 
-	// 0 = only typ field is initialized
 
-	// 1 = completely initialized
 
-	initialized     int32
 
-	lock            sync.Mutex                    // prevents double initialization
 
-	dense           []unmarshalFieldInfo          // fields indexed by tag #
 
-	sparse          map[uint64]unmarshalFieldInfo // fields indexed by tag #
 
-	reqFields       []string                      // names of required fields
 
-	reqMask         uint64                        // 1<<len(reqFields)-1
 
-	unrecognized    field                         // offset of []byte to put unrecognized data (or invalidField if we should throw it away)
 
-	extensions      field                         // offset of extensions field (of type proto.XXX_InternalExtensions), or invalidField if it does not exist
 
-	oldExtensions   field                         // offset of old-form extensions field (of type map[int]Extension)
 
-	extensionRanges []ExtensionRange              // if non-nil, implies extensions field is valid
 
-	isMessageSet    bool                          // if true, implies extensions field is valid
 
-}
 
-
 
-// An unmarshaler takes a stream of bytes and a pointer to a field of a message.
 
-// It decodes the field, stores it at f, and returns the unused bytes.
 
-// w is the wire encoding.
 
-// b is the data after the tag and wire encoding have been read.
 
-type unmarshaler func(b []byte, f pointer, w int) ([]byte, error)
 
-
 
-type unmarshalFieldInfo struct {
 
-	// location of the field in the proto message structure.
 
-	field field
 
-
 
-	// function to unmarshal the data for the field.
 
-	unmarshal unmarshaler
 
-
 
-	// if a required field, contains a single set bit at this field's index in the required field list.
 
-	reqMask uint64
 
-
 
-	name string // name of the field, for error reporting
 
-}
 
-
 
-var (
 
-	unmarshalInfoMap  = map[reflect.Type]*unmarshalInfo{}
 
-	unmarshalInfoLock sync.Mutex
 
-)
 
-
 
-// getUnmarshalInfo returns the data structure which can be
 
-// subsequently used to unmarshal a message of the given type.
 
-// t is the type of the message (note: not pointer to message).
 
-func getUnmarshalInfo(t reflect.Type) *unmarshalInfo {
 
-	// It would be correct to return a new unmarshalInfo
 
-	// unconditionally. We would end up allocating one
 
-	// per occurrence of that type as a message or submessage.
 
-	// We use a cache here just to reduce memory usage.
 
-	unmarshalInfoLock.Lock()
 
-	defer unmarshalInfoLock.Unlock()
 
-	u := unmarshalInfoMap[t]
 
-	if u == nil {
 
-		u = &unmarshalInfo{typ: t}
 
-		// Note: we just set the type here. The rest of the fields
 
-		// will be initialized on first use.
 
-		unmarshalInfoMap[t] = u
 
-	}
 
-	return u
 
-}
 
-
 
-// unmarshal does the main work of unmarshaling a message.
 
-// u provides type information used to unmarshal the message.
 
-// m is a pointer to a protocol buffer message.
 
-// b is a byte stream to unmarshal into m.
 
-// This is top routine used when recursively unmarshaling submessages.
 
-func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error {
 
-	if atomic.LoadInt32(&u.initialized) == 0 {
 
-		u.computeUnmarshalInfo()
 
-	}
 
-	if u.isMessageSet {
 
-		return unmarshalMessageSet(b, m.offset(u.extensions).toExtensions())
 
-	}
 
-	var reqMask uint64 // bitmask of required fields we've seen.
 
-	var errLater error
 
-	for len(b) > 0 {
 
-		// Read tag and wire type.
 
-		// Special case 1 and 2 byte varints.
 
-		var x uint64
 
-		if b[0] < 128 {
 
-			x = uint64(b[0])
 
-			b = b[1:]
 
-		} else if len(b) >= 2 && b[1] < 128 {
 
-			x = uint64(b[0]&0x7f) + uint64(b[1])<<7
 
-			b = b[2:]
 
-		} else {
 
-			var n int
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-		}
 
-		tag := x >> 3
 
-		wire := int(x) & 7
 
-
 
-		// Dispatch on the tag to one of the unmarshal* functions below.
 
-		var f unmarshalFieldInfo
 
-		if tag < uint64(len(u.dense)) {
 
-			f = u.dense[tag]
 
-		} else {
 
-			f = u.sparse[tag]
 
-		}
 
-		if fn := f.unmarshal; fn != nil {
 
-			var err error
 
-			b, err = fn(b, m.offset(f.field), wire)
 
-			if err == nil {
 
-				reqMask |= f.reqMask
 
-				continue
 
-			}
 
-			if r, ok := err.(*RequiredNotSetError); ok {
 
-				// Remember this error, but keep parsing. We need to produce
 
-				// a full parse even if a required field is missing.
 
-				if errLater == nil {
 
-					errLater = r
 
-				}
 
-				reqMask |= f.reqMask
 
-				continue
 
-			}
 
-			if err != errInternalBadWireType {
 
-				if err == errInvalidUTF8 {
 
-					if errLater == nil {
 
-						fullName := revProtoTypes[reflect.PtrTo(u.typ)] + "." + f.name
 
-						errLater = &invalidUTF8Error{fullName}
 
-					}
 
-					continue
 
-				}
 
-				return err
 
-			}
 
-			// Fragments with bad wire type are treated as unknown fields.
 
-		}
 
-
 
-		// Unknown tag.
 
-		if !u.unrecognized.IsValid() {
 
-			// Don't keep unrecognized data; just skip it.
 
-			var err error
 
-			b, err = skipField(b, wire)
 
-			if err != nil {
 
-				return err
 
-			}
 
-			continue
 
-		}
 
-		// Keep unrecognized data around.
 
-		// maybe in extensions, maybe in the unrecognized field.
 
-		z := m.offset(u.unrecognized).toBytes()
 
-		var emap map[int32]Extension
 
-		var e Extension
 
-		for _, r := range u.extensionRanges {
 
-			if uint64(r.Start) <= tag && tag <= uint64(r.End) {
 
-				if u.extensions.IsValid() {
 
-					mp := m.offset(u.extensions).toExtensions()
 
-					emap = mp.extensionsWrite()
 
-					e = emap[int32(tag)]
 
-					z = &e.enc
 
-					break
 
-				}
 
-				if u.oldExtensions.IsValid() {
 
-					p := m.offset(u.oldExtensions).toOldExtensions()
 
-					emap = *p
 
-					if emap == nil {
 
-						emap = map[int32]Extension{}
 
-						*p = emap
 
-					}
 
-					e = emap[int32(tag)]
 
-					z = &e.enc
 
-					break
 
-				}
 
-				panic("no extensions field available")
 
-			}
 
-		}
 
-
 
-		// Use wire type to skip data.
 
-		var err error
 
-		b0 := b
 
-		b, err = skipField(b, wire)
 
-		if err != nil {
 
-			return err
 
-		}
 
-		*z = encodeVarint(*z, tag<<3|uint64(wire))
 
-		*z = append(*z, b0[:len(b0)-len(b)]...)
 
-
 
-		if emap != nil {
 
-			emap[int32(tag)] = e
 
-		}
 
-	}
 
-	if reqMask != u.reqMask && errLater == nil {
 
-		// A required field of this message is missing.
 
-		for _, n := range u.reqFields {
 
-			if reqMask&1 == 0 {
 
-				errLater = &RequiredNotSetError{n}
 
-			}
 
-			reqMask >>= 1
 
-		}
 
-	}
 
-	return errLater
 
-}
 
-
 
-// computeUnmarshalInfo fills in u with information for use
 
-// in unmarshaling protocol buffers of type u.typ.
 
-func (u *unmarshalInfo) computeUnmarshalInfo() {
 
-	u.lock.Lock()
 
-	defer u.lock.Unlock()
 
-	if u.initialized != 0 {
 
-		return
 
-	}
 
-	t := u.typ
 
-	n := t.NumField()
 
-
 
-	// Set up the "not found" value for the unrecognized byte buffer.
 
-	// This is the default for proto3.
 
-	u.unrecognized = invalidField
 
-	u.extensions = invalidField
 
-	u.oldExtensions = invalidField
 
-
 
-	// List of the generated type and offset for each oneof field.
 
-	type oneofField struct {
 
-		ityp  reflect.Type // interface type of oneof field
 
-		field field        // offset in containing message
 
-	}
 
-	var oneofFields []oneofField
 
-
 
-	for i := 0; i < n; i++ {
 
-		f := t.Field(i)
 
-		if f.Name == "XXX_unrecognized" {
 
-			// The byte slice used to hold unrecognized input is special.
 
-			if f.Type != reflect.TypeOf(([]byte)(nil)) {
 
-				panic("bad type for XXX_unrecognized field: " + f.Type.Name())
 
-			}
 
-			u.unrecognized = toField(&f)
 
-			continue
 
-		}
 
-		if f.Name == "XXX_InternalExtensions" {
 
-			// Ditto here.
 
-			if f.Type != reflect.TypeOf(XXX_InternalExtensions{}) {
 
-				panic("bad type for XXX_InternalExtensions field: " + f.Type.Name())
 
-			}
 
-			u.extensions = toField(&f)
 
-			if f.Tag.Get("protobuf_messageset") == "1" {
 
-				u.isMessageSet = true
 
-			}
 
-			continue
 
-		}
 
-		if f.Name == "XXX_extensions" {
 
-			// An older form of the extensions field.
 
-			if f.Type != reflect.TypeOf((map[int32]Extension)(nil)) {
 
-				panic("bad type for XXX_extensions field: " + f.Type.Name())
 
-			}
 
-			u.oldExtensions = toField(&f)
 
-			continue
 
-		}
 
-		if f.Name == "XXX_NoUnkeyedLiteral" || f.Name == "XXX_sizecache" {
 
-			continue
 
-		}
 
-
 
-		oneof := f.Tag.Get("protobuf_oneof")
 
-		if oneof != "" {
 
-			oneofFields = append(oneofFields, oneofField{f.Type, toField(&f)})
 
-			// The rest of oneof processing happens below.
 
-			continue
 
-		}
 
-
 
-		tags := f.Tag.Get("protobuf")
 
-		tagArray := strings.Split(tags, ",")
 
-		if len(tagArray) < 2 {
 
-			panic("protobuf tag not enough fields in " + t.Name() + "." + f.Name + ": " + tags)
 
-		}
 
-		tag, err := strconv.Atoi(tagArray[1])
 
-		if err != nil {
 
-			panic("protobuf tag field not an integer: " + tagArray[1])
 
-		}
 
-
 
-		name := ""
 
-		for _, tag := range tagArray[3:] {
 
-			if strings.HasPrefix(tag, "name=") {
 
-				name = tag[5:]
 
-			}
 
-		}
 
-
 
-		// Extract unmarshaling function from the field (its type and tags).
 
-		unmarshal := fieldUnmarshaler(&f)
 
-
 
-		// Required field?
 
-		var reqMask uint64
 
-		if tagArray[2] == "req" {
 
-			bit := len(u.reqFields)
 
-			u.reqFields = append(u.reqFields, name)
 
-			reqMask = uint64(1) << uint(bit)
 
-			// TODO: if we have more than 64 required fields, we end up
 
-			// not verifying that all required fields are present.
 
-			// Fix this, perhaps using a count of required fields?
 
-		}
 
-
 
-		// Store the info in the correct slot in the message.
 
-		u.setTag(tag, toField(&f), unmarshal, reqMask, name)
 
-	}
 
-
 
-	// Find any types associated with oneof fields.
 
-	var oneofImplementers []interface{}
 
-	switch m := reflect.Zero(reflect.PtrTo(t)).Interface().(type) {
 
-	case oneofFuncsIface:
 
-		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
 
-	case oneofWrappersIface:
 
-		oneofImplementers = m.XXX_OneofWrappers()
 
-	}
 
-	for _, v := range oneofImplementers {
 
-		tptr := reflect.TypeOf(v) // *Msg_X
 
-		typ := tptr.Elem()        // Msg_X
 
-
 
-		f := typ.Field(0) // oneof implementers have one field
 
-		baseUnmarshal := fieldUnmarshaler(&f)
 
-		tags := strings.Split(f.Tag.Get("protobuf"), ",")
 
-		fieldNum, err := strconv.Atoi(tags[1])
 
-		if err != nil {
 
-			panic("protobuf tag field not an integer: " + tags[1])
 
-		}
 
-		var name string
 
-		for _, tag := range tags {
 
-			if strings.HasPrefix(tag, "name=") {
 
-				name = strings.TrimPrefix(tag, "name=")
 
-				break
 
-			}
 
-		}
 
-
 
-		// Find the oneof field that this struct implements.
 
-		// Might take O(n^2) to process all of the oneofs, but who cares.
 
-		for _, of := range oneofFields {
 
-			if tptr.Implements(of.ityp) {
 
-				// We have found the corresponding interface for this struct.
 
-				// That lets us know where this struct should be stored
 
-				// when we encounter it during unmarshaling.
 
-				unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal)
 
-				u.setTag(fieldNum, of.field, unmarshal, 0, name)
 
-			}
 
-		}
 
-
 
-	}
 
-
 
-	// Get extension ranges, if any.
 
-	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
 
-	if fn.IsValid() {
 
-		if !u.extensions.IsValid() && !u.oldExtensions.IsValid() {
 
-			panic("a message with extensions, but no extensions field in " + t.Name())
 
-		}
 
-		u.extensionRanges = fn.Call(nil)[0].Interface().([]ExtensionRange)
 
-	}
 
-
 
-	// Explicitly disallow tag 0. This will ensure we flag an error
 
-	// when decoding a buffer of all zeros. Without this code, we
 
-	// would decode and skip an all-zero buffer of even length.
 
-	// [0 0] is [tag=0/wiretype=varint varint-encoded-0].
 
-	u.setTag(0, zeroField, func(b []byte, f pointer, w int) ([]byte, error) {
 
-		return nil, fmt.Errorf("proto: %s: illegal tag 0 (wire type %d)", t, w)
 
-	}, 0, "")
 
-
 
-	// Set mask for required field check.
 
-	u.reqMask = uint64(1)<<uint(len(u.reqFields)) - 1
 
-
 
-	atomic.StoreInt32(&u.initialized, 1)
 
-}
 
-
 
-// setTag stores the unmarshal information for the given tag.
 
-// tag = tag # for field
 
-// field/unmarshal = unmarshal info for that field.
 
-// reqMask = if required, bitmask for field position in required field list. 0 otherwise.
 
-// name = short name of the field.
 
-func (u *unmarshalInfo) setTag(tag int, field field, unmarshal unmarshaler, reqMask uint64, name string) {
 
-	i := unmarshalFieldInfo{field: field, unmarshal: unmarshal, reqMask: reqMask, name: name}
 
-	n := u.typ.NumField()
 
-	if tag >= 0 && (tag < 16 || tag < 2*n) { // TODO: what are the right numbers here?
 
-		for len(u.dense) <= tag {
 
-			u.dense = append(u.dense, unmarshalFieldInfo{})
 
-		}
 
-		u.dense[tag] = i
 
-		return
 
-	}
 
-	if u.sparse == nil {
 
-		u.sparse = map[uint64]unmarshalFieldInfo{}
 
-	}
 
-	u.sparse[uint64(tag)] = i
 
-}
 
-
 
-// fieldUnmarshaler returns an unmarshaler for the given field.
 
-func fieldUnmarshaler(f *reflect.StructField) unmarshaler {
 
-	if f.Type.Kind() == reflect.Map {
 
-		return makeUnmarshalMap(f)
 
-	}
 
-	return typeUnmarshaler(f.Type, f.Tag.Get("protobuf"))
 
-}
 
-
 
-// typeUnmarshaler returns an unmarshaler for the given field type / field tag pair.
 
-func typeUnmarshaler(t reflect.Type, tags string) unmarshaler {
 
-	tagArray := strings.Split(tags, ",")
 
-	encoding := tagArray[0]
 
-	name := "unknown"
 
-	proto3 := false
 
-	validateUTF8 := true
 
-	for _, tag := range tagArray[3:] {
 
-		if strings.HasPrefix(tag, "name=") {
 
-			name = tag[5:]
 
-		}
 
-		if tag == "proto3" {
 
-			proto3 = true
 
-		}
 
-	}
 
-	validateUTF8 = validateUTF8 && proto3
 
-
 
-	// Figure out packaging (pointer, slice, or both)
 
-	slice := false
 
-	pointer := false
 
-	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
 
-		slice = true
 
-		t = t.Elem()
 
-	}
 
-	if t.Kind() == reflect.Ptr {
 
-		pointer = true
 
-		t = t.Elem()
 
-	}
 
-
 
-	// We'll never have both pointer and slice for basic types.
 
-	if pointer && slice && t.Kind() != reflect.Struct {
 
-		panic("both pointer and slice for basic type in " + t.Name())
 
-	}
 
-
 
-	switch t.Kind() {
 
-	case reflect.Bool:
 
-		if pointer {
 
-			return unmarshalBoolPtr
 
-		}
 
-		if slice {
 
-			return unmarshalBoolSlice
 
-		}
 
-		return unmarshalBoolValue
 
-	case reflect.Int32:
 
-		switch encoding {
 
-		case "fixed32":
 
-			if pointer {
 
-				return unmarshalFixedS32Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalFixedS32Slice
 
-			}
 
-			return unmarshalFixedS32Value
 
-		case "varint":
 
-			// this could be int32 or enum
 
-			if pointer {
 
-				return unmarshalInt32Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalInt32Slice
 
-			}
 
-			return unmarshalInt32Value
 
-		case "zigzag32":
 
-			if pointer {
 
-				return unmarshalSint32Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalSint32Slice
 
-			}
 
-			return unmarshalSint32Value
 
-		}
 
-	case reflect.Int64:
 
-		switch encoding {
 
-		case "fixed64":
 
-			if pointer {
 
-				return unmarshalFixedS64Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalFixedS64Slice
 
-			}
 
-			return unmarshalFixedS64Value
 
-		case "varint":
 
-			if pointer {
 
-				return unmarshalInt64Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalInt64Slice
 
-			}
 
-			return unmarshalInt64Value
 
-		case "zigzag64":
 
-			if pointer {
 
-				return unmarshalSint64Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalSint64Slice
 
-			}
 
-			return unmarshalSint64Value
 
-		}
 
-	case reflect.Uint32:
 
-		switch encoding {
 
-		case "fixed32":
 
-			if pointer {
 
-				return unmarshalFixed32Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalFixed32Slice
 
-			}
 
-			return unmarshalFixed32Value
 
-		case "varint":
 
-			if pointer {
 
-				return unmarshalUint32Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalUint32Slice
 
-			}
 
-			return unmarshalUint32Value
 
-		}
 
-	case reflect.Uint64:
 
-		switch encoding {
 
-		case "fixed64":
 
-			if pointer {
 
-				return unmarshalFixed64Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalFixed64Slice
 
-			}
 
-			return unmarshalFixed64Value
 
-		case "varint":
 
-			if pointer {
 
-				return unmarshalUint64Ptr
 
-			}
 
-			if slice {
 
-				return unmarshalUint64Slice
 
-			}
 
-			return unmarshalUint64Value
 
-		}
 
-	case reflect.Float32:
 
-		if pointer {
 
-			return unmarshalFloat32Ptr
 
-		}
 
-		if slice {
 
-			return unmarshalFloat32Slice
 
-		}
 
-		return unmarshalFloat32Value
 
-	case reflect.Float64:
 
-		if pointer {
 
-			return unmarshalFloat64Ptr
 
-		}
 
-		if slice {
 
-			return unmarshalFloat64Slice
 
-		}
 
-		return unmarshalFloat64Value
 
-	case reflect.Map:
 
-		panic("map type in typeUnmarshaler in " + t.Name())
 
-	case reflect.Slice:
 
-		if pointer {
 
-			panic("bad pointer in slice case in " + t.Name())
 
-		}
 
-		if slice {
 
-			return unmarshalBytesSlice
 
-		}
 
-		return unmarshalBytesValue
 
-	case reflect.String:
 
-		if validateUTF8 {
 
-			if pointer {
 
-				return unmarshalUTF8StringPtr
 
-			}
 
-			if slice {
 
-				return unmarshalUTF8StringSlice
 
-			}
 
-			return unmarshalUTF8StringValue
 
-		}
 
-		if pointer {
 
-			return unmarshalStringPtr
 
-		}
 
-		if slice {
 
-			return unmarshalStringSlice
 
-		}
 
-		return unmarshalStringValue
 
-	case reflect.Struct:
 
-		// message or group field
 
-		if !pointer {
 
-			panic(fmt.Sprintf("message/group field %s:%s without pointer", t, encoding))
 
-		}
 
-		switch encoding {
 
-		case "bytes":
 
-			if slice {
 
-				return makeUnmarshalMessageSlicePtr(getUnmarshalInfo(t), name)
 
-			}
 
-			return makeUnmarshalMessagePtr(getUnmarshalInfo(t), name)
 
-		case "group":
 
-			if slice {
 
-				return makeUnmarshalGroupSlicePtr(getUnmarshalInfo(t), name)
 
-			}
 
-			return makeUnmarshalGroupPtr(getUnmarshalInfo(t), name)
 
-		}
 
-	}
 
-	panic(fmt.Sprintf("unmarshaler not found type:%s encoding:%s", t, encoding))
 
-}
 
-
 
-// Below are all the unmarshalers for individual fields of various types.
 
-
 
-func unmarshalInt64Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int64(x)
 
-	*f.toInt64() = v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalInt64Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int64(x)
 
-	*f.toInt64Ptr() = &v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalInt64Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-			v := int64(x)
 
-			s := f.toInt64Slice()
 
-			*s = append(*s, v)
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int64(x)
 
-	s := f.toInt64Slice()
 
-	*s = append(*s, v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalSint64Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int64(x>>1) ^ int64(x)<<63>>63
 
-	*f.toInt64() = v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalSint64Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int64(x>>1) ^ int64(x)<<63>>63
 
-	*f.toInt64Ptr() = &v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalSint64Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-			v := int64(x>>1) ^ int64(x)<<63>>63
 
-			s := f.toInt64Slice()
 
-			*s = append(*s, v)
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int64(x>>1) ^ int64(x)<<63>>63
 
-	s := f.toInt64Slice()
 
-	*s = append(*s, v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalUint64Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := uint64(x)
 
-	*f.toUint64() = v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalUint64Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := uint64(x)
 
-	*f.toUint64Ptr() = &v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalUint64Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-			v := uint64(x)
 
-			s := f.toUint64Slice()
 
-			*s = append(*s, v)
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := uint64(x)
 
-	s := f.toUint64Slice()
 
-	*s = append(*s, v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalInt32Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int32(x)
 
-	*f.toInt32() = v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalInt32Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int32(x)
 
-	f.setInt32Ptr(v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalInt32Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-			v := int32(x)
 
-			f.appendInt32Slice(v)
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int32(x)
 
-	f.appendInt32Slice(v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalSint32Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int32(x>>1) ^ int32(x)<<31>>31
 
-	*f.toInt32() = v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalSint32Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int32(x>>1) ^ int32(x)<<31>>31
 
-	f.setInt32Ptr(v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalSint32Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-			v := int32(x>>1) ^ int32(x)<<31>>31
 
-			f.appendInt32Slice(v)
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := int32(x>>1) ^ int32(x)<<31>>31
 
-	f.appendInt32Slice(v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalUint32Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := uint32(x)
 
-	*f.toUint32() = v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalUint32Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := uint32(x)
 
-	*f.toUint32Ptr() = &v
 
-	return b, nil
 
-}
 
-
 
-func unmarshalUint32Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			b = b[n:]
 
-			v := uint32(x)
 
-			s := f.toUint32Slice()
 
-			*s = append(*s, v)
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	v := uint32(x)
 
-	s := f.toUint32Slice()
 
-	*s = append(*s, v)
 
-	return b, nil
 
-}
 
-
 
-func unmarshalFixed64Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
 
-	*f.toUint64() = v
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFixed64Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
 
-	*f.toUint64Ptr() = &v
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFixed64Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			if len(b) < 8 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
 
-			s := f.toUint64Slice()
 
-			*s = append(*s, v)
 
-			b = b[8:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
 
-	s := f.toUint64Slice()
 
-	*s = append(*s, v)
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFixedS64Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
 
-	*f.toInt64() = v
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFixedS64Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
 
-	*f.toInt64Ptr() = &v
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFixedS64Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			if len(b) < 8 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
 
-			s := f.toInt64Slice()
 
-			*s = append(*s, v)
 
-			b = b[8:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
 
-	s := f.toInt64Slice()
 
-	*s = append(*s, v)
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFixed32Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
 
-	*f.toUint32() = v
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFixed32Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
 
-	*f.toUint32Ptr() = &v
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFixed32Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			if len(b) < 4 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
 
-			s := f.toUint32Slice()
 
-			*s = append(*s, v)
 
-			b = b[4:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
 
-	s := f.toUint32Slice()
 
-	*s = append(*s, v)
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFixedS32Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
 
-	*f.toInt32() = v
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFixedS32Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
 
-	f.setInt32Ptr(v)
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFixedS32Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			if len(b) < 4 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
 
-			f.appendInt32Slice(v)
 
-			b = b[4:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
 
-	f.appendInt32Slice(v)
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalBoolValue(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	// Note: any length varint is allowed, even though any sane
 
-	// encoder will use one byte.
 
-	// See https://github.com/golang/protobuf/issues/76
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	// TODO: check if x>1? Tests seem to indicate no.
 
-	v := x != 0
 
-	*f.toBool() = v
 
-	return b[n:], nil
 
-}
 
-
 
-func unmarshalBoolPtr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := x != 0
 
-	*f.toBoolPtr() = &v
 
-	return b[n:], nil
 
-}
 
-
 
-func unmarshalBoolSlice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			x, n = decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := x != 0
 
-			s := f.toBoolSlice()
 
-			*s = append(*s, v)
 
-			b = b[n:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireVarint {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := x != 0
 
-	s := f.toBoolSlice()
 
-	*s = append(*s, v)
 
-	return b[n:], nil
 
-}
 
-
 
-func unmarshalFloat64Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
 
-	*f.toFloat64() = v
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFloat64Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
 
-	*f.toFloat64Ptr() = &v
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFloat64Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			if len(b) < 8 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
 
-			s := f.toFloat64Slice()
 
-			*s = append(*s, v)
 
-			b = b[8:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireFixed64 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 8 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
 
-	s := f.toFloat64Slice()
 
-	*s = append(*s, v)
 
-	return b[8:], nil
 
-}
 
-
 
-func unmarshalFloat32Value(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
 
-	*f.toFloat32() = v
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFloat32Ptr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
 
-	*f.toFloat32Ptr() = &v
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalFloat32Slice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w == WireBytes { // packed
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		res := b[x:]
 
-		b = b[:x]
 
-		for len(b) > 0 {
 
-			if len(b) < 4 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
 
-			s := f.toFloat32Slice()
 
-			*s = append(*s, v)
 
-			b = b[4:]
 
-		}
 
-		return res, nil
 
-	}
 
-	if w != WireFixed32 {
 
-		return b, errInternalBadWireType
 
-	}
 
-	if len(b) < 4 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
 
-	s := f.toFloat32Slice()
 
-	*s = append(*s, v)
 
-	return b[4:], nil
 
-}
 
-
 
-func unmarshalStringValue(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := string(b[:x])
 
-	*f.toString() = v
 
-	return b[x:], nil
 
-}
 
-
 
-func unmarshalStringPtr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := string(b[:x])
 
-	*f.toStringPtr() = &v
 
-	return b[x:], nil
 
-}
 
-
 
-func unmarshalStringSlice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := string(b[:x])
 
-	s := f.toStringSlice()
 
-	*s = append(*s, v)
 
-	return b[x:], nil
 
-}
 
-
 
-func unmarshalUTF8StringValue(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := string(b[:x])
 
-	*f.toString() = v
 
-	if !utf8.ValidString(v) {
 
-		return b[x:], errInvalidUTF8
 
-	}
 
-	return b[x:], nil
 
-}
 
-
 
-func unmarshalUTF8StringPtr(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := string(b[:x])
 
-	*f.toStringPtr() = &v
 
-	if !utf8.ValidString(v) {
 
-		return b[x:], errInvalidUTF8
 
-	}
 
-	return b[x:], nil
 
-}
 
-
 
-func unmarshalUTF8StringSlice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := string(b[:x])
 
-	s := f.toStringSlice()
 
-	*s = append(*s, v)
 
-	if !utf8.ValidString(v) {
 
-		return b[x:], errInvalidUTF8
 
-	}
 
-	return b[x:], nil
 
-}
 
-
 
-var emptyBuf [0]byte
 
-
 
-func unmarshalBytesValue(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	// The use of append here is a trick which avoids the zeroing
 
-	// that would be required if we used a make/copy pair.
 
-	// We append to emptyBuf instead of nil because we want
 
-	// a non-nil result even when the length is 0.
 
-	v := append(emptyBuf[:], b[:x]...)
 
-	*f.toBytes() = v
 
-	return b[x:], nil
 
-}
 
-
 
-func unmarshalBytesSlice(b []byte, f pointer, w int) ([]byte, error) {
 
-	if w != WireBytes {
 
-		return b, errInternalBadWireType
 
-	}
 
-	x, n := decodeVarint(b)
 
-	if n == 0 {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	b = b[n:]
 
-	if x > uint64(len(b)) {
 
-		return nil, io.ErrUnexpectedEOF
 
-	}
 
-	v := append(emptyBuf[:], b[:x]...)
 
-	s := f.toBytesSlice()
 
-	*s = append(*s, v)
 
-	return b[x:], nil
 
-}
 
-
 
-func makeUnmarshalMessagePtr(sub *unmarshalInfo, name string) unmarshaler {
 
-	return func(b []byte, f pointer, w int) ([]byte, error) {
 
-		if w != WireBytes {
 
-			return b, errInternalBadWireType
 
-		}
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		// First read the message field to see if something is there.
 
-		// The semantics of multiple submessages are weird.  Instead of
 
-		// the last one winning (as it is for all other fields), multiple
 
-		// submessages are merged.
 
-		v := f.getPointer()
 
-		if v.isNil() {
 
-			v = valToPointer(reflect.New(sub.typ))
 
-			f.setPointer(v)
 
-		}
 
-		err := sub.unmarshal(v, b[:x])
 
-		if err != nil {
 
-			if r, ok := err.(*RequiredNotSetError); ok {
 
-				r.field = name + "." + r.field
 
-			} else {
 
-				return nil, err
 
-			}
 
-		}
 
-		return b[x:], err
 
-	}
 
-}
 
-
 
-func makeUnmarshalMessageSlicePtr(sub *unmarshalInfo, name string) unmarshaler {
 
-	return func(b []byte, f pointer, w int) ([]byte, error) {
 
-		if w != WireBytes {
 
-			return b, errInternalBadWireType
 
-		}
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		v := valToPointer(reflect.New(sub.typ))
 
-		err := sub.unmarshal(v, b[:x])
 
-		if err != nil {
 
-			if r, ok := err.(*RequiredNotSetError); ok {
 
-				r.field = name + "." + r.field
 
-			} else {
 
-				return nil, err
 
-			}
 
-		}
 
-		f.appendPointer(v)
 
-		return b[x:], err
 
-	}
 
-}
 
-
 
-func makeUnmarshalGroupPtr(sub *unmarshalInfo, name string) unmarshaler {
 
-	return func(b []byte, f pointer, w int) ([]byte, error) {
 
-		if w != WireStartGroup {
 
-			return b, errInternalBadWireType
 
-		}
 
-		x, y := findEndGroup(b)
 
-		if x < 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		v := f.getPointer()
 
-		if v.isNil() {
 
-			v = valToPointer(reflect.New(sub.typ))
 
-			f.setPointer(v)
 
-		}
 
-		err := sub.unmarshal(v, b[:x])
 
-		if err != nil {
 
-			if r, ok := err.(*RequiredNotSetError); ok {
 
-				r.field = name + "." + r.field
 
-			} else {
 
-				return nil, err
 
-			}
 
-		}
 
-		return b[y:], err
 
-	}
 
-}
 
-
 
-func makeUnmarshalGroupSlicePtr(sub *unmarshalInfo, name string) unmarshaler {
 
-	return func(b []byte, f pointer, w int) ([]byte, error) {
 
-		if w != WireStartGroup {
 
-			return b, errInternalBadWireType
 
-		}
 
-		x, y := findEndGroup(b)
 
-		if x < 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		v := valToPointer(reflect.New(sub.typ))
 
-		err := sub.unmarshal(v, b[:x])
 
-		if err != nil {
 
-			if r, ok := err.(*RequiredNotSetError); ok {
 
-				r.field = name + "." + r.field
 
-			} else {
 
-				return nil, err
 
-			}
 
-		}
 
-		f.appendPointer(v)
 
-		return b[y:], err
 
-	}
 
-}
 
-
 
-func makeUnmarshalMap(f *reflect.StructField) unmarshaler {
 
-	t := f.Type
 
-	kt := t.Key()
 
-	vt := t.Elem()
 
-	unmarshalKey := typeUnmarshaler(kt, f.Tag.Get("protobuf_key"))
 
-	unmarshalVal := typeUnmarshaler(vt, f.Tag.Get("protobuf_val"))
 
-	return func(b []byte, f pointer, w int) ([]byte, error) {
 
-		// The map entry is a submessage. Figure out how big it is.
 
-		if w != WireBytes {
 
-			return nil, fmt.Errorf("proto: bad wiretype for map field: got %d want %d", w, WireBytes)
 
-		}
 
-		x, n := decodeVarint(b)
 
-		if n == 0 {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[n:]
 
-		if x > uint64(len(b)) {
 
-			return nil, io.ErrUnexpectedEOF
 
-		}
 
-		r := b[x:] // unused data to return
 
-		b = b[:x]  // data for map entry
 
-
 
-		// Note: we could use #keys * #values ~= 200 functions
 
-		// to do map decoding without reflection. Probably not worth it.
 
-		// Maps will be somewhat slow. Oh well.
 
-
 
-		// Read key and value from data.
 
-		var nerr nonFatal
 
-		k := reflect.New(kt)
 
-		v := reflect.New(vt)
 
-		for len(b) > 0 {
 
-			x, n := decodeVarint(b)
 
-			if n == 0 {
 
-				return nil, io.ErrUnexpectedEOF
 
-			}
 
-			wire := int(x) & 7
 
-			b = b[n:]
 
-
 
-			var err error
 
-			switch x >> 3 {
 
-			case 1:
 
-				b, err = unmarshalKey(b, valToPointer(k), wire)
 
-			case 2:
 
-				b, err = unmarshalVal(b, valToPointer(v), wire)
 
-			default:
 
-				err = errInternalBadWireType // skip unknown tag
 
-			}
 
-
 
-			if nerr.Merge(err) {
 
-				continue
 
-			}
 
-			if err != errInternalBadWireType {
 
-				return nil, err
 
-			}
 
-
 
-			// Skip past unknown fields.
 
-			b, err = skipField(b, wire)
 
-			if err != nil {
 
-				return nil, err
 
-			}
 
-		}
 
-
 
-		// Get map, allocate if needed.
 
-		m := f.asPointerTo(t).Elem() // an addressable map[K]T
 
-		if m.IsNil() {
 
-			m.Set(reflect.MakeMap(t))
 
-		}
 
-
 
-		// Insert into map.
 
-		m.SetMapIndex(k.Elem(), v.Elem())
 
-
 
-		return r, nerr.E
 
-	}
 
-}
 
-
 
-// makeUnmarshalOneof makes an unmarshaler for oneof fields.
 
-// for:
 
-// message Msg {
 
-//   oneof F {
 
-//     int64 X = 1;
 
-//     float64 Y = 2;
 
-//   }
 
-// }
 
-// typ is the type of the concrete entry for a oneof case (e.g. Msg_X).
 
-// ityp is the interface type of the oneof field (e.g. isMsg_F).
 
-// unmarshal is the unmarshaler for the base type of the oneof case (e.g. int64).
 
-// Note that this function will be called once for each case in the oneof.
 
-func makeUnmarshalOneof(typ, ityp reflect.Type, unmarshal unmarshaler) unmarshaler {
 
-	sf := typ.Field(0)
 
-	field0 := toField(&sf)
 
-	return func(b []byte, f pointer, w int) ([]byte, error) {
 
-		// Allocate holder for value.
 
-		v := reflect.New(typ)
 
-
 
-		// Unmarshal data into holder.
 
-		// We unmarshal into the first field of the holder object.
 
-		var err error
 
-		var nerr nonFatal
 
-		b, err = unmarshal(b, valToPointer(v).offset(field0), w)
 
-		if !nerr.Merge(err) {
 
-			return nil, err
 
-		}
 
-
 
-		// Write pointer to holder into target field.
 
-		f.asPointerTo(ityp).Elem().Set(v)
 
-
 
-		return b, nerr.E
 
-	}
 
-}
 
-
 
-// Error used by decode internally.
 
-var errInternalBadWireType = errors.New("proto: internal error: bad wiretype")
 
-
 
-// skipField skips past a field of type wire and returns the remaining bytes.
 
-func skipField(b []byte, wire int) ([]byte, error) {
 
-	switch wire {
 
-	case WireVarint:
 
-		_, k := decodeVarint(b)
 
-		if k == 0 {
 
-			return b, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[k:]
 
-	case WireFixed32:
 
-		if len(b) < 4 {
 
-			return b, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[4:]
 
-	case WireFixed64:
 
-		if len(b) < 8 {
 
-			return b, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[8:]
 
-	case WireBytes:
 
-		m, k := decodeVarint(b)
 
-		if k == 0 || uint64(len(b)-k) < m {
 
-			return b, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[uint64(k)+m:]
 
-	case WireStartGroup:
 
-		_, i := findEndGroup(b)
 
-		if i == -1 {
 
-			return b, io.ErrUnexpectedEOF
 
-		}
 
-		b = b[i:]
 
-	default:
 
-		return b, fmt.Errorf("proto: can't skip unknown wire type %d", wire)
 
-	}
 
-	return b, nil
 
-}
 
-
 
-// findEndGroup finds the index of the next EndGroup tag.
 
-// Groups may be nested, so the "next" EndGroup tag is the first
 
-// unpaired EndGroup.
 
-// findEndGroup returns the indexes of the start and end of the EndGroup tag.
 
-// Returns (-1,-1) if it can't find one.
 
-func findEndGroup(b []byte) (int, int) {
 
-	depth := 1
 
-	i := 0
 
-	for {
 
-		x, n := decodeVarint(b[i:])
 
-		if n == 0 {
 
-			return -1, -1
 
-		}
 
-		j := i
 
-		i += n
 
-		switch x & 7 {
 
-		case WireVarint:
 
-			_, k := decodeVarint(b[i:])
 
-			if k == 0 {
 
-				return -1, -1
 
-			}
 
-			i += k
 
-		case WireFixed32:
 
-			if len(b)-4 < i {
 
-				return -1, -1
 
-			}
 
-			i += 4
 
-		case WireFixed64:
 
-			if len(b)-8 < i {
 
-				return -1, -1
 
-			}
 
-			i += 8
 
-		case WireBytes:
 
-			m, k := decodeVarint(b[i:])
 
-			if k == 0 {
 
-				return -1, -1
 
-			}
 
-			i += k
 
-			if uint64(len(b)-i) < m {
 
-				return -1, -1
 
-			}
 
-			i += int(m)
 
-		case WireStartGroup:
 
-			depth++
 
-		case WireEndGroup:
 
-			depth--
 
-			if depth == 0 {
 
-				return j, i
 
-			}
 
-		default:
 
-			return -1, -1
 
-		}
 
-	}
 
-}
 
-
 
-// encodeVarint appends a varint-encoded integer to b and returns the result.
 
-func encodeVarint(b []byte, x uint64) []byte {
 
-	for x >= 1<<7 {
 
-		b = append(b, byte(x&0x7f|0x80))
 
-		x >>= 7
 
-	}
 
-	return append(b, byte(x))
 
-}
 
-
 
-// decodeVarint reads a varint-encoded integer from b.
 
-// Returns the decoded integer and the number of bytes read.
 
-// If there is an error, it returns 0,0.
 
-func decodeVarint(b []byte) (uint64, int) {
 
-	var x, y uint64
 
-	if len(b) == 0 {
 
-		goto bad
 
-	}
 
-	x = uint64(b[0])
 
-	if x < 0x80 {
 
-		return x, 1
 
-	}
 
-	x -= 0x80
 
-
 
-	if len(b) <= 1 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[1])
 
-	x += y << 7
 
-	if y < 0x80 {
 
-		return x, 2
 
-	}
 
-	x -= 0x80 << 7
 
-
 
-	if len(b) <= 2 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[2])
 
-	x += y << 14
 
-	if y < 0x80 {
 
-		return x, 3
 
-	}
 
-	x -= 0x80 << 14
 
-
 
-	if len(b) <= 3 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[3])
 
-	x += y << 21
 
-	if y < 0x80 {
 
-		return x, 4
 
-	}
 
-	x -= 0x80 << 21
 
-
 
-	if len(b) <= 4 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[4])
 
-	x += y << 28
 
-	if y < 0x80 {
 
-		return x, 5
 
-	}
 
-	x -= 0x80 << 28
 
-
 
-	if len(b) <= 5 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[5])
 
-	x += y << 35
 
-	if y < 0x80 {
 
-		return x, 6
 
-	}
 
-	x -= 0x80 << 35
 
-
 
-	if len(b) <= 6 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[6])
 
-	x += y << 42
 
-	if y < 0x80 {
 
-		return x, 7
 
-	}
 
-	x -= 0x80 << 42
 
-
 
-	if len(b) <= 7 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[7])
 
-	x += y << 49
 
-	if y < 0x80 {
 
-		return x, 8
 
-	}
 
-	x -= 0x80 << 49
 
-
 
-	if len(b) <= 8 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[8])
 
-	x += y << 56
 
-	if y < 0x80 {
 
-		return x, 9
 
-	}
 
-	x -= 0x80 << 56
 
-
 
-	if len(b) <= 9 {
 
-		goto bad
 
-	}
 
-	y = uint64(b[9])
 
-	x += y << 63
 
-	if y < 2 {
 
-		return x, 10
 
-	}
 
-
 
-bad:
 
-	return 0, 0
 
-}

+ 0 - 843
vendor/github.com/golang/protobuf/proto/text.go
Просмотреть файл 

@@ -1,843 +0,0 @@
 
-// Go support for Protocol Buffers - Google's data interchange format
 
-//
 
-// Copyright 2010 The Go Authors.  All rights reserved.
 
-// https://github.com/golang/protobuf
 
-//
 
-// Redistribution and use in source and binary forms, with or without
 
-// modification, are permitted provided that the following conditions are
 
-// met:
 
-//
 
-//     * Redistributions of source code must retain the above copyright
 
-// notice, this list of conditions and the following disclaimer.
 
-//     * Redistributions in binary form must reproduce the above
 
-// copyright notice, this list of conditions and the following disclaimer
 
-// in the documentation and/or other materials provided with the
 
-// distribution.
 
-//     * Neither the name of Google Inc. nor the names of its
 
-// contributors may be used to endorse or promote products derived from
 
-// this software without specific prior written permission.
 
-//
 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 
-package proto
 
-
 
-// Functions for writing the text protocol buffer format.
 
-
 
-import (
 
-	"bufio"
 
-	"bytes"
 
-	"encoding"
 
-	"errors"
 
-	"fmt"
 
-	"io"
 
-	"log"
 
-	"math"
 
-	"reflect"
 
-	"sort"
 
-	"strings"
 
-)
 
-
 
-var (
 
-	newline         = []byte("\n")
 
-	spaces          = []byte("                                        ")
 
-	endBraceNewline = []byte("}\n")
 
-	backslashN      = []byte{'\\', 'n'}
 
-	backslashR      = []byte{'\\', 'r'}
 
-	backslashT      = []byte{'\\', 't'}
 
-	backslashDQ     = []byte{'\\', '"'}
 
-	backslashBS     = []byte{'\\', '\\'}
 
-	posInf          = []byte("inf")
 
-	negInf          = []byte("-inf")
 
-	nan             = []byte("nan")
 
-)
 
-
 
-type writer interface {
 
-	io.Writer
 
-	WriteByte(byte) error
 
-}
 
-
 
-// textWriter is an io.Writer that tracks its indentation level.
 
-type textWriter struct {
 
-	ind      int
 
-	complete bool // if the current position is a complete line
 
-	compact  bool // whether to write out as a one-liner
 
-	w        writer
 
-}
 
-
 
-func (w *textWriter) WriteString(s string) (n int, err error) {
 
-	if !strings.Contains(s, "\n") {
 
-		if !w.compact && w.complete {
 
-			w.writeIndent()
 
-		}
 
-		w.complete = false
 
-		return io.WriteString(w.w, s)
 
-	}
 
-	// WriteString is typically called without newlines, so this
 
-	// codepath and its copy are rare.  We copy to avoid
 
-	// duplicating all of Write's logic here.
 
-	return w.Write([]byte(s))
 
-}
 
-
 
-func (w *textWriter) Write(p []byte) (n int, err error) {
 
-	newlines := bytes.Count(p, newline)
 
-	if newlines == 0 {
 
-		if !w.compact && w.complete {
 
-			w.writeIndent()
 
-		}
 
-		n, err = w.w.Write(p)
 
-		w.complete = false
 
-		return n, err
 
-	}
 
-
 
-	frags := bytes.SplitN(p, newline, newlines+1)
 
-	if w.compact {
 
-		for i, frag := range frags {
 
-			if i > 0 {
 
-				if err := w.w.WriteByte(' '); err != nil {
 
-					return n, err
 
-				}
 
-				n++
 
-			}
 
-			nn, err := w.w.Write(frag)
 
-			n += nn
 
-			if err != nil {
 
-				return n, err
 
-			}
 
-		}
 
-		return n, nil
 
-	}
 
-
 
-	for i, frag := range frags {
 
-		if w.complete {
 
-			w.writeIndent()
 
-		}
 
-		nn, err := w.w.Write(frag)
 
-		n += nn
 
-		if err != nil {
 
-			return n, err
 
-		}
 
-		if i+1 < len(frags) {
 
-			if err := w.w.WriteByte('\n'); err != nil {
 
-				return n, err
 
-			}
 
-			n++
 
-		}
 
-	}
 
-	w.complete = len(frags[len(frags)-1]) == 0
 
-	return n, nil
 
-}
 
-
 
-func (w *textWriter) WriteByte(c byte) error {
 
-	if w.compact && c == '\n' {
 
-		c = ' '
 
-	}
 
-	if !w.compact && w.complete {
 
-		w.writeIndent()
 
-	}
 
-	err := w.w.WriteByte(c)
 
-	w.complete = c == '\n'
 
-	return err
 
-}
 
-
 
-func (w *textWriter) indent() { w.ind++ }
 
-
 
-func (w *textWriter) unindent() {
 
-	if w.ind == 0 {
 
-		log.Print("proto: textWriter unindented too far")
 
-		return
 
-	}
 
-	w.ind--
 
-}
 
-
 
-func writeName(w *textWriter, props *Properties) error {
 
-	if _, err := w.WriteString(props.OrigName); err != nil {
 
-		return err
 
-	}
 
-	if props.Wire != "group" {
 
-		return w.WriteByte(':')
 
-	}
 
-	return nil
 
-}
 
-
 
-func requiresQuotes(u string) bool {
 
-	// When type URL contains any characters except [0-9A-Za-z./\-]*, it must be quoted.
 
-	for _, ch := range u {
 
-		switch {
 
-		case ch == '.' || ch == '/' || ch == '_':
 
-			continue
 
-		case '0' <= ch && ch <= '9':
 
-			continue
 
-		case 'A' <= ch && ch <= 'Z':
 
-			continue
 
-		case 'a' <= ch && ch <= 'z':
 
-			continue
 
-		default:
 
-			return true
 
-		}
 
-	}
 
-	return false
 
-}
 
-
 
-// isAny reports whether sv is a google.protobuf.Any message
 
-func isAny(sv reflect.Value) bool {
 
-	type wkt interface {
 
-		XXX_WellKnownType() string
 
-	}
 
-	t, ok := sv.Addr().Interface().(wkt)
 
-	return ok && t.XXX_WellKnownType() == "Any"
 
-}
 
-
 
-// writeProto3Any writes an expanded google.protobuf.Any message.
 
-//
 
-// It returns (false, nil) if sv value can't be unmarshaled (e.g. because
 
-// required messages are not linked in).
 
-//
 
-// It returns (true, error) when sv was written in expanded format or an error
 
-// was encountered.
 
-func (tm *TextMarshaler) writeProto3Any(w *textWriter, sv reflect.Value) (bool, error) {
 
-	turl := sv.FieldByName("TypeUrl")
 
-	val := sv.FieldByName("Value")
 
-	if !turl.IsValid() || !val.IsValid() {
 
-		return true, errors.New("proto: invalid google.protobuf.Any message")
 
-	}
 
-
 
-	b, ok := val.Interface().([]byte)
 
-	if !ok {
 
-		return true, errors.New("proto: invalid google.protobuf.Any message")
 
-	}
 
-
 
-	parts := strings.Split(turl.String(), "/")
 
-	mt := MessageType(parts[len(parts)-1])
 
-	if mt == nil {
 
-		return false, nil
 
-	}
 
-	m := reflect.New(mt.Elem())
 
-	if err := Unmarshal(b, m.Interface().(Message)); err != nil {
 
-		return false, nil
 
-	}
 
-	w.Write([]byte("["))
 
-	u := turl.String()
 
-	if requiresQuotes(u) {
 
-		writeString(w, u)
 
-	} else {
 
-		w.Write([]byte(u))
 
-	}
 
-	if w.compact {
 
-		w.Write([]byte("]:<"))
 
-	} else {
 
-		w.Write([]byte("]: <\n"))
 
-		w.ind++
 
-	}
 
-	if err := tm.writeStruct(w, m.Elem()); err != nil {
 
-		return true, err
 
-	}
 
-	if w.compact {
 
-		w.Write([]byte("> "))
 
-	} else {
 
-		w.ind--
 
-		w.Write([]byte(">\n"))
 
-	}
 
-	return true, nil
 
-}
 
-
 
-func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 
-	if tm.ExpandAny && isAny(sv) {
 
-		if canExpand, err := tm.writeProto3Any(w, sv); canExpand {
 
-			return err
 
-		}
 
-	}
 
-	st := sv.Type()
 
-	sprops := GetProperties(st)
 
-	for i := 0; i < sv.NumField(); i++ {
 
-		fv := sv.Field(i)
 
-		props := sprops.Prop[i]
 
-		name := st.Field(i).Name
 
-
 
-		if name == "XXX_NoUnkeyedLiteral" {
 
-			continue
 
-		}
 
-
 
-		if strings.HasPrefix(name, "XXX_") {
 
-			// There are two XXX_ fields:
 
-			//   XXX_unrecognized []byte
 
-			//   XXX_extensions   map[int32]proto.Extension
 
-			// The first is handled here;
 
-			// the second is handled at the bottom of this function.
 
-			if name == "XXX_unrecognized" && !fv.IsNil() {
 
-				if err := writeUnknownStruct(w, fv.Interface().([]byte)); err != nil {
 
-					return err
 
-				}
 
-			}
 
-			continue
 
-		}
 
-		if fv.Kind() == reflect.Ptr && fv.IsNil() {
 
-			// Field not filled in. This could be an optional field or
 
-			// a required field that wasn't filled in. Either way, there
 
-			// isn't anything we can show for it.
 
-			continue
 
-		}
 
-		if fv.Kind() == reflect.Slice && fv.IsNil() {
 
-			// Repeated field that is empty, or a bytes field that is unused.
 
-			continue
 
-		}
 
-
 
-		if props.Repeated && fv.Kind() == reflect.Slice {
 
-			// Repeated field.
 
-			for j := 0; j < fv.Len(); j++ {
 
-				if err := writeName(w, props); err != nil {
 
-					return err
 
-				}
 
-				if !w.compact {
 
-					if err := w.WriteByte(' '); err != nil {
 
-						return err
 
-					}
 
-				}
 
-				v := fv.Index(j)
 
-				if v.Kind() == reflect.Ptr && v.IsNil() {
 
-					// A nil message in a repeated field is not valid,
 
-					// but we can handle that more gracefully than panicking.
 
-					if _, err := w.Write([]byte("<nil>\n")); err != nil {
 
-						return err
 
-					}
 
-					continue
 
-				}
 
-				if err := tm.writeAny(w, v, props); err != nil {
 
-					return err
 
-				}
 
-				if err := w.WriteByte('\n'); err != nil {
 
-					return err
 
-				}
 
-			}
 
-			continue
 
-		}
 
-		if fv.Kind() == reflect.Map {
 
-			// Map fields are rendered as a repeated struct with key/value fields.
 
-			keys := fv.MapKeys()
 
-			sort.Sort(mapKeys(keys))
 
-			for _, key := range keys {
 
-				val := fv.MapIndex(key)
 
-				if err := writeName(w, props); err != nil {
 
-					return err
 
-				}
 
-				if !w.compact {
 
-					if err := w.WriteByte(' '); err != nil {
 
-						return err
 
-					}
 
-				}
 
-				// open struct
 
-				if err := w.WriteByte('<'); err != nil {
 
-					return err
 
-				}
 
-				if !w.compact {
 
-					if err := w.WriteByte('\n'); err != nil {
 
-						return err
 
-					}
 
-				}
 
-				w.indent()
 
-				// key
 
-				if _, err := w.WriteString("key:"); err != nil {
 
-					return err
 
-				}
 
-				if !w.compact {
 
-					if err := w.WriteByte(' '); err != nil {
 
-						return err
 
-					}
 
-				}
 
-				if err := tm.writeAny(w, key, props.MapKeyProp); err != nil {
 
-					return err
 
-				}
 
-				if err := w.WriteByte('\n'); err != nil {
 
-					return err
 
-				}
 
-				// nil values aren't legal, but we can avoid panicking because of them.
 
-				if val.Kind() != reflect.Ptr || !val.IsNil() {
 
-					// value
 
-					if _, err := w.WriteString("value:"); err != nil {
 
-						return err
 
-					}
 
-					if !w.compact {
 
-						if err := w.WriteByte(' '); err != nil {
 
-							return err
 
-						}
 
-					}
 
-					if err := tm.writeAny(w, val, props.MapValProp); err != nil {
 
-						return err
 
-					}
 
-					if err := w.WriteByte('\n'); err != nil {
 
-						return err
 
-					}
 
-				}
 
-				// close struct
 
-				w.unindent()
 
-				if err := w.WriteByte('>'); err != nil {
 
-					return err
 
-				}
 
-				if err := w.WriteByte('\n'); err != nil {
 
-					return err
 
-				}
 
-			}
 
-			continue
 
-		}
 
-		if props.proto3 && fv.Kind() == reflect.Slice && fv.Len() == 0 {
 
-			// empty bytes field
 
-			continue
 
-		}
 
-		if fv.Kind() != reflect.Ptr && fv.Kind() != reflect.Slice {
 
-			// proto3 non-repeated scalar field; skip if zero value
 
-			if isProto3Zero(fv) {
 
-				continue
 
-			}
 
-		}
 
-
 
-		if fv.Kind() == reflect.Interface {
 
-			// Check if it is a oneof.
 
-			if st.Field(i).Tag.Get("protobuf_oneof") != "" {
 
-				// fv is nil, or holds a pointer to generated struct.
 
-				// That generated struct has exactly one field,
 
-				// which has a protobuf struct tag.
 
-				if fv.IsNil() {
 
-					continue
 
-				}
 
-				inner := fv.Elem().Elem() // interface -> *T -> T
 
-				tag := inner.Type().Field(0).Tag.Get("protobuf")
 
-				props = new(Properties) // Overwrite the outer props var, but not its pointee.
 
-				props.Parse(tag)
 
-				// Write the value in the oneof, not the oneof itself.
 
-				fv = inner.Field(0)
 
-
 
-				// Special case to cope with malformed messages gracefully:
 
-				// If the value in the oneof is a nil pointer, don't panic
 
-				// in writeAny.
 
-				if fv.Kind() == reflect.Ptr && fv.IsNil() {
 
-					// Use errors.New so writeAny won't render quotes.
 
-					msg := errors.New("/* nil */")
 
-					fv = reflect.ValueOf(&msg).Elem()
 
-				}
 
-			}
 
-		}
 
-
 
-		if err := writeName(w, props); err != nil {
 
-			return err
 
-		}
 
-		if !w.compact {
 
-			if err := w.WriteByte(' '); err != nil {
 
-				return err
 
-			}
 
-		}
 
-
 
-		// Enums have a String method, so writeAny will work fine.
 
-		if err := tm.writeAny(w, fv, props); err != nil {
 
-			return err
 
-		}
 
-
 
-		if err := w.WriteByte('\n'); err != nil {
 
-			return err
 
-		}
 
-	}
 
-
 
-	// Extensions (the XXX_extensions field).
 
-	pv := sv.Addr()
 
-	if _, err := extendable(pv.Interface()); err == nil {
 
-		if err := tm.writeExtensions(w, pv); err != nil {
 
-			return err
 
-		}
 
-	}
 
-
 
-	return nil
 
-}
 
-
 
-// writeAny writes an arbitrary field.
 
-func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 
-	v = reflect.Indirect(v)
 
-
 
-	// Floats have special cases.
 
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
 
-		x := v.Float()
 
-		var b []byte
 
-		switch {
 
-		case math.IsInf(x, 1):
 
-			b = posInf
 
-		case math.IsInf(x, -1):
 
-			b = negInf
 
-		case math.IsNaN(x):
 
-			b = nan
 
-		}
 
-		if b != nil {
 
-			_, err := w.Write(b)
 
-			return err
 
-		}
 
-		// Other values are handled below.
 
-	}
 
-
 
-	// We don't attempt to serialise every possible value type; only those
 
-	// that can occur in protocol buffers.
 
-	switch v.Kind() {
 
-	case reflect.Slice:
 
-		// Should only be a []byte; repeated fields are handled in writeStruct.
 
-		if err := writeString(w, string(v.Bytes())); err != nil {
 
-			return err
 
-		}
 
-	case reflect.String:
 
-		if err := writeString(w, v.String()); err != nil {
 
-			return err
 
-		}
 
-	case reflect.Struct:
 
-		// Required/optional group/message.
 
-		var bra, ket byte = '<', '>'
 
-		if props != nil && props.Wire == "group" {
 
-			bra, ket = '{', '}'
 
-		}
 
-		if err := w.WriteByte(bra); err != nil {
 
-			return err
 
-		}
 
-		if !w.compact {
 
-			if err := w.WriteByte('\n'); err != nil {
 
-				return err
 
-			}
 
-		}
 
-		w.indent()
 
-		if v.CanAddr() {
 
-			// Calling v.Interface on a struct causes the reflect package to
 
-			// copy the entire struct. This is racy with the new Marshaler
 
-			// since we atomically update the XXX_sizecache.
 
-			//
 
-			// Thus, we retrieve a pointer to the struct if possible to avoid
 
-			// a race since v.Interface on the pointer doesn't copy the struct.
 
-			//
 
-			// If v is not addressable, then we are not worried about a race
 
-			// since it implies that the binary Marshaler cannot possibly be
 
-			// mutating this value.
 
-			v = v.Addr()
 
-		}
 
-		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
 
-			text, err := etm.MarshalText()
 
-			if err != nil {
 
-				return err
 
-			}
 
-			if _, err = w.Write(text); err != nil {
 
-				return err
 
-			}
 
-		} else {
 
-			if v.Kind() == reflect.Ptr {
 
-				v = v.Elem()
 
-			}
 
-			if err := tm.writeStruct(w, v); err != nil {
 
-				return err
 
-			}
 
-		}
 
-		w.unindent()
 
-		if err := w.WriteByte(ket); err != nil {
 
-			return err
 
-		}
 
-	default:
 
-		_, err := fmt.Fprint(w, v.Interface())
 
-		return err
 
-	}
 
-	return nil
 
-}
 
-
 
-// equivalent to C's isprint.
 
-func isprint(c byte) bool {
 
-	return c >= 0x20 && c < 0x7f
 
-}
 
-
 
-// writeString writes a string in the protocol buffer text format.
 
-// It is similar to strconv.Quote except we don't use Go escape sequences,
 
-// we treat the string as a byte sequence, and we use octal escapes.
 
-// These differences are to maintain interoperability with the other
 
-// languages' implementations of the text format.
 
-func writeString(w *textWriter, s string) error {
 
-	// use WriteByte here to get any needed indent
 
-	if err := w.WriteByte('"'); err != nil {
 
-		return err
 
-	}
 
-	// Loop over the bytes, not the runes.
 
-	for i := 0; i < len(s); i++ {
 
-		var err error
 
-		// Divergence from C++: we don't escape apostrophes.
 
-		// There's no need to escape them, and the C++ parser
 
-		// copes with a naked apostrophe.
 
-		switch c := s[i]; c {
 
-		case '\n':
 
-			_, err = w.w.Write(backslashN)
 
-		case '\r':
 
-			_, err = w.w.Write(backslashR)
 
-		case '\t':
 
-			_, err = w.w.Write(backslashT)
 
-		case '"':
 
-			_, err = w.w.Write(backslashDQ)
 
-		case '\\':
 
-			_, err = w.w.Write(backslashBS)
 
-		default:
 
-			if isprint(c) {
 
-				err = w.w.WriteByte(c)
 
-			} else {
 
-				_, err = fmt.Fprintf(w.w, "\\%03o", c)
 
-			}
 
-		}
 
-		if err != nil {
 
-			return err
 
-		}
 
-	}
 
-	return w.WriteByte('"')
 
-}
 
-
 
-func writeUnknownStruct(w *textWriter, data []byte) (err error) {
 
-	if !w.compact {
 
-		if _, err := fmt.Fprintf(w, "/* %d unknown bytes */\n", len(data)); err != nil {
 
-			return err
 
-		}
 
-	}
 
-	b := NewBuffer(data)
 
-	for b.index < len(b.buf) {
 
-		x, err := b.DecodeVarint()
 
-		if err != nil {
 
-			_, err := fmt.Fprintf(w, "/* %v */\n", err)
 
-			return err
 
-		}
 
-		wire, tag := x&7, x>>3
 
-		if wire == WireEndGroup {
 
-			w.unindent()
 
-			if _, err := w.Write(endBraceNewline); err != nil {
 
-				return err
 
-			}
 
-			continue
 
-		}
 
-		if _, err := fmt.Fprint(w, tag); err != nil {
 
-			return err
 
-		}
 
-		if wire != WireStartGroup {
 
-			if err := w.WriteByte(':'); err != nil {
 
-				return err
 
-			}
 
-		}
 
-		if !w.compact || wire == WireStartGroup {
 
-			if err := w.WriteByte(' '); err != nil {
 
-				return err
 
-			}
 
-		}
 
-		switch wire {
 
-		case WireBytes:
 
-			buf, e := b.DecodeRawBytes(false)
 
-			if e == nil {
 
-				_, err = fmt.Fprintf(w, "%q", buf)
 
-			} else {
 
-				_, err = fmt.Fprintf(w, "/* %v */", e)
 
-			}
 
-		case WireFixed32:
 
-			x, err = b.DecodeFixed32()
 
-			err = writeUnknownInt(w, x, err)
 
-		case WireFixed64:
 
-			x, err = b.DecodeFixed64()
 
-			err = writeUnknownInt(w, x, err)
 
-		case WireStartGroup:
 
-			err = w.WriteByte('{')
 
-			w.indent()
 
-		case WireVarint:
 
-			x, err = b.DecodeVarint()
 
-			err = writeUnknownInt(w, x, err)
 
-		default:
 
-			_, err = fmt.Fprintf(w, "/* unknown wire type %d */", wire)
 
-		}
 
-		if err != nil {
 
-			return err
 
-		}
 
-		if err = w.WriteByte('\n'); err != nil {
 
-			return err
 
-		}
 
-	}
 
-	return nil
 
-}
 
-
 
-func writeUnknownInt(w *textWriter, x uint64, err error) error {
 
-	if err == nil {
 
-		_, err = fmt.Fprint(w, x)
 
-	} else {
 
-		_, err = fmt.Fprintf(w, "/* %v */", err)
 
-	}
 
-	return err
 
-}
 
-
 
-type int32Slice []int32
 
-
 
-func (s int32Slice) Len() int           { return len(s) }
 
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
 
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
 
-
 
-// writeExtensions writes all the extensions in pv.
 
-// pv is assumed to be a pointer to a protocol message struct that is extendable.
 
-func (tm *TextMarshaler) writeExtensions(w *textWriter, pv reflect.Value) error {
 
-	emap := extensionMaps[pv.Type().Elem()]
 
-	ep, _ := extendable(pv.Interface())
 
-
 
-	// Order the extensions by ID.
 
-	// This isn't strictly necessary, but it will give us
 
-	// canonical output, which will also make testing easier.
 
-	m, mu := ep.extensionsRead()
 
-	if m == nil {
 
-		return nil
 
-	}
 
-	mu.Lock()
 
-	ids := make([]int32, 0, len(m))
 
-	for id := range m {
 
-		ids = append(ids, id)
 
-	}
 
-	sort.Sort(int32Slice(ids))
 
-	mu.Unlock()
 
-
 
-	for _, extNum := range ids {
 
-		ext := m[extNum]
 
-		var desc *ExtensionDesc
 
-		if emap != nil {
 
-			desc = emap[extNum]
 
-		}
 
-		if desc == nil {
 
-			// Unknown extension.
 
-			if err := writeUnknownStruct(w, ext.enc); err != nil {
 
-				return err
 
-			}
 
-			continue
 
-		}
 
-
 
-		pb, err := GetExtension(ep, desc)
 
-		if err != nil {
 
-			return fmt.Errorf("failed getting extension: %v", err)
 
-		}
 
-
 
-		// Repeated extensions will appear as a slice.
 
-		if !desc.repeated() {
 
-			if err := tm.writeExtension(w, desc.Name, pb); err != nil {
 
-				return err
 
-			}
 
-		} else {
 
-			v := reflect.ValueOf(pb)
 
-			for i := 0; i < v.Len(); i++ {
 
-				if err := tm.writeExtension(w, desc.Name, v.Index(i).Interface()); err != nil {
 
-					return err
 
-				}
 
-			}
 
-		}
 
-	}
 
-	return nil
 
-}
 
-
 
-func (tm *TextMarshaler) writeExtension(w *textWriter, name string, pb interface{}) error {
 
-	if _, err := fmt.Fprintf(w, "[%s]:", name); err != nil {
 
-		return err
 
-	}
 
-	if !w.compact {
 
-		if err := w.WriteByte(' '); err != nil {
 
-			return err
 
-		}
 
-	}
 
-	if err := tm.writeAny(w, reflect.ValueOf(pb), nil); err != nil {
 
-		return err
 
-	}
 
-	if err := w.WriteByte('\n'); err != nil {
 
-		return err
 
-	}
 
-	return nil
 
-}
 
-
 
-func (w *textWriter) writeIndent() {
 
-	if !w.complete {
 
-		return
 
-	}
 
-	remain := w.ind * 2
 
-	for remain > 0 {
 
-		n := remain
 
-		if n > len(spaces) {
 
-			n = len(spaces)
 
-		}
 
-		w.w.Write(spaces[:n])
 
-		remain -= n
 
-	}
 
-	w.complete = false
 
-}
 
-
 
-// TextMarshaler is a configurable text format marshaler.
 
-type TextMarshaler struct {
 
-	Compact   bool // use compact text format (one line).
 
-	ExpandAny bool // expand google.protobuf.Any messages of known types
 
-}
 
-
 
-// Marshal writes a given protocol buffer in text format.
 
-// The only errors returned are from w.
 
-func (tm *TextMarshaler) Marshal(w io.Writer, pb Message) error {
 
-	val := reflect.ValueOf(pb)
 
-	if pb == nil || val.IsNil() {
 
-		w.Write([]byte("<nil>"))
 
-		return nil
 
-	}
 
-	var bw *bufio.Writer
 
-	ww, ok := w.(writer)
 
-	if !ok {
 
-		bw = bufio.NewWriter(w)
 
-		ww = bw
 
-	}
 
-	aw := &textWriter{
 
-		w:        ww,
 
-		complete: true,
 
-		compact:  tm.Compact,
 
-	}
 
-
 
-	if etm, ok := pb.(encoding.TextMarshaler); ok {
 
-		text, err := etm.MarshalText()
 
-		if err != nil {
 
-			return err
 
-		}
 
-		if _, err = aw.Write(text); err != nil {
 
-			return err
 
-		}
 
-		if bw != nil {
 
-			return bw.Flush()
 
-		}
 
-		return nil
 
-	}
 
-	// Dereference the received pointer so we don't have outer < and >.
 
-	v := reflect.Indirect(val)
 
-	if err := tm.writeStruct(aw, v); err != nil {
 
-		return err
 
-	}
 
-	if bw != nil {
 
-		return bw.Flush()
 
-	}
 
-	return nil
 
-}
 
-
 
-// Text is the same as Marshal, but returns the string directly.
 
-func (tm *TextMarshaler) Text(pb Message) string {
 
-	var buf bytes.Buffer
 
-	tm.Marshal(&buf, pb)
 
-	return buf.String()
 
-}
 
-
 
-var (
 
-	defaultTextMarshaler = TextMarshaler{}
 
-	compactTextMarshaler = TextMarshaler{Compact: true}
 
-)
 
-
 
-// TODO: consider removing some of the Marshal functions below.
 
-
 
-// MarshalText writes a given protocol buffer in text format.
 
-// The only errors returned are from w.
 
-func MarshalText(w io.Writer, pb Message) error { return defaultTextMarshaler.Marshal(w, pb) }
 
-
 
-// MarshalTextString is the same as MarshalText, but returns the string directly.
 
-func MarshalTextString(pb Message) string { return defaultTextMarshaler.Text(pb) }
 
-
 
-// CompactText writes a given protocol buffer in compact text format (one line).
 
-func CompactText(w io.Writer, pb Message) error { return compactTextMarshaler.Marshal(w, pb) }
 
-
 
-// CompactTextString is the same as CompactText, but returns the string directly.
 
-func CompactTextString(pb Message) string { return compactTextMarshaler.Text(pb) }

+ 801 - 0
vendor/github.com/golang/protobuf/proto/text_decode.go
Просмотреть файл 

@@ -0,0 +1,801 @@
 
+// Copyright 2010 The Go Authors. All rights reserved.
 
+// Use of this source code is governed by a BSD-style
 
+// license that can be found in the LICENSE file.
 
+
 
+package proto
 
+
 
+import (
 
+	"encoding"
 
+	"errors"
 
+	"fmt"
 
+	"reflect"
 
+	"strconv"
 
+	"strings"
 
+	"unicode/utf8"
 
+
 
+	"google.golang.org/protobuf/encoding/prototext"
 
+	protoV2 "google.golang.org/protobuf/proto"
 
+	"google.golang.org/protobuf/reflect/protoreflect"
 
+	"google.golang.org/protobuf/reflect/protoregistry"
 
+)
 
+
 
+const wrapTextUnmarshalV2 = false
 
+
 
+// ParseError is returned by UnmarshalText.
 
+type ParseError struct {
 
+	Message string
 
+
 
+	// Deprecated: Do not use.
 
+	Line, Offset int
 
+}
 
+
 
+func (e *ParseError) Error() string {
 
+	if wrapTextUnmarshalV2 {
 
+		return e.Message
 
+	}
 
+	if e.Line == 1 {
 
+		return fmt.Sprintf("line 1.%d: %v", e.Offset, e.Message)
 
+	}
 
+	return fmt.Sprintf("line %d: %v", e.Line, e.Message)
 
+}
 
+
 
+// UnmarshalText parses a proto text formatted string into m.
 
+func UnmarshalText(s string, m Message) error {
 
+	if u, ok := m.(encoding.TextUnmarshaler); ok {
 
+		return u.UnmarshalText([]byte(s))
 
+	}
 
+
 
+	m.Reset()
 
+	mi := MessageV2(m)
 
+
 
+	if wrapTextUnmarshalV2 {
 
+		err := prototext.UnmarshalOptions{
 
+			AllowPartial: true,
 
+		}.Unmarshal([]byte(s), mi)
 
+		if err != nil {
 
+			return &ParseError{Message: err.Error()}
 
+		}
 
+		return checkRequiredNotSet(mi)
 
+	} else {
 
+		if err := newTextParser(s).unmarshalMessage(mi.ProtoReflect(), ""); err != nil {
 
+			return err
 
+		}
 
+		return checkRequiredNotSet(mi)
 
+	}
 
+}
 
+
 
+type textParser struct {
 
+	s            string // remaining input
 
+	done         bool   // whether the parsing is finished (success or error)
 
+	backed       bool   // whether back() was called
 
+	offset, line int
 
+	cur          token
 
+}
 
+
 
+type token struct {
 
+	value    string
 
+	err      *ParseError
 
+	line     int    // line number
 
+	offset   int    // byte number from start of input, not start of line
 
+	unquoted string // the unquoted version of value, if it was a quoted string
 
+}
 
+
 
+func newTextParser(s string) *textParser {
 
+	p := new(textParser)
 
+	p.s = s
 
+	p.line = 1
 
+	p.cur.line = 1
 
+	return p
 
+}
 
+
 
+func (p *textParser) unmarshalMessage(m protoreflect.Message, terminator string) (err error) {
 
+	md := m.Descriptor()
 
+	fds := md.Fields()
 
+
 
+	// A struct is a sequence of "name: value", terminated by one of
 
+	// '>' or '}', or the end of the input.  A name may also be
 
+	// "[extension]" or "[type/url]".
 
+	//
 
+	// The whole struct can also be an expanded Any message, like:
 
+	// [type/url] < ... struct contents ... >
 
+	seen := make(map[protoreflect.FieldNumber]bool)
 
+	for {
 
+		tok := p.next()
 
+		if tok.err != nil {
 
+			return tok.err
 
+		}
 
+		if tok.value == terminator {
 
+			break
 
+		}
 
+		if tok.value == "[" {
 
+			if err := p.unmarshalExtensionOrAny(m, seen); err != nil {
 
+				return err
 
+			}
 
+			continue
 
+		}
 
+
 
+		// This is a normal, non-extension field.
 
+		name := protoreflect.Name(tok.value)
 
+		fd := fds.ByName(name)
 
+		switch {
 
+		case fd == nil:
 
+			gd := fds.ByName(protoreflect.Name(strings.ToLower(string(name))))
 
+			if gd != nil && gd.Kind() == protoreflect.GroupKind && gd.Message().Name() == name {
 
+				fd = gd
 
+			}
 
+		case fd.Kind() == protoreflect.GroupKind && fd.Message().Name() != name:
 
+			fd = nil
 
+		case fd.IsWeak() && fd.Message().IsPlaceholder():
 
+			fd = nil
 
+		}
 
+		if fd == nil {
 
+			typeName := string(md.FullName())
 
+			if m, ok := m.Interface().(Message); ok {
 
+				t := reflect.TypeOf(m)
 
+				if t.Kind() == reflect.Ptr {
 
+					typeName = t.Elem().String()
 
+				}
 
+			}
 
+			return p.errorf("unknown field name %q in %v", name, typeName)
 
+		}
 
+		if od := fd.ContainingOneof(); od != nil && m.WhichOneof(od) != nil {
 
+			return p.errorf("field '%s' would overwrite already parsed oneof '%s'", name, od.Name())
 
+		}
 
+		if fd.Cardinality() != protoreflect.Repeated && seen[fd.Number()] {
 
+			return p.errorf("non-repeated field %q was repeated", fd.Name())
 
+		}
 
+		seen[fd.Number()] = true
 
+
 
+		// Consume any colon.
 
+		if err := p.checkForColon(fd); err != nil {
 
+			return err
 
+		}
 
+
 
+		// Parse into the field.
 
+		v := m.Get(fd)
 
+		if !m.Has(fd) && (fd.IsList() || fd.IsMap() || fd.Message() != nil) {
 
+			v = m.Mutable(fd)
 
+		}
 
+		if v, err = p.unmarshalValue(v, fd); err != nil {
 
+			return err
 
+		}
 
+		m.Set(fd, v)
 
+
 
+		if err := p.consumeOptionalSeparator(); err != nil {
 
+			return err
 
+		}
 
+	}
 
+	return nil
 
+}
 
+
 
+func (p *textParser) unmarshalExtensionOrAny(m protoreflect.Message, seen map[protoreflect.FieldNumber]bool) error {
 
+	name, err := p.consumeExtensionOrAnyName()
 
+	if err != nil {
 
+		return err
 
+	}
 
+
 
+	// If it contains a slash, it's an Any type URL.
 
+	if slashIdx := strings.LastIndex(name, "/"); slashIdx >= 0 {
 
+		tok := p.next()
 
+		if tok.err != nil {
 
+			return tok.err
 
+		}
 
+		// consume an optional colon
 
+		if tok.value == ":" {
 
+			tok = p.next()
 
+			if tok.err != nil {
 
+				return tok.err
 
+			}
 
+		}
 
+
 
+		var terminator string
 
+		switch tok.value {
 
+		case "<":
 
+			terminator = ">"
 
+		case "{":
 
+			terminator = "}"
 
+		default:
 
+			return p.errorf("expected '{' or '<', found %q", tok.value)
 
+		}
 
+
 
+		mt, err := protoregistry.GlobalTypes.FindMessageByURL(name)
 
+		if err != nil {
 
+			return p.errorf("unrecognized message %q in google.protobuf.Any", name[slashIdx+len("/"):])
 
+		}
 
+		m2 := mt.New()
 
+		if err := p.unmarshalMessage(m2, terminator); err != nil {
 
+			return err
 
+		}
 
+		b, err := protoV2.Marshal(m2.Interface())
 
+		if err != nil {
 
+			return p.errorf("failed to marshal message of type %q: %v", name[slashIdx+len("/"):], err)
 
+		}
 
+
 
+		urlFD := m.Descriptor().Fields().ByName("type_url")
 
+		valFD := m.Descriptor().Fields().ByName("value")
 
+		if seen[urlFD.Number()] {
 
+			return p.errorf("Any message unpacked multiple times, or %q already set", urlFD.Name())
 
+		}
 
+		if seen[valFD.Number()] {
 
+			return p.errorf("Any message unpacked multiple times, or %q already set", valFD.Name())
 
+		}
 
+		m.Set(urlFD, protoreflect.ValueOfString(name))
 
+		m.Set(valFD, protoreflect.ValueOfBytes(b))
 
+		seen[urlFD.Number()] = true
 
+		seen[valFD.Number()] = true
 
+		return nil
 
+	}
 
+
 
+	xname := protoreflect.FullName(name)
 
+	xt, _ := protoregistry.GlobalTypes.FindExtensionByName(xname)
 
+	if xt == nil && isMessageSet(m.Descriptor()) {
 
+		xt, _ = protoregistry.GlobalTypes.FindExtensionByName(xname.Append("message_set_extension"))
 
+	}
 
+	if xt == nil {
 
+		return p.errorf("unrecognized extension %q", name)
 
+	}
 
+	fd := xt.TypeDescriptor()
 
+	if fd.ContainingMessage().FullName() != m.Descriptor().FullName() {
 
+		return p.errorf("extension field %q does not extend message %q", name, m.Descriptor().FullName())
 
+	}
 
+
 
+	if err := p.checkForColon(fd); err != nil {
 
+		return err
 
+	}
 
+
 
+	v := m.Get(fd)
 
+	if !m.Has(fd) && (fd.IsList() || fd.IsMap() || fd.Message() != nil) {
 
+		v = m.Mutable(fd)
 
+	}
 
+	v, err = p.unmarshalValue(v, fd)
 
+	if err != nil {
 
+		return err
 
+	}
 
+	m.Set(fd, v)
 
+	return p.consumeOptionalSeparator()
 
+}
 
+
 
+func (p *textParser) unmarshalValue(v protoreflect.Value, fd protoreflect.FieldDescriptor) (protoreflect.Value, error) {
 
+	tok := p.next()
 
+	if tok.err != nil {
 
+		return v, tok.err
 
+	}
 
+	if tok.value == "" {
 
+		return v, p.errorf("unexpected EOF")
 
+	}
 
+
 
+	switch {
 
+	case fd.IsList():
 
+		lv := v.List()
 
+		var err error
 
+		if tok.value == "[" {
 
+			// Repeated field with list notation, like [1,2,3].
 
+			for {
 
+				vv := lv.NewElement()
 
+				vv, err = p.unmarshalSingularValue(vv, fd)
 
+				if err != nil {
 
+					return v, err
 
+				}
 
+				lv.Append(vv)
 
+
 
+				tok := p.next()
 
+				if tok.err != nil {
 
+					return v, tok.err
 
+				}
 
+				if tok.value == "]" {
 
+					break
 
+				}
 
+				if tok.value != "," {
 
+					return v, p.errorf("Expected ']' or ',' found %q", tok.value)
 
+				}
 
+			}
 
+			return v, nil
 
+		}
 
+
 
+		// One value of the repeated field.
 
+		p.back()
 
+		vv := lv.NewElement()
 
+		vv, err = p.unmarshalSingularValue(vv, fd)
 
+		if err != nil {
 
+			return v, err
 
+		}
 
+		lv.Append(vv)
 
+		return v, nil
 
+	case fd.IsMap():
 
+		// The map entry should be this sequence of tokens:
 
+		//	< key : KEY value : VALUE >
 
+		// However, implementations may omit key or value, and technically
 
+		// we should support them in any order.
 
+		var terminator string
 
+		switch tok.value {
 
+		case "<":
 
+			terminator = ">"
 
+		case "{":
 
+			terminator = "}"
 
+		default:
 
+			return v, p.errorf("expected '{' or '<', found %q", tok.value)
 
+		}
 
+
 
+		keyFD := fd.MapKey()
 
+		valFD := fd.MapValue()
 
+
 
+		mv := v.Map()
 
+		kv := keyFD.Default()
 
+		vv := mv.NewValue()
 
+		for {
 
+			tok := p.next()
 
+			if tok.err != nil {
 
+				return v, tok.err
 
+			}
 
+			if tok.value == terminator {
 
+				break
 
+			}
 
+			var err error
 
+			switch tok.value {
 
+			case "key":
 
+				if err := p.consumeToken(":"); err != nil {
 
+					return v, err
 
+				}
 
+				if kv, err = p.unmarshalSingularValue(kv, keyFD); err != nil {
 
+					return v, err
 
+				}
 
+				if err := p.consumeOptionalSeparator(); err != nil {
 
+					return v, err
 
+				}
 
+			case "value":
 
+				if err := p.checkForColon(valFD); err != nil {
 
+					return v, err
 
+				}
 
+				if vv, err = p.unmarshalSingularValue(vv, valFD); err != nil {
 
+					return v, err
 
+				}
 
+				if err := p.consumeOptionalSeparator(); err != nil {
 
+					return v, err
 
+				}
 
+			default:
 
+				p.back()
 
+				return v, p.errorf(`expected "key", "value", or %q, found %q`, terminator, tok.value)
 
+			}
 
+		}
 
+		mv.Set(kv.MapKey(), vv)
 
+		return v, nil
 
+	default:
 
+		p.back()
 
+		return p.unmarshalSingularValue(v, fd)
 
+	}
 
+}
 
+
 
+func (p *textParser) unmarshalSingularValue(v protoreflect.Value, fd protoreflect.FieldDescriptor) (protoreflect.Value, error) {
 
+	tok := p.next()
 
+	if tok.err != nil {
 
+		return v, tok.err
 
+	}
 
+	if tok.value == "" {
 
+		return v, p.errorf("unexpected EOF")
 
+	}
 
+
 
+	switch fd.Kind() {
 
+	case protoreflect.BoolKind:
 
+		switch tok.value {
 
+		case "true", "1", "t", "True":
 
+			return protoreflect.ValueOfBool(true), nil
 
+		case "false", "0", "f", "False":
 
+			return protoreflect.ValueOfBool(false), nil
 
+		}
 
+	case protoreflect.Int32Kind, protoreflect.Sint32Kind, protoreflect.Sfixed32Kind:
 
+		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
 
+			return protoreflect.ValueOfInt32(int32(x)), nil
 
+		}
 
+
 
+		// The C++ parser accepts large positive hex numbers that uses
 
+		// two's complement arithmetic to represent negative numbers.
 
+		// This feature is here for backwards compatibility with C++.
 
+		if strings.HasPrefix(tok.value, "0x") {
 
+			if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
 
+				return protoreflect.ValueOfInt32(int32(-(int64(^x) + 1))), nil
 
+			}
 
+		}
 
+	case protoreflect.Int64Kind, protoreflect.Sint64Kind, protoreflect.Sfixed64Kind:
 
+		if x, err := strconv.ParseInt(tok.value, 0, 64); err == nil {
 
+			return protoreflect.ValueOfInt64(int64(x)), nil
 
+		}
 
+
 
+		// The C++ parser accepts large positive hex numbers that uses
 
+		// two's complement arithmetic to represent negative numbers.
 
+		// This feature is here for backwards compatibility with C++.
 
+		if strings.HasPrefix(tok.value, "0x") {
 
+			if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
 
+				return protoreflect.ValueOfInt64(int64(-(int64(^x) + 1))), nil
 
+			}
 
+		}
 
+	case protoreflect.Uint32Kind, protoreflect.Fixed32Kind:
 
+		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
 
+			return protoreflect.ValueOfUint32(uint32(x)), nil
 
+		}
 
+	case protoreflect.Uint64Kind, protoreflect.Fixed64Kind:
 
+		if x, err := strconv.ParseUint(tok.value, 0, 64); err == nil {
 
+			return protoreflect.ValueOfUint64(uint64(x)), nil
 
+		}
 
+	case protoreflect.FloatKind:
 
+		// Ignore 'f' for compatibility with output generated by C++,
 
+		// but don't remove 'f' when the value is "-inf" or "inf".
 
+		v := tok.value
 
+		if strings.HasSuffix(v, "f") && v != "-inf" && v != "inf" {
 
+			v = v[:len(v)-len("f")]
 
+		}
 
+		if x, err := strconv.ParseFloat(v, 32); err == nil {
 
+			return protoreflect.ValueOfFloat32(float32(x)), nil
 
+		}
 
+	case protoreflect.DoubleKind:
 
+		// Ignore 'f' for compatibility with output generated by C++,
 
+		// but don't remove 'f' when the value is "-inf" or "inf".
 
+		v := tok.value
 
+		if strings.HasSuffix(v, "f") && v != "-inf" && v != "inf" {
 
+			v = v[:len(v)-len("f")]
 
+		}
 
+		if x, err := strconv.ParseFloat(v, 64); err == nil {
 
+			return protoreflect.ValueOfFloat64(float64(x)), nil
 
+		}
 
+	case protoreflect.StringKind:
 
+		if isQuote(tok.value[0]) {
 
+			return protoreflect.ValueOfString(tok.unquoted), nil
 
+		}
 
+	case protoreflect.BytesKind:
 
+		if isQuote(tok.value[0]) {
 
+			return protoreflect.ValueOfBytes([]byte(tok.unquoted)), nil
 
+		}
 
+	case protoreflect.EnumKind:
 
+		if x, err := strconv.ParseInt(tok.value, 0, 32); err == nil {
 
+			return protoreflect.ValueOfEnum(protoreflect.EnumNumber(x)), nil
 
+		}
 
+		vd := fd.Enum().Values().ByName(protoreflect.Name(tok.value))
 
+		if vd != nil {
 
+			return protoreflect.ValueOfEnum(vd.Number()), nil
 
+		}
 
+	case protoreflect.MessageKind, protoreflect.GroupKind:
 
+		var terminator string
 
+		switch tok.value {
 
+		case "{":
 
+			terminator = "}"
 
+		case "<":
 
+			terminator = ">"
 
+		default:
 
+			return v, p.errorf("expected '{' or '<', found %q", tok.value)
 
+		}
 
+		err := p.unmarshalMessage(v.Message(), terminator)
 
+		return v, err
 
+	default:
 
+		panic(fmt.Sprintf("invalid kind %v", fd.Kind()))
 
+	}
 
+	return v, p.errorf("invalid %v: %v", fd.Kind(), tok.value)
 
+}
 
+
 
+// Consume a ':' from the input stream (if the next token is a colon),
 
+// returning an error if a colon is needed but not present.
 
+func (p *textParser) checkForColon(fd protoreflect.FieldDescriptor) *ParseError {
 
+	tok := p.next()
 
+	if tok.err != nil {
 
+		return tok.err
 
+	}
 
+	if tok.value != ":" {
 
+		if fd.Message() == nil {
 
+			return p.errorf("expected ':', found %q", tok.value)
 
+		}
 
+		p.back()
 
+	}
 
+	return nil
 
+}
 
+
 
+// consumeExtensionOrAnyName consumes an extension name or an Any type URL and
 
+// the following ']'. It returns the name or URL consumed.
 
+func (p *textParser) consumeExtensionOrAnyName() (string, error) {
 
+	tok := p.next()
 
+	if tok.err != nil {
 
+		return "", tok.err
 
+	}
 
+
 
+	// If extension name or type url is quoted, it's a single token.
 
+	if len(tok.value) > 2 && isQuote(tok.value[0]) && tok.value[len(tok.value)-1] == tok.value[0] {
 
+		name, err := unquoteC(tok.value[1:len(tok.value)-1], rune(tok.value[0]))
 
+		if err != nil {
 
+			return "", err
 
+		}
 
+		return name, p.consumeToken("]")
 
+	}
 
+
 
+	// Consume everything up to "]"
 
+	var parts []string
 
+	for tok.value != "]" {
 
+		parts = append(parts, tok.value)
 
+		tok = p.next()
 
+		if tok.err != nil {
 
+			return "", p.errorf("unrecognized type_url or extension name: %s", tok.err)
 
+		}
 
+		if p.done && tok.value != "]" {
 
+			return "", p.errorf("unclosed type_url or extension name")
 
+		}
 
+	}
 
+	return strings.Join(parts, ""), nil
 
+}
 
+
 
+// consumeOptionalSeparator consumes an optional semicolon or comma.
 
+// It is used in unmarshalMessage to provide backward compatibility.
 
+func (p *textParser) consumeOptionalSeparator() error {
 
+	tok := p.next()
 
+	if tok.err != nil {
 
+		return tok.err
 
+	}
 
+	if tok.value != ";" && tok.value != "," {
 
+		p.back()
 
+	}
 
+	return nil
 
+}
 
+
 
+func (p *textParser) errorf(format string, a ...interface{}) *ParseError {
 
+	pe := &ParseError{fmt.Sprintf(format, a...), p.cur.line, p.cur.offset}
 
+	p.cur.err = pe
 
+	p.done = true
 
+	return pe
 
+}
 
+
 
+func (p *textParser) skipWhitespace() {
 
+	i := 0
 
+	for i < len(p.s) && (isWhitespace(p.s[i]) || p.s[i] == '#') {
 
+		if p.s[i] == '#' {
 
+			// comment; skip to end of line or input
 
+			for i < len(p.s) && p.s[i] != '\n' {
 
+				i++
 
+			}
 
+			if i == len(p.s) {
 
+				break
 
+			}
 
+		}
 
+		if p.s[i] == '\n' {
 
+			p.line++
 
+		}
 
+		i++
 
+	}
 
+	p.offset += i
 
+	p.s = p.s[i:len(p.s)]
 
+	if len(p.s) == 0 {
 
+		p.done = true
 
+	}
 
+}
 
+
 
+func (p *textParser) advance() {
 
+	// Skip whitespace
 
+	p.skipWhitespace()
 
+	if p.done {
 
+		return
 
+	}
 
+
 
+	// Start of non-whitespace
 
+	p.cur.err = nil
 
+	p.cur.offset, p.cur.line = p.offset, p.line
 
+	p.cur.unquoted = ""
 
+	switch p.s[0] {
 
+	case '<', '>', '{', '}', ':', '[', ']', ';', ',', '/':
 
+		// Single symbol
 
+		p.cur.value, p.s = p.s[0:1], p.s[1:len(p.s)]
 
+	case '"', '\'':
 
+		// Quoted string
 
+		i := 1
 
+		for i < len(p.s) && p.s[i] != p.s[0] && p.s[i] != '\n' {
 
+			if p.s[i] == '\\' && i+1 < len(p.s) {
 
+				// skip escaped char
 
+				i++
 
+			}
 
+			i++
 
+		}
 
+		if i >= len(p.s) || p.s[i] != p.s[0] {
 
+			p.errorf("unmatched quote")
 
+			return
 
+		}
 
+		unq, err := unquoteC(p.s[1:i], rune(p.s[0]))
 
+		if err != nil {
 
+			p.errorf("invalid quoted string %s: %v", p.s[0:i+1], err)
 
+			return
 
+		}
 
+		p.cur.value, p.s = p.s[0:i+1], p.s[i+1:len(p.s)]
 
+		p.cur.unquoted = unq
 
+	default:
 
+		i := 0
 
+		for i < len(p.s) && isIdentOrNumberChar(p.s[i]) {
 
+			i++
 
+		}
 
+		if i == 0 {
 
+			p.errorf("unexpected byte %#x", p.s[0])
 
+			return
 
+		}
 
+		p.cur.value, p.s = p.s[0:i], p.s[i:len(p.s)]
 
+	}
 
+	p.offset += len(p.cur.value)
 
+}
 
+
 
+// Back off the parser by one token. Can only be done between calls to next().
 
+// It makes the next advance() a no-op.
 
+func (p *textParser) back() { p.backed = true }
 
+
 
+// Advances the parser and returns the new current token.
 
+func (p *textParser) next() *token {
 
+	if p.backed || p.done {
 
+		p.backed = false
 
+		return &p.cur
 
+	}
 
+	p.advance()
 
+	if p.done {
 
+		p.cur.value = ""
 
+	} else if len(p.cur.value) > 0 && isQuote(p.cur.value[0]) {
 
+		// Look for multiple quoted strings separated by whitespace,
 
+		// and concatenate them.
 
+		cat := p.cur
 
+		for {
 
+			p.skipWhitespace()
 
+			if p.done || !isQuote(p.s[0]) {
 
+				break
 
+			}
 
+			p.advance()
 
+			if p.cur.err != nil {
 
+				return &p.cur
 
+			}
 
+			cat.value += " " + p.cur.value
 
+			cat.unquoted += p.cur.unquoted
 
+		}
 
+		p.done = false // parser may have seen EOF, but we want to return cat
 
+		p.cur = cat
 
+	}
 
+	return &p.cur
 
+}
 
+
 
+func (p *textParser) consumeToken(s string) error {
 
+	tok := p.next()
 
+	if tok.err != nil {
 
+		return tok.err
 
+	}
 
+	if tok.value != s {
 
+		p.back()
 
+		return p.errorf("expected %q, found %q", s, tok.value)
 
+	}
 
+	return nil
 
+}
 
+
 
+var errBadUTF8 = errors.New("proto: bad UTF-8")
 
+
 
+func unquoteC(s string, quote rune) (string, error) {
 
+	// This is based on C++'s tokenizer.cc.
 
+	// Despite its name, this is *not* parsing C syntax.
 
+	// For instance, "\0" is an invalid quoted string.
 
+
 
+	// Avoid allocation in trivial cases.
 
+	simple := true
 
+	for _, r := range s {
 
+		if r == '\\' || r == quote {
 
+			simple = false
 
+			break
 
+		}
 
+	}
 
+	if simple {
 
+		return s, nil
 
+	}
 
+
 
+	buf := make([]byte, 0, 3*len(s)/2)
 
+	for len(s) > 0 {
 
+		r, n := utf8.DecodeRuneInString(s)
 
+		if r == utf8.RuneError && n == 1 {
 
+			return "", errBadUTF8
 
+		}
 
+		s = s[n:]
 
+		if r != '\\' {
 
+			if r < utf8.RuneSelf {
 
+				buf = append(buf, byte(r))
 
+			} else {
 
+				buf = append(buf, string(r)...)
 
+			}
 
+			continue
 
+		}
 
+
 
+		ch, tail, err := unescape(s)
 
+		if err != nil {
 
+			return "", err
 
+		}
 
+		buf = append(buf, ch...)
 
+		s = tail
 
+	}
 
+	return string(buf), nil
 
+}
 
+
 
+func unescape(s string) (ch string, tail string, err error) {
 
+	r, n := utf8.DecodeRuneInString(s)
 
+	if r == utf8.RuneError && n == 1 {
 
+		return "", "", errBadUTF8
 
+	}
 
+	s = s[n:]
 
+	switch r {
 
+	case 'a':
 
+		return "\a", s, nil
 
+	case 'b':
 
+		return "\b", s, nil
 
+	case 'f':
 
+		return "\f", s, nil
 
+	case 'n':
 
+		return "\n", s, nil
 
+	case 'r':
 
+		return "\r", s, nil
 
+	case 't':
 
+		return "\t", s, nil
 
+	case 'v':
 
+		return "\v", s, nil
 
+	case '?':
 
+		return "?", s, nil // trigraph workaround
 
+	case '\'', '"', '\\':
 
+		return string(r), s, nil
 
+	case '0', '1', '2', '3', '4', '5', '6', '7':
 
+		if len(s) < 2 {
 
+			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
 
+		}
 
+		ss := string(r) + s[:2]
 
+		s = s[2:]
 
+		i, err := strconv.ParseUint(ss, 8, 8)
 
+		if err != nil {
 
+			return "", "", fmt.Errorf(`\%s contains non-octal digits`, ss)
 
+		}
 
+		return string([]byte{byte(i)}), s, nil
 
+	case 'x', 'X', 'u', 'U':
 
+		var n int
 
+		switch r {
 
+		case 'x', 'X':
 
+			n = 2
 
+		case 'u':
 
+			n = 4
 
+		case 'U':
 
+			n = 8
 
+		}
 
+		if len(s) < n {
 
+			return "", "", fmt.Errorf(`\%c requires %d following digits`, r, n)
 
+		}
 
+		ss := s[:n]
 
+		s = s[n:]
 
+		i, err := strconv.ParseUint(ss, 16, 64)
 
+		if err != nil {
 
+			return "", "", fmt.Errorf(`\%c%s contains non-hexadecimal digits`, r, ss)
 
+		}
 
+		if r == 'x' || r == 'X' {
 
+			return string([]byte{byte(i)}), s, nil
 
+		}
 
+		if i > utf8.MaxRune {
 
+			return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss)
 
+		}
 
+		return string(rune(i)), s, nil
 
+	}
 
+	return "", "", fmt.Errorf(`unknown escape \%c`, r)
 
+}
 
+
 
+func isIdentOrNumberChar(c byte) bool {
 
+	switch {
 
+	case 'A' <= c && c <= 'Z', 'a' <= c && c <= 'z':
 
+		return true
 
+	case '0' <= c && c <= '9':
 
+		return true
 
+	}
 
+	switch c {
 
+	case '-', '+', '.', '_':
 
+		return true
 
+	}
 
+	return false
 
+}
 
+
 
+func isWhitespace(c byte) bool {
 
+	switch c {
 
+	case ' ', '\t', '\n', '\r':
 
+		return true
 
+	}
 
+	return false
 
+}
 
+
 
+func isQuote(c byte) bool {
 
+	switch c {
 
+	case '"', '\'':
 
+		return true
 
+	}
 
+	return false
 
+}

Некоторые файлы не были показаны из-за большого количества измененных файлов