diff options
Diffstat (limited to 'searchlib/src/main/java/com/yahoo/searchlib/aggregation')
27 files changed, 44 insertions, 47 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java index 3c168090695..1f3485f8e70 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.ExpressionNode; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java index df4bdf12980..62201db88f4 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/AverageAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.IntegerResultNode; @@ -16,7 +16,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class AverageAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 85, AverageAggregationResult.class); + public static final int classId = registerClass(0x4000 + 85, AverageAggregationResult.class, AverageAggregationResult::new); private NumericResultNode sum; private long count; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java index 479269a8bbd..3fa8db5f9db 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/CountAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.IntegerResultNode; @@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class CountAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 81, CountAggregationResult.class); + public static final int classId = registerClass(0x4000 + 81, CountAggregationResult.class, CountAggregationResult::new); private long count = 0; /** Constructs an empty result node. <b>NOTE:</b> This instance is broken until non-optional member data is set. */ diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java index 4d45f5785b7..9242e01076c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ExpressionCountAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.aggregation.hll.*; @@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class ExpressionCountAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 88, ExpressionCountAggregationResult.class); + public static final int classId = registerClass(0x4000 + 88, ExpressionCountAggregationResult.class, ExpressionCountAggregationResult::new); private static final int UNDEFINED = -1; // The unique count estimator @@ -29,7 +29,6 @@ public class ExpressionCountAggregationResult extends AggregationResult { /** Constructor used for deserialization. Will be instantiated with a default sketch. */ - @SuppressWarnings("UnusedDeclaration") public ExpressionCountAggregationResult() { this(new SparseSketch(), new HyperLogLogEstimator()); } diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java index 5bf161b380f..4a29c98ad89 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/FS4Hit.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.document.GlobalId; @@ -13,7 +13,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class FS4Hit extends Hit { - public static final int classId = registerClass(0x4000 + 95, FS4Hit.class); // shared with c++ + public static final int classId = registerClass(0x4000 + 95, FS4Hit.class, FS4Hit::new); // shared with c++ private int path = 0; private GlobalId globalId = new GlobalId(new byte[GlobalId.LENGTH]); private int distributionKey = -1; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java index 74d498d33f7..cd20e34c01e 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java index 0b629d43446..722d78a23db 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Group.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.AggregationRefNode; @@ -18,7 +18,7 @@ import java.util.List; public class Group extends Identifiable { - public static final int classId = registerClass(0x4000 + 90, Group.class); + public static final int classId = registerClass(0x4000 + 90, Group.class, Group::new); private static final ObjectPredicate REF_LOCATOR = new RefLocator(); private static final int MAX_AGGREGATIONS = 0x10000; // Backend limitation private static final int MAX_ORDERBY_EXPRESSIONS = 8; // Backend limitation diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java index 583bf1ac8b9..fa3e307cb4a 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Grouping.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.BucketResultNode; @@ -24,7 +24,7 @@ public class Grouping extends Identifiable { } // The global class identifier shared with C++. - public static final int classId = registerClass(0x4000 + 91, Grouping.class); + public static final int classId = registerClass(0x4000 + 91, Grouping.class, Grouping::new); // The client id for this grouping request. private int id = 0; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java index 0db933966a8..89f552f0bfe 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/GroupingLevel.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.ExpressionNode; @@ -10,7 +10,7 @@ import com.yahoo.vespa.objects.Serializer; public class GroupingLevel extends Identifiable { // The global class identifier shared with C++. - public static final int classId = registerClass(0x4000 + 93, GroupingLevel.class); + public static final int classId = registerClass(0x4000 + 93, GroupingLevel.class, GroupingLevel::new); // The maximum number of groups allowed at this level. private long maxGroups = -1; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Hit.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Hit.java index 4da37ac6919..890f8b19ff1 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Hit.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/Hit.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.vespa.objects.Deserializer; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java index ea39dde92e1..c737add21c0 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/HitsAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.FloatResultNode; @@ -7,8 +7,6 @@ import com.yahoo.text.Utf8; import com.yahoo.vespa.objects.*; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.List; /** @@ -20,7 +18,7 @@ import java.util.List; */ public class HitsAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 87, HitsAggregationResult.class); + public static final int classId = registerClass(0x4000 + 87, HitsAggregationResult.class, HitsAggregationResult::new); private String summaryClass = "default"; private int maxHits = -1; private List<Hit> hits = new ArrayList<>(); diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java index 9f75d57d863..6d9b50b52b1 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MaxAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.ResultNode; @@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class MaxAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 83, MaxAggregationResult.class); + public static final int classId = registerClass(0x4000 + 83, MaxAggregationResult.class, MaxAggregationResult::new); private SingleResultNode max; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java index eb76ce03c17..1ffedb9aedc 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/MinAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.ResultNode; @@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class MinAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 84, MinAggregationResult.class); + public static final int classId = registerClass(0x4000 + 84, MinAggregationResult.class, MinAggregationResult::new); private SingleResultNode min; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/RawData.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/RawData.java index 7a343da0165..c3a91565837 100755 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/RawData.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/RawData.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.vespa.objects.Deserializer; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/StandardDeviationAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/StandardDeviationAggregationResult.java index 63e345b08e9..91716f00750 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/StandardDeviationAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/StandardDeviationAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.FloatResultNode; @@ -11,7 +11,7 @@ import com.yahoo.vespa.objects.Serializer; * @author bjorncs */ public class StandardDeviationAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 89, StandardDeviationAggregationResult.class); + public static final int classId = registerClass(0x4000 + 89, StandardDeviationAggregationResult.class, StandardDeviationAggregationResult::new); private long count; private double sum; @@ -56,7 +56,7 @@ public class StandardDeviationAggregationResult extends AggregationResult { @Override protected boolean equalsAggregation(AggregationResult obj) { StandardDeviationAggregationResult other = (StandardDeviationAggregationResult) obj; - return count == this.count && sum == other.sum && sumOfSquared == other.sumOfSquared; + return count == other.count && sum == other.sum && sumOfSquared == other.sumOfSquared; } @Override diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java index ddcd186fcf2..1f0dd0b90af 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/SumAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.ResultNode; @@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class SumAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 82, SumAggregationResult.class); + public static final int classId = registerClass(0x4000 + 82, SumAggregationResult.class, SumAggregationResult::new); private SingleResultNode sum; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/VdsHit.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/VdsHit.java index 3a040869141..5f14b6a937f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/VdsHit.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/VdsHit.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.text.Utf8; @@ -8,7 +8,7 @@ import com.yahoo.vespa.objects.Serializer; public class VdsHit extends Hit { - public static final int classId = registerClass(0x4000 + 96, VdsHit.class); + public static final int classId = registerClass(0x4000 + 96, VdsHit.class, VdsHit::new); private String docId = ""; private RawData summary = new RawData(); diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java index 4e8a2a667a5..beb03160a05 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/XorAggregationResult.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation; import com.yahoo.searchlib.expression.IntegerResultNode; @@ -15,7 +15,7 @@ import com.yahoo.vespa.objects.Serializer; */ public class XorAggregationResult extends AggregationResult { - public static final int classId = registerClass(0x4000 + 86, XorAggregationResult.class); + public static final int classId = registerClass(0x4000 + 86, XorAggregationResult.class, XorAggregationResult::new); private long xor = 0; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/BiasEstimator.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/BiasEstimator.java index be298742a12..47bacc55fde 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/BiasEstimator.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/BiasEstimator.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; import com.google.common.base.Preconditions; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLog.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLog.java index d5147929f3b..d88005f106b 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLog.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLog.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java index 16cfe6a0254..634a6641e2f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/HyperLogLogEstimator.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; import com.google.common.base.Preconditions; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java index 327d7bb12fd..c27c509fa94 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/NormalSketch.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; import com.google.common.base.Preconditions; @@ -18,7 +18,7 @@ import java.util.Arrays; */ public class NormalSketch extends Sketch<NormalSketch> { - public static final int classId = registerClass(0x4000 + 170, NormalSketch.class); + public static final int classId = registerClass(0x4000 + 170, NormalSketch.class, NormalSketch::new); private final byte[] data; private final int bucketMask; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/Sketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/Sketch.java index f37f7d4effd..1f2180786ba 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/Sketch.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/Sketch.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; import com.yahoo.vespa.objects.Identifiable; diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SketchMerger.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SketchMerger.java index 41e5423472a..e2da47edd6c 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SketchMerger.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SketchMerger.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java index 2b819688df0..84896b359ef 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/SparseSketch.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; import com.yahoo.vespa.objects.Deserializer; @@ -8,7 +8,7 @@ import java.util.HashSet; public class SparseSketch extends Sketch<SparseSketch> { - public static final int classId = registerClass(0x4000 + 171, SparseSketch.class); + public static final int classId = registerClass(0x4000 + 171, SparseSketch.class, SparseSketch::new); private final HashSet<Integer> values = new HashSet<>(); @Override diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java index 88512f987d5..bf28ea8186f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/hll/UniqueCountEstimator.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchlib.aggregation.hll; /** diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/package-info.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/package-info.java index de09a7ecb18..68733816cb2 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/package-info.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/package-info.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage package com.yahoo.searchlib.aggregation; import com.yahoo.osgi.annotation.ExportPackage; |