diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-23 09:20:22 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-03-23 09:20:22 +0100 |
commit | 96479e9f03734eaa218b55a5a0bd1b941a877c12 (patch) | |
tree | a0170eb5ada1dcccdfdba9451a5d42c7b9a55289 /container-search | |
parent | a9a6d2275c49f5690791cbb50648589ea800a146 (diff) |
Avoid constructor with magic that is not understandable
Diffstat (limited to 'container-search')
6 files changed, 22 insertions, 17 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/result/Coverage.java b/container-search/src/main/java/com/yahoo/search/result/Coverage.java index cd0e5acc96a..0f3d5cf77b1 100644 --- a/container-search/src/main/java/com/yahoo/search/result/Coverage.java +++ b/container-search/src/main/java/com/yahoo/search/result/Coverage.java @@ -9,13 +9,17 @@ package com.yahoo.search.result; */ public class Coverage extends com.yahoo.container.handler.Coverage { + /** + * @deprecated Nodes is required element + */ + @Deprecated public Coverage(long docs, long active) { // TODO Wonder about this special handling..... this(docs, active, (docs > 0) ? 1 : 0, (docs > 0) ? 1: 0); } public Coverage(long docs, long active, int nodes) { - super(docs, active, nodes, 1); + this(docs, active, nodes, 1); } public Coverage(long docs, long active, int nodes, int resultSets) { diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java index 3309df4f832..ca199f37dd7 100644 --- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java +++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcher.java @@ -231,11 +231,11 @@ public class VdsStreamingSearcher extends VespaBackEndSearcher { ", returned hit count = ", hits.size(), ", summary count = ", summaryMap.size()); - VisitorStatistics visitStats = visitor.getStatistics(); + VisitorStatistics stats = visitor.getStatistics(); result.setTotalHitCount(visitor.getTotalHitCount()); - result.setCoverage(new Coverage(visitStats.getDocumentsVisited(), visitStats.getDocumentsVisited())); + result.setCoverage(new Coverage(stats.getDocumentsVisited(), stats.getDocumentsVisited(), 1, 1)); query.trace(visitor.getStatistics().toString(), false, 2); - query.getContext(true).setProperty(STREAMING_STATISTICS, visitor.getStatistics()); + query.getContext(true).setProperty(STREAMING_STATISTICS, stats); DocsumPacket[] summaryPackets = new DocsumPacket [hits.size()]; diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java index b3ed85911b9..6db3ec9735e 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java @@ -863,7 +863,7 @@ public class JsonRendererTestCase { Query q = new Query("/?query=a&tracelevel=5"); Execution execution = new Execution(Execution.Context.createContextStub()); Result r = new Result(q); - r.setCoverage(new Coverage(500, 600).setDegradedReason(5)); + r.setCoverage(new Coverage(500, 600, 1).setDegradedReason(5)); String summary = render(execution, r); assertEqualJsonContent(expected, summary); diff --git a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java index c473c11005d..1945328e431 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java @@ -59,7 +59,7 @@ public class SyncDefaultRendererTestCase { Query q = new Query("/?query=a&tracelevel=5"); q.getPresentation().setTiming(true); Result r = new Result(q); - r.setCoverage(new Coverage(500, 1)); + r.setCoverage(new Coverage(500, 1, 1)); TimeTracker t = new TimeTracker(new Chain<Searcher>( new UselessSearcher("first"), new UselessSearcher("second"), diff --git a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java index 50234e4022c..4a2e45e5b53 100644 --- a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java @@ -59,7 +59,7 @@ public class XMLRendererTestCase { Query q = new Query("/?query=a"); Result result = new Result(q); - result.setCoverage(new Coverage(500, 1)); + result.setCoverage(new Coverage(500, 1, 1)); FastHit h = new FastHit("http://localhost/", .95); h.setField("$a", "Hello, world."); @@ -130,7 +130,7 @@ public class XMLRendererTestCase { q.getPresentation().setTiming(true); Result result = new Result(q); - result.setCoverage(new Coverage(500, 1)); + result.setCoverage(new Coverage(500, 1, 1)); TimeTracker t = new TimeTracker(new Chain<Searcher>(new NoopSearcher("first"), new NoopSearcher("second"), diff --git a/container-search/src/test/java/com/yahoo/search/result/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/CoverageTestCase.java index 1bbca461216..15ba994441c 100644 --- a/container-search/src/test/java/com/yahoo/search/result/CoverageTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/result/CoverageTestCase.java @@ -22,11 +22,11 @@ public class CoverageTestCase { @Test void testActiveCoverage() { - Coverage c = new Coverage(6, 5); + Coverage c = new Coverage(6, 5, 1); assertEquals(5, c.getActive()); assertEquals(6, c.getDocs()); - Coverage d = new Coverage(7, 6); + Coverage d = new Coverage(7, 6, 1); c.merge(d); assertEquals(11, c.getActive()); assertEquals(13, c.getDocs()); @@ -34,7 +34,7 @@ public class CoverageTestCase { @Test void testCoverageBasedOnTargetActive() { - var c = new Coverage(8, 10).setTargetActive(16); + var c = new Coverage(8, 10, 1).setTargetActive(16); assertEquals(50, c.getResultPercentage()); } @@ -67,7 +67,7 @@ public class CoverageTestCase { Result federationSearcherResult = new Result(new Query()); Result singleSourceResult = new Result(new Query()); - singleSourceResult.setCoverage(new Coverage(10, 1)); + singleSourceResult.setCoverage(new Coverage(10, 1, 1)); federationSearcherResult.mergeWith(singleSourceResult); assertEquals(1, federationSearcherResult.getCoverage(create).getResultSets()); } @@ -87,17 +87,18 @@ public class CoverageTestCase { @Test void testCoverageConversion() { - verifyCoverageConversion(new Coverage(6, 10).setDegradedReason(7).setTargetActive(12)); + verifyCoverageConversion(new Coverage(6, 10, 1).setDegradedReason(7).setTargetActive(12)); } @Test void testCoverageWorksForCorpusAboveZero() { - Coverage zero = new Coverage(0, 0); - assertEquals(0, zero.getNodes()); // TODO Wonder about this special handling..... - assertEquals(0, zero.getFullResultSets()); + Coverage zero = new Coverage(0, 0, 1); + assertEquals(1, zero.getNodes()); + assertEquals(1, zero.getFullResultSets()); for (int i =1; i < 10; i++) { - Coverage coverage = new Coverage(i, i); + Coverage coverage = new Coverage(i, i, 1); assertEquals(1, coverage.getNodes()); + assertEquals(1, coverage.getFullResultSets()); verifyCoverageConversion(coverage); } } |