summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-06-30 14:25:32 +0200
committerGitHub <noreply@github.com>2022-06-30 14:25:32 +0200
commit6049047d68a0d355c1438a7b79205cfb9c8a0e48 (patch)
tree45d7178ee3d9e2d7aa47a1e4f00d000c60900e09 /searchlib
parent44b2f5114416254d5eb859ea02f436c4b0dfaf0a (diff)
parent1cc350883d80872a67cb6d9e5ff549d5c00e969e (diff)
Merge pull request #23139 from vespa-engine/andreer/java-17-examples
Java 17 examples
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java4
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogPrecisionBenchmark.java1
2 files changed, 3 insertions, 2 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
index b48303ae98b..c64f0eaa211 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/transform/Simplifier.java
@@ -32,8 +32,8 @@ public class Simplifier extends ExpressionTransformer<TransformContext> {
node = transformChildren((CompositeNode) node, context); // depth first
if (node instanceof IfNode)
node = transformIf((IfNode) node);
- if (node instanceof EmbracedNode && hasSingleUndividableChild((EmbracedNode)node))
- node = ((EmbracedNode)node).children().get(0);
+ if (node instanceof EmbracedNode e && hasSingleUndividableChild(e))
+ node = e.children().get(0);
if (node instanceof ArithmeticNode)
node = transformArithmetic((ArithmeticNode) node);
if (node instanceof NegativeNode)
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogPrecisionBenchmark.java b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogPrecisionBenchmark.java
index cd283d31931..b55396151f4 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogPrecisionBenchmark.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogPrecisionBenchmark.java
@@ -8,6 +8,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import java.util.stream.Collectors;
/**
* This benchmarks performs a series of unique counting tests to analyse the HyperLogLog accuracy.