add repeat boost filtering logic, update go-structr, general improvements

This commit is contained in:
kim 2025-04-07 17:46:17 +01:00
commit 50805fac53
10 changed files with 153 additions and 114 deletions

View file

@ -1,6 +1,7 @@
package structr
import (
"fmt"
"os"
"reflect"
"strings"
@ -222,10 +223,10 @@ func (i *Index) get(key string, hook func(*indexed_item)) {
func (i *Index) key(buf *byteutil.Buffer, parts []unsafe.Pointer) string {
buf.B = buf.B[:0]
if len(parts) != len(i.fields) {
panicf("incorrect number key parts: want=%d received=%d",
panic(fmt.Sprintf("incorrect number key parts: want=%d received=%d",
len(i.fields),
len(parts),
)
))
}
if !allow_zero(i.flags) {
for x, field := range i.fields {

View file

@ -70,7 +70,7 @@ func find_field(t reflect.Type, names []string) (sfield struct_field) {
name := names[0]
names = names[1:]
if !is_exported(name) {
panicf("field is not exported: %s", name)
panic(fmt.Sprintf("field is not exported: %s", name))
}
return name
}
@ -94,7 +94,7 @@ func find_field(t reflect.Type, names []string) (sfield struct_field) {
// Check for valid struct type.
if t.Kind() != reflect.Struct {
panicf("field %s is not struct (or ptr-to): %s", t, name)
panic(fmt.Sprintf("field %s is not struct (or ptr-to): %s", t, name))
}
var ok bool
@ -102,7 +102,7 @@ func find_field(t reflect.Type, names []string) (sfield struct_field) {
// Look for next field by name.
field, ok = t.FieldByName(name)
if !ok {
panicf("unknown field: %s", name)
panic(fmt.Sprintf("unknown field: %s", name))
}
// Set next offset value.
@ -258,11 +258,6 @@ func eface_data(a any) unsafe.Pointer {
return (*eface)(unsafe.Pointer(&a)).data
}
// panicf provides a panic with string formatting.
func panicf(format string, args ...any) {
panic(fmt.Sprintf(format, args...))
}
// assert can be called to indicated a block
// of code should not be able to be reached,
// it returns a BUG report with callsite.

View file

@ -190,7 +190,8 @@ func (t *Timeline[T, PK]) Select(min, max *PK, length *int, dir Direction) (valu
// Insert will insert the given values into the timeline,
// calling any set invalidate hook on each inserted value.
func (t *Timeline[T, PK]) Insert(values ...T) {
// Returns current list length after performing inserts.
func (t *Timeline[T, PK]) Insert(values ...T) int {
// Acquire lock.
t.mutex.Lock()
@ -269,6 +270,10 @@ func (t *Timeline[T, PK]) Insert(values ...T) {
// Get func ptrs.
invalid := t.invalid
// Get length AFTER
// insert to return.
len := t.list.len
// Done with lock.
t.mutex.Unlock()
@ -279,6 +284,8 @@ func (t *Timeline[T, PK]) Insert(values ...T) {
invalid(value)
}
}
return len
}
// Invalidate invalidates all entries stored in index under given keys.
@ -336,8 +343,8 @@ func (t *Timeline[T, PK]) Invalidate(index *Index, keys ...Key) {
//
// Please note that the entire Timeline{} will be locked for the duration of the range
// operation, i.e. from the beginning of the first yield call until the end of the last.
func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
return func(yield func(T) bool) {
func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(index int, value T) bool) {
return func(yield func(int, T) bool) {
if t.copy == nil {
panic("not initialized")
} else if yield == nil {
@ -348,7 +355,9 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
t.mutex.Lock()
defer t.mutex.Unlock()
var i int
switch dir {
case Asc:
// Iterate through linked list from bottom (i.e. tail).
for prev := t.list.tail; prev != nil; prev = prev.prev {
@ -360,9 +369,12 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
value := t.copy(item.data.(T))
// Pass to given function.
if !yield(value) {
if !yield(i, value) {
break
}
// Iter
i++
}
case Desc:
@ -376,9 +388,12 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
value := t.copy(item.data.(T))
// Pass to given function.
if !yield(value) {
if !yield(i, value) {
break
}
// Iter
i++
}
}
}
@ -390,8 +405,8 @@ func (t *Timeline[T, PK]) Range(dir Direction) func(yield func(T) bool) {
//
// Please note that the entire Timeline{} will be locked for the duration of the range
// operation, i.e. from the beginning of the first yield call until the end of the last.
func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
return func(yield func(T) bool) {
func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(index int, value T) bool) {
return func(yield func(int, T) bool) {
if t.copy == nil {
panic("not initialized")
} else if yield == nil {
@ -402,7 +417,9 @@ func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
t.mutex.Lock()
defer t.mutex.Unlock()
var i int
switch dir {
case Asc:
// Iterate through linked list from bottom (i.e. tail).
for prev := t.list.tail; prev != nil; prev = prev.prev {
@ -411,9 +428,12 @@ func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
item := (*timeline_item)(prev.data)
// Pass to given function.
if !yield(item.data.(T)) {
if !yield(i, item.data.(T)) {
break
}
// Iter
i++
}
case Desc:
@ -424,9 +444,12 @@ func (t *Timeline[T, PK]) RangeUnsafe(dir Direction) func(yield func(T) bool) {
item := (*timeline_item)(next.data)
// Pass to given function.
if !yield(item.data.(T)) {
if !yield(i, item.data.(T)) {
break
}
// Iter
i++
}
}
}
@ -1033,6 +1056,9 @@ indexing:
// checking for collisions.
if !idx.add(key, i_item) {
// This key already appears
// in this unique index. So
// drop new timeline item.
t.delete(t_item)
free_buffer(buf)
return last