diff --git a/internals/export/elasticsearch.go b/internals/export/elasticsearch.go index 475171b..f67977c 100644 --- a/internals/export/elasticsearch.go +++ b/internals/export/elasticsearch.go @@ -247,8 +247,8 @@ func ExportFactHitsFull(f engine.Fact) ([]reader.Hit, error) { for { response, err := elasticsearch.C().Search(). //Index(indicesStr). - Size(10000). Request(searchRequest). + Size(10000). Sort("_shard_doc"). Do(context.Background()) if err != nil { diff --git a/internals/fact/service.go b/internals/fact/service.go index 120bfb6..0350f58 100644 --- a/internals/fact/service.go +++ b/internals/fact/service.go @@ -40,13 +40,11 @@ func ExecuteFact( indices := FindIndices(f, ti, update) zap.L().Debug("search", zap.Strings("indices", indices), zap.Any("request", searchRequest)) - // overwrite of pagination and size parameters in request - searchRequest.Size = &nhit - searchRequest.From = &offset - response, err := elasticsearch.C().Search(). Index(strings.Join(indices, ",")). Request(searchRequest). + From(offset). + Size(nhit). Do(context.Background()) if err != nil { zap.L().Error("ES Search failed", zap.Error(err))