Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d379a20b authored by Alexander Dorokhine's avatar Alexander Dorokhine Committed by Android (Google) Code Review
Browse files

Merge "Switch FakeIcing to return a SearchResults proto instead of a List<Document>"

parents 6703d39a 7dbf5fe9

apex/appsearch/service/java/com/android/server/appsearch/impl/FakeIcing.java

+9 −9
Original line number Diff line number Diff line
@@ -24,10 +24,8 @@ import android.util.SparseArray; 


import com.google.android.icing.proto.DocumentProto;

import com.google.android.icing.proto.PropertyProto;

import com.google.android.icing.proto.SearchResultProto;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Locale;

import java.util.Map;

import java.util.Set;
@@ -94,23 +92,25 @@ public class FakeIcing { 
     * Returns documents containing the given term.

     *

     * @param term A single exact term to look up in the index.

     * @return The matching documents, or an empty {@code List} if no documents match.

     * @return A {@link SearchResultProto} containing the matching documents, which may have no

     *   results if no documents match.

     */

    @NonNull

    public List<DocumentProto> query(@NonNull String term) {

    public SearchResultProto query(@NonNull String term) {

        String normTerm = normalizeString(term);

        Set<Integer> docIds = mIndex.get(normTerm);

        if (docIds == null || docIds.isEmpty()) {

            return Collections.emptyList();

            return SearchResultProto.getDefaultInstance();

        }

        List<DocumentProto> matches = new ArrayList<>(docIds.size());

        SearchResultProto.Builder results = SearchResultProto.newBuilder();

        for (int docId : docIds) {

            DocumentProto document = mDocStore.get(docId);

            if (document != null) {

                matches.add(document);

                results.addResults(

                        SearchResultProto.ResultProto.newBuilder().setDocument(document));

            }

        }

        return matches;

        return results.build();

    }



    /**

services/tests/servicestests/src/com/android/server/appsearch/impl/FakeIcingTest.java

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import androidx.test.runner.AndroidJUnit4; 


import com.google.android.icing.proto.DocumentProto;

import com.google.android.icing.proto.PropertyProto;

import com.google.android.icing.proto.SearchResultProto;



import org.junit.Test;

import org.junit.runner.RunWith;
@@ -115,8 +116,9 @@ public class FakeIcingTest { 


    private static List<String> queryGetUris(FakeIcing icing, String term) {

        List<String> uris = new ArrayList<>();

        for (DocumentProto result : icing.query(term)) {

            uris.add(result.getUri());

        SearchResultProto results = icing.query(term);

        for (SearchResultProto.ResultProto result : results.getResultsList()) {

            uris.add(result.getDocument().getUri());

        }

        return uris;

    }