[VOL-5051] - Build and deploy voltctl
[VOL-5152]
[VOL-4961]
[VOL-5063]
[VOL-4966]
[VOL-4893]
[VOL-4906]
go.mod
go.sum
vendor/modules.txt
------------------
o Update voltha-lib-go dep to 7.5.3
o Update voltha-protos dep to 5.4.11
o make mod-update
Makefile
makefiles/
o Add more repo:onf-make makefile logic
o make LOCAL_FIX_PERMS=1 mod-update need to work around docker perm problems.
internal/
pkg/
vendor/
---------
o Update copyright ending date to span 2024.
o make mod-update to regenerate vendor/
Change-Id: Ib89fd6a9cc15c7e08b1274b110dd8141832557e9
diff --git a/vendor/github.com/jhump/protoreflect/codec/encode_fields.go b/vendor/github.com/jhump/protoreflect/codec/encode_fields.go
index cda7299..499aa95 100644
--- a/vendor/github.com/jhump/protoreflect/codec/encode_fields.go
+++ b/vendor/github.com/jhump/protoreflect/codec/encode_fields.go
@@ -12,6 +12,20 @@
"github.com/jhump/protoreflect/desc"
)
+// EncodeZigZag64 does zig-zag encoding to convert the given
+// signed 64-bit integer into a form that can be expressed
+// efficiently as a varint, even for negative values.
+func EncodeZigZag64(v int64) uint64 {
+ return (uint64(v) << 1) ^ uint64(v>>63)
+}
+
+// EncodeZigZag32 does zig-zag encoding to convert the given
+// signed 32-bit integer into a form that can be expressed
+// efficiently as a varint, even for negative values.
+func EncodeZigZag32(v int32) uint64 {
+ return uint64((uint32(v) << 1) ^ uint32((v >> 31)))
+}
+
func (cb *Buffer) EncodeFieldValue(fd *desc.FieldDescriptor, val interface{}) error {
if fd.IsMap() {
mp := val.(map[interface{}]interface{})
@@ -19,7 +33,8 @@
keyType := entryType.FindFieldByNumber(1)
valType := entryType.FindFieldByNumber(2)
var entryBuffer Buffer
- if cb.deterministic {
+ if cb.IsDeterministic() {
+ entryBuffer.SetDeterministic(true)
keys := make([]interface{}, 0, len(mp))
for k := range mp {
keys = append(keys, k)
@@ -31,8 +46,11 @@
if err := entryBuffer.encodeFieldElement(keyType, k); err != nil {
return err
}
- if err := entryBuffer.encodeFieldElement(valType, v); err != nil {
- return err
+ rv := reflect.ValueOf(v)
+ if rv.Kind() != reflect.Ptr || !rv.IsNil() {
+ if err := entryBuffer.encodeFieldElement(valType, v); err != nil {
+ return err
+ }
}
if err := cb.EncodeTagAndWireType(fd.GetNumber(), proto.WireBytes); err != nil {
return err
@@ -47,8 +65,11 @@
if err := entryBuffer.encodeFieldElement(keyType, k); err != nil {
return err
}
- if err := entryBuffer.encodeFieldElement(valType, v); err != nil {
- return err
+ rv := reflect.ValueOf(v)
+ if rv.Kind() != reflect.Ptr || !rv.IsNil() {
+ if err := entryBuffer.encodeFieldElement(valType, v); err != nil {
+ return err
+ }
}
if err := cb.EncodeTagAndWireType(fd.GetNumber(), proto.WireBytes); err != nil {
return err
@@ -65,7 +86,7 @@
if err != nil {
return err
}
- if isPacked(fd) && len(sl) > 1 &&
+ if isPacked(fd) && len(sl) > 0 &&
(wt == proto.WireVarint || wt == proto.WireFixed32 || wt == proto.WireFixed64) {
// packed repeated field
var packedBuffer Buffer