feat: enable empty text search

goto · Oct 4, 2023 · a730369 · a730369
1 parent ec9201e
commit a730369
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 31 deletions.
diff --git a/internal/server/v1beta1/search.go b/internal/server/v1beta1/search.go
@@ -18,9 +18,6 @@ func (server *APIServer) SearchAssets(ctx context.Context, req *compassv1beta1.S
 	}
 
 	text := strings.TrimSpace(req.GetText())
-	if text == "" {
-		return nil, status.Error(codes.InvalidArgument, "'text' must be specified")
-	}
 
 	cfg := asset.SearchConfig{
 		Text:       text,

diff --git a/internal/server/v1beta1/search_test.go b/internal/server/v1beta1/search_test.go
@@ -34,11 +34,6 @@ func TestSearch(t *testing.T) {
 	}
 
 	testCases := []testCase{
-		{
-			Description:  "should return invalid argument if 'text' parameter is empty or missing",
-			ExpectStatus: codes.InvalidArgument,
-			Request:      &compassv1beta1.SearchAssetsRequest{},
-		},
 		{
 			Description: "should report internal server if asset searcher fails",
 			Request: &compassv1beta1.SearchAssetsRequest{

diff --git a/internal/store/elasticsearch/discovery_search_repository.go b/internal/store/elasticsearch/discovery_search_repository.go
@@ -26,9 +26,6 @@ var returnedAssetFieldsResult = []string{"id", "urn", "type", "service", "name",
 
 // Search the asset store
 func (repo *DiscoveryRepository) Search(ctx context.Context, cfg asset.SearchConfig) (results []asset.SearchResult, err error) {
-	if strings.TrimSpace(cfg.Text) == "" {
-		return nil, asset.DiscoveryError{Op: "Search", Err: errors.New("search text cannot be empty")}
-	}
 	maxResults := cfg.MaxResults
 	if maxResults <= 0 {
 		maxResults = defaultMaxResults
@@ -233,6 +230,10 @@ func buildSuggestQuery(cfg asset.SearchConfig) (io.Reader, error) {
 }
 
 func buildTextQuery(q *elastic.BoolQuery, cfg asset.SearchConfig) {
+	if strings.TrimSpace(cfg.Text) == "" {
+		q.Should(elastic.NewMatchAllQuery())
+	}
+
 	boostedFields := []string{"urn^10", "name^5"}
 	q.Should(
 		// Phrase query cannot have `FUZZINESS`
@@ -305,12 +306,13 @@ func buildFilterExistsQueries(q *elastic.BoolQuery, fields []string) {
 
 func buildFunctionScoreQuery(query elastic.Query, rankBy, text string) elastic.Query {
 	// Added exact match term query here so that exact match gets higher priority.
-	fsQuery := elastic.NewFunctionScoreQuery().
-		Add(
+	fsQuery := elastic.NewFunctionScoreQuery()
+	if text != "" {
+		fsQuery.Add(
 			elastic.NewTermQuery("name.keyword", text),
 			elastic.NewWeightFactorFunction(2),
 		)
-
+	}
 	if rankBy != "" {
 		fsQuery.AddScoreFunc(
 			elastic.NewFieldValueFactorFunction().

diff --git a/internal/store/elasticsearch/discovery_search_repository_test.go b/internal/store/elasticsearch/discovery_search_repository_test.go
@@ -21,23 +21,6 @@ type searchTestData struct {
 
 func TestSearcherSearch(t *testing.T) {
 	ctx := context.TODO()
-	t.Run("should return an error if search string is empty", func(t *testing.T) {
-		cli, err := esTestServer.NewClient()
-		require.NoError(t, err)
-		esClient, err := store.NewClient(
-			log.NewNoop(),
-			store.Config{},
-			store.WithClient(cli),
-		)
-		require.NoError(t, err)
-
-		repo := store.NewDiscoveryRepository(esClient, log.NewNoop())
-		_, err = repo.Search(ctx, asset.SearchConfig{
-			Text: "",
-		})
-
-		assert.Error(t, err)
-	})
 
 	t.Run("fixtures", func(t *testing.T) {
 		cli, err := esTestServer.NewClient()
@@ -67,6 +50,41 @@ func TestSearcherSearch(t *testing.T) {
 		}
 
 		tests := []searchTest{
+			{
+				Description: "should fetch assets when text is empty",
+				Config: asset.SearchConfig{
+					Text: "",
+					Filters: map[string][]string{
+						"service": {"bigquery"},
+					},
+				},
+				Expected: []expectedRow{
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-1"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-common"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-abc-common-test"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-mid"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/abc-tablename-mid"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/test"},
+				},
+			},
+			{
+				Description: "should fetch assets when text is empty and rank by RankBy: data.profile.usage_count",
+				Config: asset.SearchConfig{
+					Text:   "",
+					RankBy: "data.profile.usage_count",
+					Filters: map[string][]string{
+						"service": {"bigquery"},
+					},
+				},
+				Expected: []expectedRow{
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-common"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-mid"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/test"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-1"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/tablename-abc-common-test"},
+					{Type: "table", AssetID: "bigquery::gcpproject/dataset/abc-tablename-mid"},
+				},
+			},
 			{
 				Description: "should fetch assets which has text in any of its fields",
 				Config: asset.SearchConfig{