diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-05-18 14:37:17 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-05-18 14:37:17 +0200 |
commit | 4f8fa003117d3ad1f30b6dc0adcabf4e923b0f90 (patch) | |
tree | ce780f3bac6be9f7a70b63f1853a96b2b9c322b8 /container-core | |
parent | 2c9cb8159adaced573fd1e34689e533946feea85 (diff) |
Revert "Merge pull request #22642 from vespa-engine/revert-22637-bratseth/model-syntax"
This reverts commit 2c9cb8159adaced573fd1e34689e533946feea85, reversing
changes made to a4dbfc43c7df534ee5b032204ef19a7b038d7e3e.
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/Coverage.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java index 95494190734..6b510aadd3f 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/Coverage.java +++ b/container-core/src/main/java/com/yahoo/container/handler/Coverage.java @@ -63,9 +63,8 @@ public class Coverage { } public void merge(Coverage other) { - if (other == null) { - return; - } + if (other == null) return; + docs += other.getDocs(); nodes += other.getNodes(); nodesTried += other.nodesTried; @@ -77,17 +76,17 @@ public class Coverage { // explicitly incomplete beats doc count beats explicitly full switch (other.fullReason) { - case EXPLICITLY_FULL: - // do nothing - break; - case EXPLICITLY_INCOMPLETE: - fullReason = FullCoverageDefinition.EXPLICITLY_INCOMPLETE; - break; - case DOCUMENT_COUNT: - if (fullReason == FullCoverageDefinition.EXPLICITLY_FULL) { - fullReason = FullCoverageDefinition.DOCUMENT_COUNT; - } - break; + case EXPLICITLY_FULL: + // do nothing + break; + case EXPLICITLY_INCOMPLETE: + fullReason = FullCoverageDefinition.EXPLICITLY_INCOMPLETE; + break; + case DOCUMENT_COUNT: + if (fullReason == FullCoverageDefinition.EXPLICITLY_FULL) { + fullReason = FullCoverageDefinition.DOCUMENT_COUNT; + } + break; } } |