From 47ec57ae79bd97c524b627eccd0b08911c7dfb62 Mon Sep 17 00:00:00 2001 From: yanchao Date: Fri, 18 Mar 2022 00:17:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/dataset.go | 5 +---- routers/home.go | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/models/dataset.go b/models/dataset.go index 8b1ad1420..44d285bda 100755 --- a/models/dataset.go +++ b/models/dataset.go @@ -1,12 +1,10 @@ package models import ( - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" "errors" "fmt" "sort" - "strconv" "xorm.io/builder" ) @@ -195,7 +193,7 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da datasets := make(DatasetList, 0, opts.PageSize) selectColumnsSql := "distinct dataset.id,dataset.title, dataset.status, dataset.category, dataset.description, dataset.download_times, dataset.license, dataset.task, dataset.release_id, dataset.user_id, dataset.repo_id, dataset.created_unix,dataset.updated_unix,dataset.num_stars" - count, err := sess.Select("distinct dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id"). + count, err := sess.Distinct("dataset.id").Join("INNER", "repository", "repository.id = dataset.repo_id"). Join("INNER", "attachment", "attachment.dataset_id=dataset.id"). Where(cond).Count(new(Dataset)) @@ -217,7 +215,6 @@ func SearchDatasetByCondition(opts *SearchDatasetOptions, cond builder.Cond) (Da if err = datasets.loadAttributes(sess); err != nil { return nil, 0, fmt.Errorf("LoadAttributes: %v", err) } - log.Warn("datasetcout:" + strconv.FormatInt(count, 10)) return datasets, count, nil } diff --git a/routers/home.go b/routers/home.go index a7693d1f5..c33d7a049 100755 --- a/routers/home.go +++ b/routers/home.go @@ -8,7 +8,6 @@ package routers import ( "bytes" "net/http" - "strconv" "strings" "code.gitea.io/gitea/services/repository" @@ -337,7 +336,6 @@ func ExploreDatasets(ctx *context.Context) { datasets, count, err = models.SearchDataset(opts) - log.Warn("datasetcout:" + strconv.FormatInt(count, 10)) if err != nil { ctx.ServerError("SearchDatasets", err) return