Skip to content

Commit bb95389

Browse files
authored
Fix for slices version incompatibilities
Removed use of "slices" to prevent version incompatibilities. Also removed two errant debug messages in struct reading.
1 parent 8d840bd commit bb95389

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

nosqldb/internal/proto/binary/struct_reader.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ func (sr *StructReader) DiscardMap() error {
5050
}
5151
for i := 0; i < size; i++ {
5252
// field name
53-
key, err := sr.reader.ReadString()
53+
_, err := sr.reader.ReadString()
5454
if err != nil {
5555
return err
5656
}
57-
fmt.Fprintf(os.Stdout, "Disacrding field '%s'\n", *key)
57+
//fmt.Fprintf(os.Stdout, "Discarding field '%s'\n", *key)
5858
err = sr.ReadFieldValue(reflect.Value{})
5959
if err != nil {
6060
return err
@@ -121,7 +121,7 @@ func (sr *StructReader) ReadMap(v reflect.Value) error {
121121
if err != nil {
122122
return err
123123
}
124-
fmt.Fprintf(os.Stdout, "Handling field '%s'\n", *key)
124+
//fmt.Fprintf(os.Stdout, "Handling field '%s'\n", *key)
125125

126126
// Figure out field corresponding to key.
127127
var subv reflect.Value

nosqldb/internal/proto/binary/struct_writer.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"encoding/binary"
1717
"fmt"
1818
"reflect"
19-
"slices"
2019
"sort"
2120
"strconv"
2221
"strings"
@@ -524,8 +523,8 @@ func (me mapEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
524523
}
525524
sv[i].v = mi.Value()
526525
}
527-
slices.SortFunc(sv, func(i, j reflectWithString) int {
528-
return strings.Compare(i.ks, j.ks)
526+
sort.Slice(sv, func(i, j int) bool {
527+
return sv[i].ks < sv[j].ks
529528
})
530529

531530
if _, err := e.writeOneByte(byte(types.Map)); err != nil {

0 commit comments

Comments
 (0)