diff options
9 files changed, 44 insertions, 73 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java index 577639ead7a..212b985f7f1 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Index.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Index.java @@ -53,9 +53,6 @@ public class Index implements Cloneable, Serializable { */ private Stemming stemming = null; - /** Whether the content of this index is normalized */ - private boolean normalized = true; - private Type type = Type.VESPA; /** The boolean index definition, if set */ @@ -126,20 +123,19 @@ public class Index implements Cloneable, Serializable { if (o == null || getClass() != o.getClass()) return false; Index index = (Index) o; return prefix == index.prefix && - normalized == index.normalized && - interleavedFeatures == index.interleavedFeatures && - Objects.equals(name, index.name) && - rankType == index.rankType && - Objects.equals(aliases, index.aliases) && - stemming == index.stemming && - type == index.type && - Objects.equals(boolIndex, index.boolIndex) && - Objects.equals(hnswIndexParams, index.hnswIndexParams); + interleavedFeatures == index.interleavedFeatures && + Objects.equals(name, index.name) && + rankType == index.rankType && + Objects.equals(aliases, index.aliases) && + stemming == index.stemming && + type == index.type && + Objects.equals(boolIndex, index.boolIndex) && + Objects.equals(hnswIndexParams, index.hnswIndexParams); } @Override public int hashCode() { - return Objects.hash(name, rankType, prefix, aliases, stemming, normalized, type, boolIndex, hnswIndexParams, interleavedFeatures); + return Objects.hash(name, rankType, prefix, aliases, stemming, type, boolIndex, hnswIndexParams, interleavedFeatures); } public String toString() { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java index 9ce1b8bb330..c89f6f09b77 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/Search.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/Search.java @@ -23,7 +23,6 @@ import com.yahoo.vespa.model.AbstractService; import java.io.Reader; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -48,7 +47,7 @@ import java.util.stream.Stream; public class Search implements ImmutableSearch { private static final String SD_DOC_FIELD_NAME = "sddocname"; - private static final List<String> RESERVED_NAMES = Arrays.asList( + private static final List<String> RESERVED_NAMES = List.of( "index", "index_url", "summary", "attribute", "select_input", "host", SummaryClass.DOCUMENT_ID_FIELD, "position", "split_foreach", "tokenize", "if", "else", "switch", "case", SD_DOC_FIELD_NAME, "relevancy"); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java index cf7bef654b0..ac92207820c 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java @@ -482,7 +482,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer, public void setDataType(DataType type) { if (type.equals(DataType.URI)) { // Different defaults, naturally normalizing.inferLowercase(); - stemming=Stemming.NONE; + stemming = Stemming.NONE; } this.dataType = type; if ( ! idOverride) { @@ -672,7 +672,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer, */ @Override public Stemming getStemming(Search search) { - if (stemming!=null) + if (stemming != null) return stemming; else return search.getStemming(); @@ -687,7 +687,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer, * Sets how this field should be stemmed, or set to null to use the default. */ public void setStemming(Stemming stemming) { - this.stemming=stemming; + this.stemming = stemming; } /** Returns an unmodifiable map of the summary fields defined in this */ diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java index 8a7ee78ea91..cefad472df7 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/Stemming.java @@ -3,12 +3,10 @@ package com.yahoo.searchdefinition.document; import com.yahoo.language.process.StemMode; -import java.util.logging.Logger; - /** - * <p>The stemming setting of a field. This describes how the search engine + * The stemming setting of a field. This describes how the search engine * should transform content of this field into base forms (stems) to increase - * recall (find "car" when you search for "cars" etc.).</p> + * recall (find "car" when you search for "cars" etc.). * * @author bratseth */ @@ -26,8 +24,6 @@ public enum Stemming { /** index multiple stems */ MULTIPLE("multiple"); - private static Logger log=Logger.getLogger(Stemming.class.getName()); - private final String name; /** @@ -36,7 +32,6 @@ public enum Stemming { * * @throws IllegalArgumentException if there is no stemming type with the given name */ - @SuppressWarnings("deprecation") public static Stemming get(String stemmingName) { try { return Stemming.valueOf(stemmingName.toUpperCase()); @@ -51,11 +46,11 @@ public enum Stemming { public String getName() { return name; } + @Override public String toString() { return "stemming " + name; } - @SuppressWarnings("deprecation") public StemMode toStemMode() { switch(this) { case SHORTEST: return StemMode.SHORTEST; diff --git a/container-search/src/main/java/com/yahoo/prelude/query/TermItem.java b/container-search/src/main/java/com/yahoo/prelude/query/TermItem.java index 2c33e7a2630..5df0cd120b2 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/TermItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/TermItem.java @@ -97,37 +97,19 @@ public abstract class TermItem extends SimpleIndexedItem implements BlockItem { @Override public int getTermCount() { return 1; } - /** - * This refers to whether accent removal is a meaningful and possible - * operation for this word. It should be named "isTransformable" or similar, - * but for historical reasons that is not the case. This method has nothing - * to do with Unicode normalization. - * - * @return true if accent removal can/should be performed - */ - public boolean isNormalizable() { - return normalizable; - } + /** Returns whether accent removal is a meaningful and possible operation for this word. */ + public boolean isNormalizable() { return normalizable; } /** - * This refers to whether accent removal is a meaningful and possible - * operation for this word. It should be named "isTransformable" or similar, - * but for historical reasons that is not the case. This method has nothing - * to do with Unicode normalization. + * Sets whether accent removal is a meaningful and possible operation for this word. * * @param normalizable set to true if accent removal can/should be performed */ - public void setNormalizable(boolean normalizable) { - this.normalizable = normalizable; - } + public void setNormalizable(boolean normalizable) { this.normalizable = normalizable; } @Override - public SegmentingRule getSegmentingRule() { - return segmentingRule; - } + public SegmentingRule getSegmentingRule() { return segmentingRule; } - public void setSegmentingRule(SegmentingRule segmentingRule) { - this.segmentingRule = segmentingRule; - } + public void setSegmentingRule(SegmentingRule segmentingRule) { this.segmentingRule = segmentingRule; } } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java index 1da6f8bb472..488c2040976 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -67,16 +67,16 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { private final BlockingQueue<Response> responses = new LinkedBlockingQueue<>(); private final ThrottlePolicy throttlePolicy; private final SourceSession session; + private final String routeForGet; private String route; - private String routeForGet; private int traceLevel; /** * Creates a new async session running on message bus logic. * - * @param asyncParams Common asyncsession parameters, not used. - * @param bus The message bus on which to run. - * @param mbusParams Parameters concerning message bus configuration. + * @param asyncParams common asyncsession parameters, not used + * @param bus the message bus on which to run + * @param mbusParams parameters concerning message bus configuration */ MessageBusAsyncSession(AsyncParameters asyncParams, MessageBus bus, MessageBusParams mbusParams) { this(asyncParams, bus, mbusParams, null); @@ -85,10 +85,10 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { /** * Creates a new async session running on message bus logic with a specified reply handler. * - * @param asyncParams Common asyncsession parameters, not used. - * @param bus The message bus on which to run. - * @param mbusParams Parameters concerning message bus configuration. - * @param handler The external reply handler. + * @param asyncParams common asyncsession parameters, not used + * @param bus the message bus on which to run + * @param mbusParams parameters concerning message bus configuration + * @param handler the external reply handler */ MessageBusAsyncSession(AsyncParameters asyncParams, MessageBus bus, MessageBusParams mbusParams, ReplyHandler handler) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotator.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotator.java index 81a5305a778..f6d2be796dc 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotator.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/linguistics/LinguisticsAnnotator.java @@ -29,6 +29,7 @@ public class LinguisticsAnnotator { private final AnnotatorConfig config; private static class TermOccurrences { + final Map<String, Integer> termOccurrences = new HashMap<>(); final int maxOccurrences; @@ -38,14 +39,13 @@ public class LinguisticsAnnotator { boolean termCountBelowLimit(String term) { String lowerCasedTerm = toLowerCase(term); - int occurences = termOccurrences.getOrDefault(lowerCasedTerm, 0); - if (occurences >= maxOccurrences) { - return false; - } + int occurrences = termOccurrences.getOrDefault(lowerCasedTerm, 0); + if (occurrences >= maxOccurrences) return false; - termOccurrences.put(lowerCasedTerm, occurences + 1); + termOccurrences.put(lowerCasedTerm, occurrences + 1); return true; } + } /** @@ -69,16 +69,15 @@ public class LinguisticsAnnotator { if (text.getSpanTree(SpanTrees.LINGUISTICS) != null) return true; // Already annotated with LINGUISTICS. Tokenizer tokenizer = factory.getTokenizer(); - String input = (text.getString().length() <= config.getMaxTokenizeLength()) + String input = (text.getString().length() <= config.getMaxTokenizeLength()) ? text.getString() : text.getString().substring(0, config.getMaxTokenizeLength()); Iterable<Token> tokens = tokenizer.tokenize(input, config.getLanguage(), config.getStemMode(), config.getRemoveAccents()); TermOccurrences termOccurrences = new TermOccurrences(config.getMaxTermOccurrences()); SpanTree tree = new SpanTree(SpanTrees.LINGUISTICS); - for (Token token : tokens) { - addAnnotationSpan(text.getString(), tree.spanList(), tokenizer, token, config.getStemMode(), termOccurrences); - } + for (Token token : tokens) + addAnnotationSpan(text.getString(), tree.spanList(), token, config.getStemMode(), termOccurrences); if (tree.numAnnotations() == 0) return false; text.setSpanTree(tree); @@ -107,11 +106,11 @@ public class LinguisticsAnnotator { } } - private static void addAnnotationSpan(String input, SpanList parent, Tokenizer tokenizer, Token token, StemMode mode, TermOccurrences termOccurrences) { + private static void addAnnotationSpan(String input, SpanList parent, Token token, StemMode mode, TermOccurrences termOccurrences) { if ( ! token.isSpecialToken()) { if (token.getNumComponents() > 0) { for (int i = 0; i < token.getNumComponents(); ++i) { - addAnnotationSpan(input, parent, tokenizer, token.getComponent(i), mode, termOccurrences); + addAnnotationSpan(input, parent, token.getComponent(i), mode, termOccurrences); } return; } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java b/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java index 39fc9aa8314..fcef11b2e74 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java @@ -152,4 +152,5 @@ public class Sequencer implements MessageHandler, ReplyHandler { ReplyHandler handler = reply.popHandler(); handler.handleReply(reply); } + } diff --git a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java index 204bf2f7906..248cbdca7a0 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/SourceSession.java @@ -137,8 +137,7 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked private Result sendInternal(Message message) { synchronized (lock) { if (closed) { - return new Result(ErrorCode.SEND_QUEUE_CLOSED, - "Source session is closed."); + return new Result(ErrorCode.SEND_QUEUE_CLOSED, "Source session is closed."); } if (throttlePolicy != null && ! throttlePolicy.canSend(message, pendingCount)) { return new Result(ErrorCode.SEND_QUEUE_FULL, @@ -152,8 +151,8 @@ public final class SourceSession implements ReplyHandler, MessageBus.SendBlocked } if (message.getTrace().shouldTrace(TraceLevel.COMPONENT)) { message.getTrace().trace(TraceLevel.COMPONENT, - "Source session accepted a " + message.getApproxSize() + " byte message. " + - pendingCount + " message(s) now pending."); + "Source session accepted a " + message.getApproxSize() + " byte message. " + + pendingCount + " message(s) now pending."); } message.pushHandler(this); sequencer.handleMessage(message); |