From 55b549903f5a4bef068d46df9aad8f462b36985a Mon Sep 17 00:00:00 2001 From: vlofgren Date: Thu, 28 Jul 2022 18:19:46 +0200 Subject: [PATCH 1/2] Experimental domain-searching feature --- .../nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java index a1006983..75f891f2 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java @@ -267,6 +267,9 @@ public class EdgeDataStoreDaoImpl implements EdgeDataStoreDao { @Override public List getBrowseResultFromUrlIds(List> urlId) { + if (urlId.isEmpty()) + return Collections.emptyList(); + List ret = new ArrayList<>(urlId.size()); try (var conn = dataSource.getConnection()) { From ada11eb849a5db82e01fb6d33fd721dcb550d0ec Mon Sep 17 00:00:00 2001 From: vlofgren Date: Thu, 28 Jul 2022 18:33:58 +0200 Subject: [PATCH 2/2] Experimental domain-searching feature --- .../nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java | 2 +- .../java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java index 75f891f2..3d839a52 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/data/dao/EdgeDataStoreDaoImpl.java @@ -277,7 +277,7 @@ public class EdgeDataStoreDaoImpl implements EdgeDataStoreDao { // this is safe, string cocatenation is of integers String inStmt = urlId.stream().map(id -> Integer.toString(id.id())).collect(Collectors.joining(", ", "(", ")")); - var rsp = stmt.executeQuery("SELECT DOMAIN_ID, DOMAIN_NAME FROM EC_URL_VIEW WHERE ID IN " + inStmt); + var rsp = stmt.executeQuery("SELECT DOMAIN_ID, DOMAIN_NAME FROM EC_URL_VIEW WHERE QUALITY>-5 ID IN " + inStmt); while (rsp.next()) { int id = rsp.getInt(1); String domain = rsp.getString(2); diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java index 60b13fc1..c818701b 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/search/EdgeSearchOperator.java @@ -116,7 +116,7 @@ public class EdgeSearchOperator { .findFirst().map(sq -> sq.searchTermsInclude).orElseGet(Collections::emptyList); if (keywords.size() == 1) { - var request = new EdgeDomainSearchSpecification(specs.buckets.get(0), IndexBlock.Top, keywords.get(0), 1_000_000, 50, 5); + var request = new EdgeDomainSearchSpecification(specs.buckets.get(0), IndexBlock.Topic, keywords.get(0), 1_000_000, 5, 10); var response = indexClient.queryDomains(ctx, request); return edgeDataStoreDao.getBrowseResultFromUrlIds(response.results);