diff options
Diffstat (limited to 'internal/timeline/index.go')
-rw-r--r-- | internal/timeline/index.go | 147 |
1 files changed, 74 insertions, 73 deletions
diff --git a/internal/timeline/index.go b/internal/timeline/index.go index 76c16977b..f56199530 100644 --- a/internal/timeline/index.go +++ b/internal/timeline/index.go @@ -28,79 +28,80 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/log" ) -func (t *timeline) IndexBefore(ctx context.Context, itemID string, amount int) error { - l := log.WithFields(kv.Fields{ - - {"amount", amount}, - }...) - - // lazily initialize index if it hasn't been done already - if t.itemIndex.data == nil { - t.itemIndex.data = &list.List{} - t.itemIndex.data.Init() - } - - toIndex := []Timelineable{} - offsetID := itemID - - l.Trace("entering grabloop") -grabloop: - for i := 0; len(toIndex) < amount && i < 5; i++ { // try the grabloop 5 times only - // first grab items using the caller-provided grab function - l.Trace("grabbing...") - items, stop, err := t.grabFunction(ctx, t.accountID, "", "", offsetID, amount) - if err != nil { - return err - } - if stop { - break grabloop - } - - l.Trace("filtering...") - // now filter each item using the caller-provided filter function - for _, item := range items { - shouldIndex, err := t.filterFunction(ctx, t.accountID, item) - if err != nil { - return err - } - if shouldIndex { - toIndex = append(toIndex, item) - } - offsetID = item.GetID() - } +func (t *timeline) ItemIndexLength(ctx context.Context) int { + if t.indexedItems == nil || t.indexedItems.data == nil { + return 0 } - l.Trace("left grabloop") - - // index the items we got - for _, s := range toIndex { - if _, err := t.IndexOne(ctx, s.GetID(), s.GetBoostOfID(), s.GetAccountID(), s.GetBoostOfAccountID()); err != nil { - return fmt.Errorf("IndexBehind: error indexing item with id %s: %s", s.GetID(), err) - } - } - - return nil + return t.indexedItems.data.Len() } -func (t *timeline) IndexBehind(ctx context.Context, itemID string, amount int) error { - l := log.WithFields(kv.Fields{ - - {"amount", amount}, - }...) +// func (t *timeline) indexBefore(ctx context.Context, itemID string, amount int) error { +// l := log.WithFields(kv.Fields{{"amount", amount}}...) + +// // lazily initialize index if it hasn't been done already +// if t.indexedItems.data == nil { +// t.indexedItems.data = &list.List{} +// t.indexedItems.data.Init() +// } + +// toIndex := []Timelineable{} +// offsetID := itemID + +// l.Trace("entering grabloop") +// grabloop: +// for i := 0; len(toIndex) < amount && i < 5; i++ { // try the grabloop 5 times only +// // first grab items using the caller-provided grab function +// l.Trace("grabbing...") +// items, stop, err := t.grabFunction(ctx, t.accountID, "", "", offsetID, amount) +// if err != nil { +// return err +// } +// if stop { +// break grabloop +// } + +// l.Trace("filtering...") +// // now filter each item using the caller-provided filter function +// for _, item := range items { +// shouldIndex, err := t.filterFunction(ctx, t.accountID, item) +// if err != nil { +// return err +// } +// if shouldIndex { +// toIndex = append(toIndex, item) +// } +// offsetID = item.GetID() +// } +// } +// l.Trace("left grabloop") + +// // index the items we got +// for _, s := range toIndex { +// if _, err := t.IndexOne(ctx, s.GetID(), s.GetBoostOfID(), s.GetAccountID(), s.GetBoostOfAccountID()); err != nil { +// return fmt.Errorf("indexBefore: error indexing item with id %s: %s", s.GetID(), err) +// } +// } + +// return nil +// } + +func (t *timeline) indexBehind(ctx context.Context, itemID string, amount int) error { + l := log.WithFields(kv.Fields{{"amount", amount}}...) // lazily initialize index if it hasn't been done already - if t.itemIndex.data == nil { - t.itemIndex.data = &list.List{} - t.itemIndex.data.Init() + if t.indexedItems.data == nil { + t.indexedItems.data = &list.List{} + t.indexedItems.data.Init() } // If we're already indexedBehind given itemID by the required amount, we can return nil. // First find position of itemID (or as near as possible). var position int positionLoop: - for e := t.itemIndex.data.Front(); e != nil; e = e.Next() { - entry, ok := e.Value.(*itemIndexEntry) + for e := t.indexedItems.data.Front(); e != nil; e = e.Next() { + entry, ok := e.Value.(*indexedItemsEntry) if !ok { - return errors.New("IndexBehind: could not parse e as an itemIndexEntry") + return errors.New("indexBehind: could not parse e as an itemIndexEntry") } if entry.itemID <= itemID { @@ -111,7 +112,7 @@ positionLoop: } // now check if the length of indexed items exceeds the amount of items required (position of itemID, plus amount of posts requested after that) - if t.itemIndex.data.Len() > position+amount { + if t.indexedItems.data.Len() > position+amount { // we have enough indexed behind already to satisfy amount, so don't need to make db calls l.Trace("returning nil since we already have enough items indexed") return nil @@ -151,7 +152,7 @@ grabloop: // index the items we got for _, s := range toIndex { if _, err := t.IndexOne(ctx, s.GetID(), s.GetBoostOfID(), s.GetAccountID(), s.GetBoostOfAccountID()); err != nil { - return fmt.Errorf("IndexBehind: error indexing item with id %s: %s", s.GetID(), err) + return fmt.Errorf("indexBehind: error indexing item with id %s: %s", s.GetID(), err) } } @@ -162,28 +163,28 @@ func (t *timeline) IndexOne(ctx context.Context, itemID string, boostOfID string t.Lock() defer t.Unlock() - postIndexEntry := &itemIndexEntry{ + postIndexEntry := &indexedItemsEntry{ itemID: itemID, boostOfID: boostOfID, accountID: accountID, boostOfAccountID: boostOfAccountID, } - return t.itemIndex.insertIndexed(ctx, postIndexEntry) + return t.indexedItems.insertIndexed(ctx, postIndexEntry) } func (t *timeline) IndexAndPrepareOne(ctx context.Context, statusID string, boostOfID string, accountID string, boostOfAccountID string) (bool, error) { t.Lock() defer t.Unlock() - postIndexEntry := &itemIndexEntry{ + postIndexEntry := &indexedItemsEntry{ itemID: statusID, boostOfID: boostOfID, accountID: accountID, boostOfAccountID: boostOfAccountID, } - inserted, err := t.itemIndex.insertIndexed(ctx, postIndexEntry) + inserted, err := t.indexedItems.insertIndexed(ctx, postIndexEntry) if err != nil { return inserted, fmt.Errorf("IndexAndPrepareOne: error inserting indexed: %s", err) } @@ -199,13 +200,13 @@ func (t *timeline) IndexAndPrepareOne(ctx context.Context, statusID string, boos func (t *timeline) OldestIndexedItemID(ctx context.Context) (string, error) { var id string - if t.itemIndex == nil || t.itemIndex.data == nil || t.itemIndex.data.Back() == nil { + if t.indexedItems == nil || t.indexedItems.data == nil || t.indexedItems.data.Back() == nil { // return an empty string if postindex hasn't been initialized yet return id, nil } - e := t.itemIndex.data.Back() - entry, ok := e.Value.(*itemIndexEntry) + e := t.indexedItems.data.Back() + entry, ok := e.Value.(*indexedItemsEntry) if !ok { return id, errors.New("OldestIndexedItemID: could not parse e as itemIndexEntry") } @@ -214,13 +215,13 @@ func (t *timeline) OldestIndexedItemID(ctx context.Context) (string, error) { func (t *timeline) NewestIndexedItemID(ctx context.Context) (string, error) { var id string - if t.itemIndex == nil || t.itemIndex.data == nil || t.itemIndex.data.Front() == nil { + if t.indexedItems == nil || t.indexedItems.data == nil || t.indexedItems.data.Front() == nil { // return an empty string if postindex hasn't been initialized yet return id, nil } - e := t.itemIndex.data.Front() - entry, ok := e.Value.(*itemIndexEntry) + e := t.indexedItems.data.Front() + entry, ok := e.Value.(*indexedItemsEntry) if !ok { return id, errors.New("NewestIndexedItemID: could not parse e as itemIndexEntry") } |