fixed bug of binary codec not restoring tags
This commit is contained in:
@@ -35,8 +35,6 @@ type Reader struct {
|
||||
|
||||
// NewReadBuffer returns a new buffer containing the provided slice.
|
||||
func NewReadBuffer(b []byte) (buf *Reader) {
|
||||
// rb := make(B, len(b))
|
||||
// copy(rb, b)
|
||||
return &Reader{Buf: b}
|
||||
}
|
||||
|
||||
@@ -46,9 +44,7 @@ func (r *Reader) ReadID() (id B, err E) {
|
||||
err = io.EOF
|
||||
return
|
||||
}
|
||||
id = make(B, end-r.Pos)
|
||||
copy(id, r.Buf[r.Pos:end])
|
||||
// id = r.Buf[r.Pos:end]
|
||||
id = r.Buf[r.Pos:end]
|
||||
r.Pos = end
|
||||
return
|
||||
}
|
||||
@@ -59,8 +55,7 @@ func (r *Reader) ReadPubKey() (pk B, err E) {
|
||||
err = io.EOF
|
||||
return
|
||||
}
|
||||
pk = make(B, end-r.Pos)
|
||||
copy(pk, r.Buf[r.Pos:end])
|
||||
pk = r.Buf[r.Pos:end]
|
||||
r.Pos = end
|
||||
return
|
||||
}
|
||||
@@ -101,8 +96,7 @@ func (r *Reader) ReadTags() (t *tags.T, err error) {
|
||||
// if nTags > 500 {
|
||||
// log.I.F("new tags with %d elements (follow list probably)", nTags)
|
||||
// }
|
||||
// t = tags.NewWithCap(nTags)
|
||||
t = tags.New()
|
||||
t = tags.NewWithCap(nTags)
|
||||
// t = &tags.T{T: make([]*tag.T, nTags)}
|
||||
// t = make(tags.T, nTags)
|
||||
// iterate through the individual tags
|
||||
@@ -115,7 +109,7 @@ func (r *Reader) ReadTags() (t *tags.T, err error) {
|
||||
lenTag := int(vi)
|
||||
r.Pos += read
|
||||
// log.I.F("adding capacity %d at tag %d", lenTag, i)
|
||||
// t.AddCap(i, lenTag)
|
||||
t.AddCap(i, lenTag)
|
||||
// t.T[i] = tag.NewWithCap(lenTag)
|
||||
// extract the individual tag strings
|
||||
var secondIsHex, secondIsDecimalHex bool
|
||||
@@ -255,7 +249,7 @@ func (r *Reader) ReadEvent() (ev *T, err error) {
|
||||
}
|
||||
|
||||
func (ev *T) UnmarshalBinary(b B) (r B, err E) {
|
||||
er := NewReadBuffer(b)
|
||||
er := &Reader{Buf: b}
|
||||
var re *T
|
||||
if re, err = er.ReadEvent(); chk.E(err) {
|
||||
return
|
||||
|
||||
@@ -201,6 +201,7 @@ func (r *T) QueryEvents(c Ctx, f *filter.T) (evs []*event.T, err E) {
|
||||
f.Serialize())
|
||||
return fmt.Sprintf("%s\nevents,%v", heading, evIds)
|
||||
})
|
||||
// log.I.S(evs)
|
||||
} else {
|
||||
log.T.F("no events found,%s", f.Serialize())
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ func (r *T) SaveEvent(c Ctx, ev *event.T) (err E) {
|
||||
// add the indexes
|
||||
var indexKeys [][]byte
|
||||
indexKeys = GetIndexKeysForEvent(ev, ser)
|
||||
log.I.S(indexKeys)
|
||||
// log.I.S(indexKeys)
|
||||
for _, k := range indexKeys {
|
||||
if err = txn.Set(k, nil); chk.E(err) {
|
||||
return
|
||||
|
||||
@@ -619,7 +619,7 @@ func (s *Server) HandleWebsocket(w http.ResponseWriter, r *http.Request) {
|
||||
removeListener(ws)
|
||||
}
|
||||
s.clientsMu.Unlock()
|
||||
log.T.F("disconnected from %s", ip)
|
||||
// log.T.F("disconnected from %s", ip)
|
||||
}()
|
||||
|
||||
conn.SetReadLimit(maxMessageSize)
|
||||
|
||||
Reference in New Issue
Block a user