Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-23 21:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(index) Repair positions bitmask for search result presentation

Browse Source
This commit is contained in:
Viktor Lofgren 2024-08-22 11:28:23 +02:00
parent 266d6e4bea
commit 9eb1f120fc
6 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/functions/search-query/api/java/nu/marginalia/api/searchquery/QueryProtobufCodec.java
View File

@ -257,6 +257,7 @@ public class QueryProtobufCodec {
rawItem.getHtmlFeatures(),
keywordScores,
rawItem.getHasPriorityTerms(),
0, // Not set
null, // Not set
Double.NaN // Not set
);

6
code/functions/search-query/api/java/nu/marginalia/api/searchquery/model/results/SearchResultItem.java
View File

@ -28,14 +28,18 @@ public class SearchResultItem implements Comparable<SearchResultItem> {
public boolean hasPrioTerm;
public long bestPositions;
public DebugRankingFactors debugRankingFactors;
public SearchResultItem(long combinedId,
long encodedDocMetadata,
int htmlFeatures,
double score) {
double score,
long bestPositions) {
this.combinedId = combinedId;
this.encodedDocMetadata = encodedDocMetadata;
this.bestPositions = bestPositions;
this.keywordScores = new ArrayList<>();
this.htmlFeatures = htmlFeatures;
this.scoreValue = score;

4
code/index/java/nu/marginalia/index/results/IndexResultRankingService.java
View File

@ -179,7 +179,7 @@ public class IndexResultRankingService {
LongOpenHashSet seenDocumentHashes = new LongOpenHashSet(resultsList.size());
// Decorate the results with the document details
for (var result : resultsList) {
for (SearchResultItem result : resultsList) {
final long id = result.getDocumentId();
final DocdbUrlDetail docData = detailsById.get(id);
@ -219,7 +219,7 @@ public class IndexResultRankingService {
.setUrl(docData.url().toString())
.setUrlQuality(docData.urlQuality())
.setWordsTotal(docData.wordsTotal())
.setBestPositions(0 /* FIXME */)
.setBestPositions(result.getBestPositions())
.setResultsFromDomain(domainCountFilter.getCount(result))
.setRawItem(rawItem);

30
code/index/java/nu/marginalia/index/results/IndexResultScoreCalculator.java
View File

@ -106,7 +106,35 @@ public class IndexResultScoreCalculator {
searchTerms.phraseConstraints,
rankingContext);
return new SearchResultItem(combinedId, docMetadata, htmlFeatures, score);
return new SearchResultItem(combinedId,
docMetadata,
htmlFeatures,
score,
calculatePositionsMask(positions)
);
}
/** Calculate a bitmask illustrating the intersected positions of the search terms in the document.
* This is used in the GUI.
* */
private long calculatePositionsMask(CodedSequence[] positions) {
IntIterator[] iters = new IntIterator[rankingContext.regularMask.cardinality()];
for (int i = 0, j = 0; i < positions.length; i++) {
if (rankingContext.regularMask.get(i)) {
iters[j++] = positions[i].iterator();
}
}
IntIterator intersection = SequenceOperations.findIntersections(iters).intIterator();
long result = 0;
int bit = 0;
while (intersection.hasNext() && bit < 64) {
bit = (int) (Math.sqrt(intersection.nextInt()));
result |= 1L << bit;
}
return result;
}
private boolean meetsQueryStrategyRequirements(CompiledQueryLong queryGraphScores,

2
code/libraries/coded-sequence/java/nu/marginalia/sequence/SequenceOperations.java
View File

@ -55,7 +55,7 @@ public class SequenceOperations {
public static IntList findIntersections(IntIterator... sequences) {
if (sequences.length <= 1)
if (sequences.length < 1)
return IntList.of();
// Initialize values and find the maximum value

12
code/services-application/search-service/java/nu/marginalia/search/svc/SearchQueryIndexService.java
View File

@ -2,14 +2,12 @@ package nu.marginalia.search.svc;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import it.unimi.dsi.fastutil.ints.Int2LongArrayMap;
import lombok.SneakyThrows;
import nu.marginalia.bbpc.BrailleBlockPunchCards;
import nu.marginalia.api.searchquery.model.query.QueryResponse;
import nu.marginalia.api.searchquery.model.query.SearchSpecification;
import nu.marginalia.api.searchquery.model.results.DecoratedSearchResultItem;
import nu.marginalia.api.searchquery.model.results.SearchResultItem;
import nu.marginalia.bbpc.BrailleBlockPunchCards;
import nu.marginalia.model.crawl.DomainIndexingState;
import nu.marginalia.api.searchquery.model.query.QueryResponse;
import nu.marginalia.search.model.UrlDetails;
import nu.marginalia.search.results.UrlDeduplicator;
import org.slf4j.Logger;
@ -17,7 +15,9 @@ import org.slf4j.LoggerFactory;
import org.slf4j.Marker;
import org.slf4j.MarkerFactory;
import java.util.*;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@Singleton
public class SearchQueryIndexService {
@ -99,7 +99,7 @@ public class SearchQueryIndexService {
}
private String getPositionsString(DecoratedSearchResultItem resultItem) {
return BrailleBlockPunchCards.printBits(resultItem.bestPositions, 56);
return BrailleBlockPunchCards.printBits(resultItem.bestPositions, 64);
}
}