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) Address broken tests

Browse Source 
They are still broken, but less so.
This commit is contained in:
Viktor Lofgren 2024-08-25 10:34:36 +02:00
parent 0999f07320
commit 96bcf03ad5
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -311,7 +311,11 @@ public class IndexResultRankingService {
}
}
assert constraintsFull.size() == 1 : "Exactly one full constraint group is required";
if (constraintsFull.isEmpty()) {
logger.warn("No full constraints in query, adding empty group");
constraintsFull.add(new PhraseConstraintGroupList.PhraseConstraintGroup(List.of(), idsAll));
}
return new QuerySearchTerms(termToId,
idsAll,

30
code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationSmokeTest.java
View File

@ -4,6 +4,8 @@ import com.google.inject.Guice;
import com.google.inject.Inject;
import lombok.SneakyThrows;
import nu.marginalia.IndexLocations;
import nu.marginalia.api.searchquery.RpcDecoratedResultItem;
import nu.marginalia.api.searchquery.model.query.SearchPhraseConstraint;
import nu.marginalia.api.searchquery.model.query.SearchQuery;
import nu.marginalia.api.searchquery.model.query.SearchSpecification;
import nu.marginalia.api.searchquery.model.results.ResultRankingParameters;
@ -123,15 +125,19 @@ public class IndexQueryServiceIntegrationSmokeTest {
.rankingParams(ResultRankingParameters.sensibleDefaults())
.domains(new ArrayList<>())
.searchSetIdentifier("NONE")
.query(new SearchQuery(
"2 3 5",
List.of("3", "5", "2"), List.of("4"), Collections.emptyList(), Collections.emptyList(),
Collections.emptyList())).build());
.query(
SearchQuery.builder()
.compiledQuery("2 3 5")
.include("3", "5", "2")
.exclude("4")
.build()
).build());
int[] idxes = new int[] { 30, 510, 90, 150, 210, 270, 330, 390, 450 };
long[] ids = IntStream.of(idxes).mapToLong(this::fullId).toArray();
long[] actual = rsp
.stream()
.sorted(Comparator.comparing(RpcDecoratedResultItem::getRankingScore))
.mapToLong(i -> i.getRawItem().getCombinedId())
.toArray();
@ -171,6 +177,7 @@ public class IndexQueryServiceIntegrationSmokeTest {
SearchQuery.builder()
.compiledQuery("2")
.include("2")
.phraseConstraint(new SearchPhraseConstraint.Full("2"))
.build()
).build()
);
@ -179,6 +186,7 @@ public class IndexQueryServiceIntegrationSmokeTest {
long[] ids = IntStream.of(idxes).mapToLong(Long::valueOf).toArray();
long[] actual = rsp
.stream()
.sorted(Comparator.comparing(RpcDecoratedResultItem::getRankingScore))
.mapToLong(i -> i.getRawItem().getCombinedId())
.map(UrlIdCodec::getDocumentOrdinal)
.toArray();
@ -221,10 +229,12 @@ public class IndexQueryServiceIntegrationSmokeTest {
List.of("4"),
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList())).build());
List.of(new SearchPhraseConstraint.Full("2", "3", "5")))).build());
int[] idxes = new int[] { 210, 270 };
long[] ids = IntStream.of(idxes).mapToLong(id -> UrlIdCodec.encodeId(id/100, id)).toArray();
long[] actual = rsp.stream().mapToLong(i -> i.getRawItem().getCombinedId()).toArray();
long[] actual = rsp.stream()
.sorted(Comparator.comparing(RpcDecoratedResultItem::getRankingScore))
.mapToLong(i -> i.getRawItem().getCombinedId()).toArray();
Assertions.assertArrayEquals(ids, actual);
}
@ -256,7 +266,11 @@ public class IndexQueryServiceIntegrationSmokeTest {
.searchSetIdentifier("NONE")
.rankingParams(ResultRankingParameters.sensibleDefaults())
.query(
new SearchQuery("4", List.of("4"), Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList())
new SearchQuery("4", List.of("4"),
Collections.emptyList(),
Collections.emptyList(),
Collections.emptyList(),
List.of(new SearchPhraseConstraint.Full("4")))
).build());
@ -354,7 +368,7 @@ public class IndexQueryServiceIntegrationSmokeTest {
ldbw.add(new DocdbUrlDetail(
fullId, new EdgeUrl("https://www.example.com/"+id),
"test", "test", 0., "HTML5", 0, null, 0, 10
"test", "test", 0., "HTML5", 0, null, fullId, 10
));
List<String> keywords = IntStream.of(factors).mapToObj(Integer::toString).toList();

2
code/index/test/nu/marginalia/index/IndexQueryServiceIntegrationTest.java
View File

@ -578,7 +578,7 @@ public class IndexQueryServiceIntegrationTest {
"HTML5",
0,
null,
0,
key.hashCode(),
5
));
}

2
code/index/test/nu/marginalia/index/results/IndexResultDomainDeduplicatorTest.java
View File

@ -25,7 +25,7 @@ class IndexResultDomainDeduplicatorTest {
}
SearchResultItem forId(int domain, int ordinal) {
return new SearchResultItem(UrlIdCodec.encodeId(domain, ordinal), 0, 0, List.of(),false, null, Double.NaN);
return new SearchResultItem(UrlIdCodec.encodeId(domain, ordinal), 0, 0, List.of(), false, 0L, null, Double.NaN);
}
}