You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by li...@apache.org on 2024/01/08 12:24:41 UTC

(incubator-answer-plugins) 01/01: revert(plugin): revert search tag plugin

This is an automated email from the ASF dual-hosted git repository.

linkinstar pushed a commit to branch fix/tag
in repository https://gitbox.apache.org/repos/asf/incubator-answer-plugins.git

commit 0f373cb28d37f028c153dd019b21c2b82f9958dc
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Mon Jan 8 20:24:27 2024 +0800

    revert(plugin): revert search tag plugin
---
 search-algolia/algolia.go         | 30 ++++++------------------------
 search-elasticsearch/es.go        |  6 ++----
 search-meilisearch/meilisearch.go |  6 +-----
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/search-algolia/algolia.go b/search-algolia/algolia.go
index fb6054f..9ba1406 100644
--- a/search-algolia/algolia.go
+++ b/search-algolia/algolia.go
@@ -71,14 +71,8 @@ func (s *SearchAlgolia) SearchContents(ctx context.Context, cond *plugin.SearchB
 		votesFilter  string
 	)
 	if len(cond.TagIDs) > 0 {
-		for _, tagGroup := range cond.TagIDs {
-			var tagsIn []string
-			if len(tagGroup) > 0 {
-				for _, tagID := range tagGroup {
-					tagsIn = append(tagsIn, "tags:" + tagID)
-				}
-			}
-			tagFilters = append(tagFilters, "(" + strings.Join(tagsIn, " OR ") + ")")
+		for _, tagID := range cond.TagIDs {
+			tagFilters = append(tagFilters, "tags:"+tagID)
 		}
 		if len(tagFilters) > 0 {
 			filters += " AND " + strings.Join(tagFilters, " AND ")
@@ -127,14 +121,8 @@ func (s *SearchAlgolia) SearchQuestions(ctx context.Context, cond *plugin.Search
 		answersFilter string
 	)
 	if len(cond.TagIDs) > 0 {
-		for _, tagGroup := range cond.TagIDs {
-			var tagsIn []string
-			if len(tagGroup) > 0 {
-				for _, tagID := range tagGroup {
-					tagsIn = append(tagsIn, "tags:" + tagID)
-				}
-			}
-			tagFilters = append(tagFilters, "(" + strings.Join(tagsIn, " OR ") + ")")
+		for _, tagID := range cond.TagIDs {
+			tagFilters = append(tagFilters, "tags:"+tagID)
 		}
 		if len(tagFilters) > 0 {
 			filters += " AND " + strings.Join(tagFilters, " AND ")
@@ -190,14 +178,8 @@ func (s *SearchAlgolia) SearchAnswers(ctx context.Context, cond *plugin.SearchBa
 		questionIDFilter string
 	)
 	if len(cond.TagIDs) > 0 {
-		for _, tagGroup := range cond.TagIDs {
-			var tagsIn []string
-			if len(tagGroup) > 0 {
-				for _, tagID := range tagGroup {
-					tagsIn = append(tagsIn, "tags:" + tagID)
-				}
-			}
-			tagFilters = append(tagFilters, "(" + strings.Join(tagsIn, " OR ") + ")")
+		for _, tagID := range cond.TagIDs {
+			tagFilters = append(tagFilters, "tags:"+tagID)
 		}
 		if len(tagFilters) > 0 {
 			filters += " AND " + strings.Join(tagFilters, " AND ")
diff --git a/search-elasticsearch/es.go b/search-elasticsearch/es.go
index 911a58e..52639a8 100644
--- a/search-elasticsearch/es.go
+++ b/search-elasticsearch/es.go
@@ -246,10 +246,8 @@ func (s *SearchEngine) buildQuery(cond *plugin.SearchBasicCond) (
 	log.Debugf("build query: %+v", cond)
 
 	q := elastic.NewBoolQuery()
-	for _, tagGroup := range cond.TagIDs {
-		if len(tagGroup) > 0 {
-			q.Must(elastic.NewTermsQuery("tags", convertToInterfaceSlice(tagGroup)...))
-		}
+	if len(cond.TagIDs) > 0 {
+		q.Must(elastic.NewTermsQuery("tags", convertToInterfaceSlice(cond.TagIDs)...))
 	}
 	if len(cond.UserID) > 0 {
 		q.Must(elastic.NewTermQuery("user_id", cond.UserID))
diff --git a/search-meilisearch/meilisearch.go b/search-meilisearch/meilisearch.go
index 352b81e..f046b6b 100644
--- a/search-meilisearch/meilisearch.go
+++ b/search-meilisearch/meilisearch.go
@@ -322,11 +322,7 @@ func (s *Search) buildQuery(cond *plugin.SearchBasicCond) (string, *meilisearch.
 func (s *Search) buildFilter(cond *plugin.SearchBasicCond) []string {
 	var filter []string
 	if cond.TagIDs != nil && len(cond.TagIDs) > 0 {
-		for _, tagGroup := range cond.TagIDs {
-			if len(tagGroup) > 0 {
-				filter = append(filter, fmt.Sprintf("tags IN [%s]", strings.Join(tagGroup, ",")))
-			}
-		}
+		filter = append(filter, fmt.Sprintf("tags IN [%s]", strings.Join(cond.TagIDs, ",")))
 	}
 	if cond.UserID != "" {
 		filter = append(filter, fmt.Sprintf("userID = %s", cond.UserID))