fix: ParsePaginator

Author: wolfogre

modules/indexer/internal/paginator.go

@@ -10,32 +10,24 @@ import (
 )
 
 // ParsePaginator parses a db.Paginator into a skip and limit
-func ParsePaginator(paginator db.Paginator, max ...int) (int, int) {
+func ParsePaginator(listOptions db.ListOptions, max ...int) (int, int) {
 	// Use a very large number to indicate no limit
 	unlimited := math.MaxInt32
 	if len(max) > 0 {
 		// Some indexer engines have a limit on the page size, respect that
 		unlimited = max[0]
 	}
 
-	if paginator == nil || paginator.IsListAll() {
+	if listOptions.IsListAll() {
+		// It shouldn't happen. In actual usage scenarios, there should not be requests to search all.
+		// But if it does happen, respect it and return "unlimited".
 		return 0, unlimited
 	}
 
-	// Warning: Do not use GetSkipTake() for *db.ListOptions
-	// Its implementation could reset the page size with setting.API.MaxResponseItems
-	if listOptions, ok := paginator.(*db.ListOptions); ok {
-		if listOptions.Page >= 0 && listOptions.PageSize > 0 {
-			var start int
-			if listOptions.Page == 0 {
-				start = 0
-			} else {
-				start = (listOptions.Page - 1) * listOptions.PageSize
-			}
-			return start, listOptions.PageSize
-		}
-		return 0, unlimited
+	if listOptions.PageSize == 0 {
+		// Do not return any results when searching, it's used to get the total count only.
+		return 0, 0
 	}
 
-	return paginator.GetSkipTake()
+	return listOptions.GetSkipTake()
 }

modules/indexer/issues/bleve/bleve.go

@@ -266,7 +266,7 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		indexerQuery = bleve.NewMatchAllQuery()
 	}
 
-	skip, limit := indexer_internal.ParsePaginator(&options.ListOptions)
+	skip, limit := indexer_internal.ParsePaginator(options.ListOptions)
 	search := bleve.NewSearchRequestOptions(indexerQuery, limit, skip, false)
 
 	if options.SortBy == "" {

modules/indexer/issues/elasticsearch/elasticsearch.go

@@ -248,7 +248,7 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 	// TODO: make it configurable since it's configurable in elasticsearch
 	const maxPageSize = 10000
 
-	skip, limit := indexer_internal.ParsePaginator(&options.ListOptions, maxPageSize)
+	skip, limit := indexer_internal.ParsePaginator(options.ListOptions, maxPageSize)
 	searchResult, err := b.inner.Client.Search().
 		Index(b.inner.VersionedIndexName()).
 		Query(query).

modules/indexer/issues/meilisearch/meilisearch.go

@@ -216,7 +216,7 @@ func (b *Indexer) Search(ctx context.Context, options *internal.SearchOptions) (
 		"id:desc",
 	}
 
-	skip, limit := indexer_internal.ParsePaginator(&options.ListOptions, maxTotalHits)
+	skip, limit := indexer_internal.ParsePaginator(options.ListOptions, maxTotalHits)
 
 	keyword := options.Keyword
 	if !options.IsFuzzyKeyword {