mirror of
https://github.com/MarginaliaSearch/MarginaliaSearch.git
synced 2025-10-06 17:32:39 +02:00
Compare commits
8 Commits
deploy-030
...
deploy-031
Author | SHA1 | Date | |
---|---|---|---|
|
838a5626ec | ||
|
6b426209c7 | ||
|
452b5731d9 | ||
|
c91cf49630 | ||
|
8503030f18 | ||
|
744f7d3ef7 | ||
|
215e12afe9 | ||
|
2716bce918 |
@@ -20,6 +20,7 @@ import nu.marginalia.index.model.SearchParameters;
|
|||||||
import nu.marginalia.index.model.SearchTerms;
|
import nu.marginalia.index.model.SearchTerms;
|
||||||
import nu.marginalia.index.positions.PositionsFileReader;
|
import nu.marginalia.index.positions.PositionsFileReader;
|
||||||
import nu.marginalia.index.query.IndexQuery;
|
import nu.marginalia.index.query.IndexQuery;
|
||||||
|
import nu.marginalia.index.query.IndexSearchBudget;
|
||||||
import nu.marginalia.index.results.DomainRankingOverrides;
|
import nu.marginalia.index.results.DomainRankingOverrides;
|
||||||
import nu.marginalia.index.results.IndexResultRankingService;
|
import nu.marginalia.index.results.IndexResultRankingService;
|
||||||
import nu.marginalia.index.results.model.ids.CombinedDocIdList;
|
import nu.marginalia.index.results.model.ids.CombinedDocIdList;
|
||||||
@@ -162,10 +163,10 @@ public class PerfTestMain {
|
|||||||
int sum = 0;
|
int sum = 0;
|
||||||
|
|
||||||
Instant runEndTime = Instant.now().plus(warmupTime);
|
Instant runEndTime = Instant.now().plus(warmupTime);
|
||||||
|
|
||||||
int iter;
|
int iter;
|
||||||
|
IndexSearchBudget budget = new IndexSearchBudget(10000);
|
||||||
for (iter = 0;; iter++) {
|
for (iter = 0;; iter++) {
|
||||||
sum += rankingService.rankResults(rankingContext, docIds, false).size();
|
sum += rankingService.rankResults(rankingContext, budget, docIds, false).size();
|
||||||
if ((iter % 100) == 0 && Instant.now().isAfter(runEndTime)) {
|
if ((iter % 100) == 0 && Instant.now().isAfter(runEndTime)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -178,7 +179,7 @@ public class PerfTestMain {
|
|||||||
List<Double> times = new ArrayList<>();
|
List<Double> times = new ArrayList<>();
|
||||||
for (iter = 0;; iter++) {
|
for (iter = 0;; iter++) {
|
||||||
long start = System.nanoTime();
|
long start = System.nanoTime();
|
||||||
sum2 += rankingService.rankResults(rankingContext, docIds, false).size();
|
sum2 += rankingService.rankResults(rankingContext, budget, docIds, false).size();
|
||||||
long end = System.nanoTime();
|
long end = System.nanoTime();
|
||||||
times.add((end - start)/1_000_000.);
|
times.add((end - start)/1_000_000.);
|
||||||
|
|
||||||
|
@@ -76,7 +76,7 @@ public class IndexQueryExecution {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void lookup(IndexQuery query) {
|
private void lookup(IndexQuery query) {
|
||||||
final LongQueryBuffer buffer = new LongQueryBuffer(8192);
|
final LongQueryBuffer buffer = new LongQueryBuffer(512);
|
||||||
try {
|
try {
|
||||||
while (query.hasMore() && budget.hasTimeLeft()) {
|
while (query.hasMore() && budget.hasTimeLeft()) {
|
||||||
|
|
||||||
|
@@ -199,16 +199,19 @@ public class SearchOperator {
|
|||||||
return new EdgeUrl("https", new EdgeDomain("breezewiki.com"), null, "/" + subdomain + path.substring(wikiIndex), null);
|
return new EdgeUrl("https", new EdgeDomain("breezewiki.com"), null, "/" + subdomain + path.substring(wikiIndex), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
else if (topdomain.equals("medium.com")) {
|
else if (topdomain.equals("medium.com")) {
|
||||||
if (!subdomain.isBlank()) {
|
int slashIndex = path.indexOf("/", 1);
|
||||||
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, path, null);
|
if (slashIndex >= 0) {
|
||||||
|
if (!subdomain.isBlank()) {
|
||||||
|
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, path, null);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
String article = path.substring(slashIndex);
|
||||||
|
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, article, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
}*/
|
||||||
String article = path.substring(path.indexOf("/", 1));
|
|
||||||
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, article, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -230,16 +230,19 @@ public class SearchOperator {
|
|||||||
return new EdgeUrl("https", new EdgeDomain("breezewiki.com"), null, "/" + subdomain + path.substring(wikiIndex), null);
|
return new EdgeUrl("https", new EdgeDomain("breezewiki.com"), null, "/" + subdomain + path.substring(wikiIndex), null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
else if (topdomain.equals("medium.com")) {
|
else if (topdomain.equals("medium.com")) {
|
||||||
if (!subdomain.isBlank()) {
|
int slashIndex = path.indexOf("/", 1);
|
||||||
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, path, null);
|
if (slashIndex >= 0) {
|
||||||
|
if (!subdomain.isBlank()) {
|
||||||
|
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, path, null);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
String article = path.substring(slashIndex);
|
||||||
|
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, article, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
}*/
|
||||||
String article = path.substring(path.indexOf("/", 1));
|
|
||||||
return new EdgeUrl("https", new EdgeDomain("scribe.rip"), null, article, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user