From 7f8b4e040cfa995ab021651c4fa0cc33ae020cc8 Mon Sep 17 00:00:00 2001 From: Lansong <2095621390@qq.com> Date: Fri, 29 Dec 2023 14:08:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9es=E4=B8=AD=E7=9A=84si?= =?UTF-8?q?ze=E5=92=8Cfrom=E5=8F=82=E6=95=B0,=E6=9B=BF=E6=8D=A2=E6=95=B0?= =?UTF-8?q?=E7=BB=84=E5=8F=8D=E8=BD=AC=E7=9A=84=E5=A4=84=E7=90=86=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- biz/infrastructure/mapper/cat/es.go | 4 ++-- biz/infrastructure/mapper/donate/mongo.go | 5 ++--- biz/infrastructure/mapper/moment/es.go | 4 ++-- biz/infrastructure/mapper/moment/mongo.go | 5 ++--- biz/infrastructure/mapper/plan/es.go | 4 ++-- biz/infrastructure/mapper/plan/mongo.go | 5 ++--- biz/infrastructure/mapper/post/es.go | 9 ++++----- biz/infrastructure/mapper/post/mongo.go | 5 ++--- 8 files changed, 18 insertions(+), 23 deletions(-) diff --git a/biz/infrastructure/mapper/cat/es.go b/biz/infrastructure/mapper/cat/es.go index 8725433..3fe80d5 100644 --- a/biz/infrastructure/mapper/cat/es.go +++ b/biz/infrastructure/mapper/cat/es.go @@ -56,7 +56,7 @@ func (m *EsMapper) Search(ctx context.Context, communityId, keyword string, skip defer func() { span.End(oteltrace.WithTimestamp(time.Now())) }() - res, err := m.es.Search().From(skip).Size(count).Index(m.indexName).Request(&search.Request{ + res, err := m.es.Search().Index(m.indexName).Request(&search.Request{ Query: &types.Query{ Bool: &types.BoolQuery{ Must: []types.Query{ @@ -88,7 +88,7 @@ func (m *EsMapper) Search(ctx context.Context, communityId, keyword string, skip }, }, }, - }).Do(ctx) + }).From(skip).Size(count).Do(ctx) if err != nil { return nil, 0, err } diff --git a/biz/infrastructure/mapper/donate/mongo.go b/biz/infrastructure/mapper/donate/mongo.go index e3b17da..1279efe 100644 --- a/biz/infrastructure/mapper/donate/mongo.go +++ b/biz/infrastructure/mapper/donate/mongo.go @@ -2,6 +2,7 @@ package donate import ( "context" + "github.com/samber/lo" "sync" "time" @@ -80,9 +81,7 @@ func (m *MongoMapper) FindManyByUserId(ctx context.Context, id string, popts *pa // 如果是反向查询，反转数据 if *popts.Backward { - for i := 0; i < len(data)/2; i++ { - data[i], data[len(data)-i-1] = data[len(data)-i-1], data[i] - } + lo.Reverse(data) } if len(data) > 0 { err = p.StoreCursor(ctx, data[0], data[len(data)-1]) diff --git a/biz/infrastructure/mapper/moment/es.go b/biz/infrastructure/mapper/moment/es.go index a5cee4d..eb633a2 100644 --- a/biz/infrastructure/mapper/moment/es.go +++ b/biz/infrastructure/mapper/moment/es.go @@ -65,7 +65,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte return nil, 0, err } f := makeEsFilter(fopts) - res, err := m.es.Search().From(int(*popts.Offset)).Size(int(*popts.Limit)).Index(m.indexName).Request(&search.Request{ + res, err := m.es.Search().Index(m.indexName).Request(&search.Request{ Query: &types.Query{ Bool: &types.BoolQuery{ Must: query, @@ -74,7 +74,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte }, Sort: s, SearchAfter: sa, - }).Do(ctx) + }).Size(int(*popts.Limit)).Do(ctx) if err != nil { return nil, 0, err } diff --git a/biz/infrastructure/mapper/moment/mongo.go b/biz/infrastructure/mapper/moment/mongo.go index 535d843..13e5e7a 100644 --- a/biz/infrastructure/mapper/moment/mongo.go +++ b/biz/infrastructure/mapper/moment/mongo.go @@ -2,6 +2,7 @@ package moment import ( "context" + "github.com/samber/lo" "sync" "time" @@ -76,9 +77,7 @@ func (m *MongoMapper) FindMany(ctx context.Context, fopts *FilterOptions, popts // 如果是反向查询，反转数据 if *popts.Backward { - for i := 0; i < len(data)/2; i++ { - data[i], data[len(data)-i-1] = data[len(data)-i-1], data[i] - } + lo.Reverse(data) } if len(data) > 0 { err = p.StoreCursor(ctx, data[0], data[len(data)-1]) diff --git a/biz/infrastructure/mapper/plan/es.go b/biz/infrastructure/mapper/plan/es.go index f6cddfb..84c3af9 100644 --- a/biz/infrastructure/mapper/plan/es.go +++ b/biz/infrastructure/mapper/plan/es.go @@ -66,7 +66,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte return nil, 0, err } f := makeEsFilter(fopts) - res, err := m.es.Search().From(int(*popts.Offset)).Size(int(*popts.Limit)).Index(m.indexName).Request(&search.Request{ + res, err := m.es.Search().Index(m.indexName).Request(&search.Request{ Query: &types.Query{ Bool: &types.BoolQuery{ Must: query, @@ -75,7 +75,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte }, Sort: s, SearchAfter: sa, - }).Do(ctx) + }).Size(int(*popts.Limit)).Do(ctx) if err != nil { return nil, 0, err } diff --git a/biz/infrastructure/mapper/plan/mongo.go b/biz/infrastructure/mapper/plan/mongo.go index 363dad1..39c81e9 100644 --- a/biz/infrastructure/mapper/plan/mongo.go +++ b/biz/infrastructure/mapper/plan/mongo.go @@ -2,6 +2,7 @@ package plan import ( "context" + "github.com/samber/lo" "sync" "time" @@ -88,9 +89,7 @@ func (m *MongoMapper) FindMany(ctx context.Context, fopts *FilterOptions, popts // 如果是反向查询，反转数据 if *popts.Backward { - for i := 0; i < len(data)/2; i++ { - data[i], data[len(data)-i-1] = data[len(data)-i-1], data[i] - } + lo.Reverse(data) } if len(data) > 0 { err = p.StoreCursor(ctx, data[0], data[len(data)-1]) diff --git a/biz/infrastructure/mapper/post/es.go b/biz/infrastructure/mapper/post/es.go index 387fea5..0c523e5 100644 --- a/biz/infrastructure/mapper/post/es.go +++ b/biz/infrastructure/mapper/post/es.go @@ -4,6 +4,7 @@ import ( "context" "crypto/tls" "fmt" + "github.com/samber/lo" "log" "net/http" "time" @@ -86,7 +87,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte if err != nil { return nil, 0, err } - res, err := m.es.Search().From(int(*popts.Offset)).Size(int(*popts.Limit)).Index(m.indexName).Request(&search.Request{ + res, err := m.es.Search().Index(m.indexName).Request(&search.Request{ Query: &types.Query{ Bool: &types.BoolQuery{ Must: query, @@ -95,7 +96,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte }, SearchAfter: sa, Sort: s, - }).Do(ctx) + }).Size(int(*popts.Limit)).Do(ctx) if err != nil { return nil, 0, err } @@ -132,9 +133,7 @@ func (m *EsMapper) Search(ctx context.Context, query []types.Query, fopts *Filte } // 如果是反向查询，反转数据 if *popts.Backward { - for i := 0; i < len(posts)/2; i++ { - posts[i], posts[len(posts)-i-1] = posts[len(posts)-i-1], posts[i] - } + lo.Reverse(posts) } if len(posts) > 0 { err = p.StoreCursor(ctx, posts[0], posts[len(posts)-1]) diff --git a/biz/infrastructure/mapper/post/mongo.go b/biz/infrastructure/mapper/post/mongo.go index d8f6396..85ea3ab 100644 --- a/biz/infrastructure/mapper/post/mongo.go +++ b/biz/infrastructure/mapper/post/mongo.go @@ -2,6 +2,7 @@ package post import ( "context" + "github.com/samber/lo" "sync" "time" @@ -127,9 +128,7 @@ func (m *MongoMapper) FindMany(ctx context.Context, fopts *FilterOptions, popts // 如果是反向查询，反转数据 if *popts.Backward { - for i := 0; i < len(data)/2; i++ { - data[i], data[len(data)-i-1] = data[len(data)-i-1], data[i] - } + lo.Reverse(data) } if len(data) > 0 { err = p.StoreCursor(ctx, data[0], data[len(data)-1])