diff options
62 files changed, 404 insertions, 318 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java index 6274ec77e01..16d1cb6855b 100644 --- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java +++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java @@ -4,17 +4,18 @@ package com.yahoo.vespa.config.proxy; import com.yahoo.concurrent.DaemonThreadFactory; import com.yahoo.config.subscription.ConfigSourceSet; import com.yahoo.jrt.Spec; - import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Transport; import com.yahoo.log.LogLevel; import com.yahoo.log.LogSetup; import com.yahoo.log.event.Event; -import com.yahoo.system.CatchSigTerm; -import com.yahoo.vespa.config.*; +import com.yahoo.vespa.config.JRTConnectionPool; +import com.yahoo.vespa.config.RawConfig; +import com.yahoo.vespa.config.TimingValues; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import com.yahoo.vespa.filedistribution.FileDistributionRpcServer; import com.yahoo.vespa.filedistribution.FileDownloader; +import com.yahoo.yolean.system.CatchSignals; import java.util.List; import java.util.concurrent.Executors; @@ -175,8 +176,8 @@ public class ProxyServer implements Runnable { return new RpcConfigSourceClient(configSource, clientUpdater, memoryCache, timingValues, delayedResponses); } - private void setupSigTermHandler() { - CatchSigTerm.setup(signalCaught); // catch termination signal + private void setupSignalHandler() { + CatchSignals.setup(signalCaught); // catch termination and interrupt signals } private void waitForShutdown() { @@ -215,8 +216,8 @@ public class ProxyServer implements Runnable { DelayedResponses delayedResponses = new DelayedResponses(statistics); ProxyServer proxyServer = new ProxyServer(new Spec(null, port), delayedResponses, configSources, statistics, defaultTimingValues(), true, new MemoryCache(), null); - // catch termination signal - proxyServer.setupSigTermHandler(); + // catch termination and interrupt signal + proxyServer.setupSignalHandler(); Thread proxyserverThread = new Thread(proxyServer); proxyserverThread.setName("configproxy"); proxyserverThread.start(); diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index e402adbaeb9..24a46602b60 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -352,6 +352,34 @@ ], "fields": [] }, + "com.yahoo.prelude.query.BoolItem": { + "superClass": "com.yahoo.prelude.query.TermItem", + "interfaces": [], + "attributes": [ + "public" + ], + "methods": [ + "public void <init>(boolean)", + "public void <init>(boolean, java.lang.String)", + "public void <init>(boolean, java.lang.String, boolean)", + "public com.yahoo.prelude.query.Item$ItemType getItemType()", + "public java.lang.String getName()", + "protected void encodeThis(java.nio.ByteBuffer)", + "public boolean value()", + "public java.lang.String stringValue()", + "public void setValue(boolean)", + "public void setValue(java.lang.String)", + "public java.lang.String getRawWord()", + "public boolean isStemmed()", + "protected void appendHeadingString(java.lang.StringBuilder)", + "public int hashCode()", + "public boolean equals(java.lang.Object)", + "public int getNumWords()", + "public java.lang.String getIndexedString()", + "public boolean isWords()" + ], + "fields": [] + }, "com.yahoo.prelude.query.CompositeIndexedItem": { "superClass": "com.yahoo.prelude.query.CompositeTaggableItem", "interfaces": [ @@ -1321,6 +1349,7 @@ "public" ], "methods": [ + "public void <init>(java.lang.String)", "public void <init>(int, int, java.lang.String)", "public java.lang.String getValue()", "public java.lang.String getSuperstring()", @@ -1618,8 +1647,6 @@ "public" ], "methods": [ - "public com.yahoo.prelude.query.Item$ItemType getItemType()", - "public java.lang.String getName()", "public void <init>(java.lang.String)", "public void <init>(java.lang.String, java.lang.String)", "public void <init>(java.lang.String, boolean)", @@ -1627,6 +1654,8 @@ "public void <init>(com.yahoo.prelude.query.parser.Token, boolean)", "public void <init>(java.lang.String, boolean, com.yahoo.prelude.query.Substring)", "public void <init>(java.lang.String, java.lang.String, boolean, com.yahoo.prelude.query.Substring)", + "public com.yahoo.prelude.query.Item$ItemType getItemType()", + "public java.lang.String getName()", "public void setWord(java.lang.String)", "protected void encodeThis(java.nio.ByteBuffer)", "protected java.lang.String getEncodedWord()", @@ -1728,6 +1757,7 @@ "public void attachContext(com.yahoo.search.Query)", "public java.lang.String yqlRepresentation()", "public java.lang.String yqlRepresentation(com.yahoo.collections.Tuple2, boolean)", + "public java.lang.String yqlRepresentation(boolean)", "public com.yahoo.search.query.context.QueryContext getContext(boolean)", "public int hashCode()", "public boolean equals(java.lang.Object)", diff --git a/container-search/src/main/java/com/yahoo/prelude/query/BoolItem.java b/container-search/src/main/java/com/yahoo/prelude/query/BoolItem.java new file mode 100644 index 00000000000..27045629780 --- /dev/null +++ b/container-search/src/main/java/com/yahoo/prelude/query/BoolItem.java @@ -0,0 +1,102 @@ +// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.prelude.query; + +import java.nio.ByteBuffer; + +/** + * A true/false term suitable for searching bool indexes. + */ +public class BoolItem extends TermItem { + + private boolean value; + + public BoolItem(boolean value) { + this(value, ""); + } + + public BoolItem(boolean value, String indexName) { this(value, indexName, false); } + + public BoolItem(boolean value, String indexName, boolean isFromQuery) { + super(indexName, isFromQuery, new Substring(String.valueOf(value))); + this.value = value; + } + + /** Returns ItemType.WORD as we do not want a string binding from the parsed query to index types */ + @Override + public ItemType getItemType() { return ItemType.WORD; } + + @Override + public String getName() { return "BOOL"; } + + @Override + protected void encodeThis(ByteBuffer buffer) { + super.encodeThis(buffer); // takes care of index bytes + putString(stringValue(), buffer); + } + + public boolean value() { return value; } + + /** Returns "true" or "false" */ + @Override + public String stringValue() { return value ? "true" : "false"; } + + public void setValue(boolean value) { + this.value = value; + } + + /** + * Sets the value from a string + * + * @param stringValue "true" or "false" + * @throws IllegalArgumentException if the given value is not equal to "true" nor "false" (ignoring case) + */ + @Override + public void setValue(String stringValue) { + this.value = toBoolean(stringValue); + } + + private boolean toBoolean(String stringValue) { + switch (stringValue.toLowerCase()) { + case "true" : return true; + case "false" : return false; + default: throw new IllegalArgumentException("Expected 'true' or 'false', got '" + stringValue + "'"); + } + } + + /** Returns the same as stringValue */ + @Override + public String getRawWord() { + return stringValue(); + } + + @Override + public boolean isStemmed() { return false; } + + /** Word items uses a empty heading instead of "WORD " */ + @Override + protected void appendHeadingString(StringBuilder buffer) {} + + @Override + public int hashCode() { + return Boolean.hashCode(value); + } + + @Override + public boolean equals(Object object) { + if ( ! super.equals(object)) return false; + + BoolItem other = (BoolItem) object; // Ensured by superclass + return this.value == other.value; + } + + @Override + public int getNumWords() { return 1; } + + @Override + public String getIndexedString() { return stringValue(); } + + /** Returns true if this consists of regular word characters. Returns false if this represents a "special token" */ + @Override + public boolean isWords() { return false; } + +} diff --git a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java index 2e24937856c..714e8f9cb5e 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/IntItem.java @@ -56,17 +56,6 @@ public class IntItem extends TermItem { expression = toExpression(from, to, 0); } - /** Returns the simplest expression matching this */ - private String toExpression(Limit from, Limit to, int hitLimit) { - if (from.equals(to) && hitLimit == 0) return from.number().toString(); - - String expression = from.toRangeStart() + ";" + to.toRangeEnd(); - if (hitLimit == 0) return expression; - - // Insert ;hitLimit at the end inside the brackets - return expression.substring(0, expression.length()-1) + ";" + hitLimit + expression.substring(expression.length()-1); - } - public IntItem(String expression) { this(expression, ""); } @@ -91,8 +80,19 @@ public class IntItem extends TermItem { this.expression = toExpression(from, to, hitLimit); } + /** Returns the simplest expression matching this */ + private String toExpression(Limit from, Limit to, int hitLimit) { + if (from.equals(to) && hitLimit == 0) return from.number().toString(); + + String expression = from.toRangeStart() + ";" + to.toRangeEnd(); + if (hitLimit == 0) return expression; + + // Insert ;hitLimit at the end inside the brackets + return expression.substring(0, expression.length()-1) + ";" + hitLimit + expression.substring(expression.length()-1); + } + /** Sets limit and flip them if "from" is greater than "to" */ - private final void setLimits(Limit from, Limit to) { + private void setLimits(Limit from, Limit to) { if (from.number().doubleValue() > to.number().doubleValue()) { this.from = to; this.to = from; @@ -188,8 +188,7 @@ public class IntItem extends TermItem { * <code>from</code> are returned, and if this number is negative the hits * closest to <code>to</code> are returned. * - * @param hitLimit - * number of hits to match for this operator + * @param hitLimit number of hits to match for this operator */ public final void setHitLimit(int hitLimit) { this.hitLimit = hitLimit; diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java index 2535619f193..f230c76c954 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java @@ -54,17 +54,15 @@ public abstract class SimpleIndexedItem extends SimpleTaggableItem implements In } } + @Override public boolean equals(Object object) { - if (!super.equals(object)) { - return false; - } + if (!super.equals(object)) return false; + IndexedItem other = (IndexedItem) object; // Ensured by superclass - if (!this.index.equals(other.getIndexName())) { - return false; - } - return true; + return this.index.equals(other.getIndexName()); } + @Override public int hashCode() { return super.hashCode() + 113 * index.hashCode(); } diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Substring.java b/container-search/src/main/java/com/yahoo/prelude/query/Substring.java index 10ea6f85b5f..ab3e28fc259 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/Substring.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/Substring.java @@ -19,14 +19,21 @@ public class Substring { /** The string this is a substring of */ public final String string; - public Substring(int start, int end,String string) { + /** Creates a substring which is identical to the string containing it */ + public Substring(String string) { + this.start = 0; + this.end = string.length(); + this.string=string; + } + + public Substring(int start, int end, String string) { this.start = start; this.end = end; this.string=string; } public String getValue() { - return string.substring(start,end); + return string.substring(start, end); } /** Returns the entire string this is a substring of. The start and end offsets are into this string. */ 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 764fb2b1118..8fdf147ce0b 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 @@ -8,8 +8,7 @@ import java.nio.ByteBuffer; /** - * Superclass of "leaf" conditions containing a single entity which is either matched in - * a field or not. + * Superclass of "leaf" conditions containing a single entity which is either matched in a field or not. * * @author bratseth * @author havardpe @@ -116,8 +115,7 @@ public abstract class TermItem extends SimpleIndexedItem implements BlockItem { * but for historical reasons that is not the case. This method has nothing * to do with Unicode normalization. * - * @param normalizable - * set to true if accent removal can/should be performed + * @param normalizable set to true if accent removal can/should be performed */ public void setNormalizable(boolean normalizable) { this.normalizable = normalizable; diff --git a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java index 0eb37373e1f..a0467703b13 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/TermType.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/TermType.java @@ -6,7 +6,7 @@ package com.yahoo.prelude.query; * A term type enumeration * * @author bratseth - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class TermType { @@ -62,10 +62,9 @@ public class TermType { */ public Item createItemClass() { try { - return instanceClass.newInstance(); + return instanceClass.getDeclaredConstructor().newInstance(); } catch (Exception e) { - throw new RuntimeException("Could not create an instance for item " - + this, e); + throw new RuntimeException("Could not create an instance for item " + this, e); } } @@ -73,16 +72,15 @@ public class TermType { return sign; } + @Override public boolean equals(Object o) { - if (!(o instanceof TermType)) { - return false; - } + if ( ! (o instanceof TermType)) return false; TermType other = (TermType) o; - return name.equals(other.name); } + @Override public int hashCode() { return name.hashCode(); } diff --git a/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java b/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java index fb0a2418d37..72ba012ab07 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/ToolBox.java @@ -6,12 +6,13 @@ import com.google.common.annotations.Beta; /** * Query tree helper methods and factories. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ @Beta public final class ToolBox { public static abstract class QueryVisitor { + /** * Called for each item in the query tree given to * {@link ToolBox#visit(QueryVisitor, Item)}. Return true to visit the @@ -29,6 +30,7 @@ public final class ToolBox { * visit() if there are no sub-items or visit() returned false. */ public abstract void onExit(); + } public static void visit(QueryVisitor visitor, Item item) { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java index 39573e4d71f..be56c95a6af 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java @@ -33,14 +33,6 @@ public class WordItem extends TermItem { private boolean lowercased = false; - public ItemType getItemType() { - return ItemType.WORD; - } - - public String getName() { - return "WORD"; - } - public WordItem(String word) { this(word, ""); } @@ -70,12 +62,21 @@ public class WordItem extends TermItem { setWord(word); } + public ItemType getItemType() { + return ItemType.WORD; + } + + public String getName() { + return "WORD"; + } + public void setWord(String word) { Validator.ensureNotNull("The word of a word item", word); Validator.ensureNonEmpty("The word of a word item", word); this.word = word; } + @Override protected void encodeThis(ByteBuffer buffer) { super.encodeThis(buffer); // takes care of index bytes putString(getEncodedWord(), buffer); @@ -112,6 +113,7 @@ public class WordItem extends TermItem { return word; } + @Override public boolean isStemmed() { return stemmed; } public void setStemmed(boolean stemmed) { this.stemmed = stemmed; } @@ -168,6 +170,7 @@ public class WordItem extends TermItem { } /** Returns true if this consists of regular word characters. Returns false if this represents a "special token" */ + @Override public boolean isWords() { return words; } diff --git a/container-search/src/main/java/com/yahoo/search/Query.java b/container-search/src/main/java/com/yahoo/search/Query.java index 1c2f409d792..36a04bb86e8 100644 --- a/container-search/src/main/java/com/yahoo/search/Query.java +++ b/container-search/src/main/java/com/yahoo/search/Query.java @@ -776,11 +776,11 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { * different from default, while linguistics metadata are not added. * * @return a valid YQL+ query string or a human readable error message - * @see Query#yqlRepresentation(Tuple2, boolean) + * @see Query#yqlRepresentation(boolean) */ public String yqlRepresentation() { try { - return yqlRepresentation(null, true); + return yqlRepresentation(true); } catch (NullItemException e) { return "Query currently a placeholder, NullItem encountered."; } catch (RuntimeException e) { @@ -799,23 +799,22 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { } } + /** @deprecated remove the ignored segmenterVersion argument from invocations */ + @Deprecated // TODO: Remove on Vespa 8 + public String yqlRepresentation(Tuple2<String, Version> segmenterVersion, boolean includeHitsAndOffset) { + return yqlRepresentation(includeHitsAndOffset); + } + /** * Serialize this query as YQL+. This will create a string representation * which should always be legal YQL+. If a problem occurs, a * RuntimeException is thrown. * - * @param segmenterVersion - * linguistics metadata used in federation, set to null if the - * annotation is not necessary - * @param includeHitsAndOffset - * whether to include hits and offset parameters converted to a - * offset/limit slice + * @param includeHitsAndOffset whether to include hits and offset parameters converted to a offset/limit slice * @return a valid YQL+ query string * @throws RuntimeException if there is a problem serializing the query tree */ - public String yqlRepresentation(@Nullable Tuple2<String, Version> segmenterVersion, boolean includeHitsAndOffset) { - String q = VespaSerializer.serialize(this); - + public String yqlRepresentation(boolean includeHitsAndOffset) { Set<String> sources = getModel().getSources(); Set<String> fields = getPresentation().getSummaryFields(); StringBuilder yql = new StringBuilder("select "); @@ -834,31 +833,20 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { commaSeparated(yql, sources); } yql.append(" where "); - if (segmenterVersion != null) { - yql.append("[{\"segmenter\": {\"version\": \"") - .append(segmenterVersion.second.toString()) - .append("\", \"backend\": \"") - .append(segmenterVersion.first).append("\"}}]("); - } - yql.append(q); - if (segmenterVersion != null) { - yql.append(')'); - } + yql.append(VespaSerializer.serialize(this)); if (getRanking().getSorting() != null && getRanking().getSorting().fieldOrders().size() > 0) { serializeSorting(yql); } if (includeHitsAndOffset) { if (getOffset() != 0) { - yql.append(" limit ") - .append(Integer.toString(getHits() + getOffset())) - .append(" offset ") - .append(Integer.toString(getOffset())); + yql.append(" limit ").append(getHits() + getOffset()) + .append(" offset ").append(getOffset()); } else if (getHits() != 10) { - yql.append(" limit ").append(Integer.toString(getHits())); + yql.append(" limit ").append(getHits()); } } if (getTimeout() != defaultTimeout) { - yql.append(" timeout ").append(Long.toString(getTimeout())); + yql.append(" timeout ").append(getTimeout()); } yql.append(';'); return yql.toString(); @@ -871,29 +859,41 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { if (yql.length() > initLen) { yql.append(", "); } - final Class<? extends AttributeSorter> sorterType = f.getSorter() - .getClass(); + Class<? extends AttributeSorter> sorterType = f.getSorter().getClass(); if (sorterType == Sorting.RawSorter.class) { - yql.append("[{\"").append(YqlParser.SORTING_FUNCTION) - .append("\": \"").append(Sorting.RAW).append("\"}]"); + yql.append("[{\"") + .append(YqlParser.SORTING_FUNCTION) + .append("\": \"") + .append(Sorting.RAW) + .append("\"}]"); } else if (sorterType == Sorting.LowerCaseSorter.class) { - yql.append("[{\"").append(YqlParser.SORTING_FUNCTION) - .append("\": \"").append(Sorting.LOWERCASE) - .append("\"}]"); + yql.append("[{\"") + .append(YqlParser.SORTING_FUNCTION) + .append("\": \"") + .append(Sorting.LOWERCASE) + .append("\"}]"); } else if (sorterType == Sorting.UcaSorter.class) { Sorting.UcaSorter uca = (Sorting.UcaSorter) f.getSorter(); String ucaLocale = uca.getLocale(); Sorting.UcaSorter.Strength ucaStrength = uca.getStrength(); - yql.append("[{\"").append(YqlParser.SORTING_FUNCTION) - .append("\": \"").append(Sorting.UCA).append("\""); + yql.append("[{\"") + .append(YqlParser.SORTING_FUNCTION) + .append("\": \"") + .append(Sorting.UCA) + .append("\""); if (ucaLocale != null) { - yql.append(", \"").append(YqlParser.SORTING_LOCALE) - .append("\": \"").append(ucaLocale).append('"'); + yql.append(", \"") + .append(YqlParser.SORTING_LOCALE) + .append("\": \"") + .append(ucaLocale) + .append('"'); } if (ucaStrength != Sorting.UcaSorter.Strength.UNDEFINED) { - yql.append(", \"").append(YqlParser.SORTING_STRENGTH) - .append("\": \"").append(ucaStrength.name()) - .append('"'); + yql.append(", \"") + .append(YqlParser.SORTING_STRENGTH) + .append("\": \"") + .append(ucaStrength.name()) + .append('"'); } yql.append("}]"); } @@ -906,8 +906,8 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** Returns the context of this query, possibly creating it if missing. Returns the context, or null */ public QueryContext getContext(boolean create) { - if (context==null && create) - context=new QueryContext(getTraceLevel(),this); + if (context == null && create) + context = new QueryContext(getTraceLevel(),this); return context; } @@ -920,7 +920,7 @@ public class Query extends com.yahoo.processing.Request implements Cloneable { /** Returns whether the given query is equal to this */ @Override public boolean equals(Object other) { - if (this==other) return true; + if (this == other) return true; if ( ! (other instanceof Query)) return false; Query q = (Query) other; diff --git a/container-search/src/main/java/com/yahoo/search/result/Hit.java b/container-search/src/main/java/com/yahoo/search/result/Hit.java index db5b3e69803..10fa7d24d1a 100644 --- a/container-search/src/main/java/com/yahoo/search/result/Hit.java +++ b/container-search/src/main/java/com/yahoo/search/result/Hit.java @@ -5,13 +5,10 @@ import com.yahoo.collections.ArraySet; import com.yahoo.component.provider.ListenableFreezableClass; import com.yahoo.net.URI; import com.yahoo.prelude.hitfield.HitField; -import com.yahoo.prelude.hitfield.JSONString; -import com.yahoo.prelude.hitfield.XMLString; import com.yahoo.processing.Request; import com.yahoo.processing.response.Data; import com.yahoo.search.Query; import com.yahoo.search.Searcher; -import com.yahoo.text.XML; import java.util.Collections; import java.util.HashSet; @@ -22,7 +19,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.function.BiConsumer; -import java.util.stream.Collectors; /** * <p>A search hit. The identifier of the hit is the uri @@ -92,7 +88,6 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi * used to order equal relevant hit by add order */ private int addNumber = -1; - private int sourceNumber; /** The query which produced this hit. Used for multi phase searching */ private Query query; diff --git a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java index ac1c2ee4a6c..c27c047c899 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java +++ b/container-search/src/main/java/com/yahoo/search/yql/VespaSerializer.java @@ -61,6 +61,7 @@ import java.util.Map.Entry; import com.google.common.collect.ImmutableMap; import com.yahoo.prelude.query.AndItem; import com.yahoo.prelude.query.AndSegmentItem; +import com.yahoo.prelude.query.BoolItem; import com.yahoo.prelude.query.DotProductItem; import com.yahoo.prelude.query.EquivItem; import com.yahoo.prelude.query.ExactStringItem; @@ -102,9 +103,10 @@ import edu.umd.cs.findbugs.annotations.NonNull; /** * Serialize Vespa query trees to YQL+ strings. * - * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> + * @author Steinar Knutsen */ public class VespaSerializer { + // TODO refactor, too much copy/paste private static class AndSegmentSerializer extends Serializer { @@ -270,6 +272,7 @@ public class VespaSerializer { } private static class NotSerializer extends Serializer { + @Override void onExit(StringBuilder destination, Item item) { destination.append(')'); @@ -298,10 +301,8 @@ public class VespaSerializer { @Override boolean serialize(StringBuilder destination, Item item) { - throw new NullItemException( - "NullItem encountered in query tree." - + " This is usually a symptom of an invalid query or an error" - + " in a query transformer."); + throw new NullItemException("NullItem encountered in query tree. This is usually a symptom of an invalid " + + "query or an error in a query transformer."); } } @@ -402,6 +403,21 @@ public class VespaSerializer { } } + private static class BoolSerializer extends Serializer { + + @Override + void onExit(StringBuilder destination, Item item) { } + + @Override + boolean serialize(StringBuilder destination, Item item) { + BoolItem intItem = (BoolItem) item; + destination.append(normalizeIndexName(intItem.getIndexName())).append(" = "); + destination.append(((BoolItem) item).stringValue()); + return false; + } + + } + private static class RegExpSerializer extends Serializer { @Override @@ -419,6 +435,7 @@ public class VespaSerializer { } private static class ONearSerializer extends Serializer { + @Override void onExit(StringBuilder destination, Item item) { } @@ -452,6 +469,7 @@ public class VespaSerializer { } private static class OrSerializer extends Serializer { + @Override void onExit(StringBuilder destination, Item item) { destination.append(')'); @@ -1071,6 +1089,7 @@ public class VespaSerializer { dispatchBuilder.put(EquivItem.class, new EquivSerializer()); dispatchBuilder.put(ExactStringItem.class, new WordSerializer()); dispatchBuilder.put(IntItem.class, new NumberSerializer()); + dispatchBuilder.put(BoolItem.class, new BoolSerializer()); dispatchBuilder.put(MarkerWordItem.class, new WordSerializer()); // gotcha dispatchBuilder.put(NearItem.class, new NearSerializer()); dispatchBuilder.put(NotItem.class, new NotSerializer()); diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index 5928dd23b28..af095fefc1c 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -26,6 +26,7 @@ import com.yahoo.language.process.Segmenter; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.query.AndItem; import com.yahoo.prelude.query.AndSegmentItem; +import com.yahoo.prelude.query.BoolItem; import com.yahoo.prelude.query.CompositeItem; import com.yahoo.prelude.query.DotProductItem; import com.yahoo.prelude.query.EquivItem; @@ -947,8 +948,10 @@ public class YqlParser implements Parser { String value = fetchConditionWord(ast); TermItem item; - if (value.equals("true") || value.equals("false")) - item = new WordItem(value, fetchConditionIndex(ast)); + if (value.equals("true")) { + item = new BoolItem(true, fetchConditionIndex(ast)); + } else if (value.equals("false")) + item = new BoolItem(false, fetchConditionIndex(ast)); else item = new IntItem(value, fetchConditionIndex(ast)); diff --git a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java index b23e25e173e..e89c8aeb409 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/MinimalQueryInserterTestCase.java @@ -318,12 +318,12 @@ public class MinimalQueryInserterTestCase { } @Test - public void testStringReprBasicSanity() { + public void testStringRepresentation() { String yql = "select%20ignoredfield%20from%20ignoredsource%20where%20title%20contains%20%22madonna%22%20order%20by%20something%2C%20shoesize%20desc%20limit%20300%20timeout%203%3B"; Query query = new Query("search/?yql=" + yql); execution.search(query); - assertEquals("select ignoredfield from ignoredsource where [{\"segmenter\": {\"version\": \"1.9\", \"backend\": \"YqlUnitTest\"}}](title contains \"madonna\") order by something, shoesize desc limit 300 timeout 3;", - query.yqlRepresentation(new Tuple2<>("YqlUnitTest", new Version(1, 9)), true)); + assertEquals("select ignoredfield from ignoredsource where title contains \"madonna\" order by something, shoesize desc limit 300 timeout 3;", + query.yqlRepresentation()); } diff --git a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java index 6984a8537ef..faf254577ce 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/VespaSerializerTestCase.java @@ -94,7 +94,7 @@ public class VespaSerializerTestCase { } @Test - public final void testAnd() { + public void testAnd() { parseAndConfirm("(description contains \"a\" AND title contains \"that\")"); } @@ -103,39 +103,42 @@ public class VespaSerializerTestCase { } private void parseAndConfirm(String expected, String toParse) { - QueryTree item = parser - .parse(new Parsable() - .setQuery(SELECT + toParse + ";")); - // System.out.println(item.toString()); + QueryTree item = parser.parse(new Parsable().setQuery(SELECT + toParse + ";")); String q = VespaSerializer.serialize(item.getRoot()); assertEquals(expected, q); } @Test - public final void testAndNot() { + public void testAndNot() { parseAndConfirm("(description contains \"a\") AND !(title contains \"that\")"); } @Test - public final void testEquiv() { + public void testEquiv() { parseAndConfirm("title contains equiv(\"a\", \"b\")"); } @Test - public final void testNear() { + public void testNear() { parseAndConfirm("title contains near(\"a\", \"b\")"); parseAndConfirm("title contains ([{\"distance\": 50}]near(\"a\", \"b\"))"); } @Test - public final void testNumbers() { + public void testNumbers() { parseAndConfirm("title = 500"); parseAndConfirm("title > 500"); parseAndConfirm("title < 500"); } @Test - public final void testAnnotatedNumbers() { + public void testBoolean() { + parseAndConfirm("flag = true"); + parseAndConfirm("flag = false"); + } + + @Test + public void testAnnotatedNumbers() { parseAndConfirm("title = ([{\"filter\": true}]500)"); parseAndConfirm("title > ([{\"filter\": true}]500)"); parseAndConfirm("title < ([{\"filter\": true}](-500))"); @@ -144,32 +147,32 @@ public class VespaSerializerTestCase { } @Test - public final void testRange() { + public void testRange() { parseAndConfirm("range(title, 1, 500)"); } @Test - public final void testAnnotatedRange() { + public void testAnnotatedRange() { parseAndConfirm("[{\"filter\": true}]range(title, 1, 500)"); } @Test - public final void testOrderedNear() { + public void testOrderedNear() { parseAndConfirm("title contains onear(\"a\", \"b\")"); } @Test - public final void testOr() { + public void testOr() { parseAndConfirm("(description contains \"a\" OR title contains \"that\")"); } @Test - public final void testDotProduct() { + public void testDotProduct() { parseAndConfirm("dotProduct(description, {\"a\": 1, \"b\": 2})"); } @Test - public final void testPredicate() { + public void testPredicate() { parseAndConfirm("predicate(boolean,{\"gender\":\"male\"},{\"age\":25L})"); parseAndConfirm("predicate(boolean,{\"gender\":\"male\",\"hobby\":\"music\",\"hobby\":\"hiking\"}," + "{\"age\":25L})", @@ -182,32 +185,32 @@ public class VespaSerializerTestCase { } @Test - public final void testPhrase() { + public void testPhrase() { parseAndConfirm("description contains phrase(\"a\", \"b\")"); } @Test - public final void testAnnotatedPhrase() { + public void testAnnotatedPhrase() { parseAndConfirm("description contains ([{\"id\": 1}]phrase(\"a\", \"b\"))"); } @Test - public final void testAnnotatedNear() { + public void testAnnotatedNear() { parseAndConfirm("description contains ([{\"distance\": 37}]near(\"a\", \"b\"))"); } @Test - public final void testAnnotatedOnear() { + public void testAnnotatedOnear() { parseAndConfirm("description contains ([{\"distance\": 37}]onear(\"a\", \"b\"))"); } @Test - public final void testAnnotatedEquiv() { + public void testAnnotatedEquiv() { parseAndConfirm("description contains ([{\"id\": 1}]equiv(\"a\", \"b\"))"); } @Test - public final void testAnnotatedPhraseSegment() { + public void testAnnotatedPhraseSegment() { PhraseSegmentItem phraseSegment = new PhraseSegmentItem("abc", true, false); phraseSegment.addItem(new WordItem("a", "indexNamePlaceholder")); phraseSegment.addItem(new WordItem("b", "indexNamePlaceholder")); @@ -219,7 +222,7 @@ public class VespaSerializerTestCase { } @Test - public final void testSameElement() { + public void testSameElement() { SameElementItem sameElement = new SameElementItem("ss"); sameElement.addItem(new WordItem("a", "f1")); sameElement.addItem(new WordItem("b", "f2")); @@ -228,7 +231,7 @@ public class VespaSerializerTestCase { } @Test - public final void testAnnotatedAndSegment() { + public void testAnnotatedAndSegment() { AndSegmentItem andSegment = new AndSegmentItem("abc", true, false); andSegment.addItem(new WordItem("a", "indexNamePlaceholder")); andSegment.addItem(new WordItem("b", "indexNamePlaceholder")); @@ -239,32 +242,32 @@ public class VespaSerializerTestCase { } @Test - public final void testPhraseWithAnnotations() { + public void testPhraseWithAnnotations() { parseAndConfirm("description contains phrase(([{\"id\": 15}]\"a\"), \"b\")"); } @Test - public final void testPhraseSegmentInPhrase() { + public void testPhraseSegmentInPhrase() { parseAndConfirm("description contains phrase(\"a\", \"b\", ([{\"origin\": {\"original\": \"c d\", \"offset\": 0, \"length\": 3}}]phrase(\"c\", \"d\")))"); } @Test - public final void testRank() { + public void testRank() { parseAndConfirm("rank(a contains \"A\", b contains \"B\")"); } @Test - public final void testWand() { + public void testWand() { parseAndConfirm("wand(description, {\"a\": 1, \"b\": 2})"); } @Test - public final void testWeakAnd() { + public void testWeakAnd() { parseAndConfirm("weakAnd(a contains \"A\", b contains \"B\")"); } @Test - public final void testAnnotatedWeakAnd() { + public void testAnnotatedWeakAnd() { parseAndConfirm("([{\"" + YqlParser.TARGET_NUM_HITS + "\": 10}]weakAnd(a contains \"A\", b contains \"B\"))"); parseAndConfirm("([{\"" + YqlParser.SCORE_THRESHOLD + "\": 10}]weakAnd(a contains \"A\", b contains \"B\"))"); parseAndConfirm("([{\"" + YqlParser.TARGET_NUM_HITS + "\": 10, \"" + YqlParser.SCORE_THRESHOLD @@ -272,12 +275,12 @@ public class VespaSerializerTestCase { } @Test - public final void testWeightedSet() { + public void testWeightedSet() { parseAndConfirm("weightedSet(description, {\"a\": 1, \"b\": 2})"); } @Test - public final void testAnnotatedWord() { + public void testAnnotatedWord() { parseAndConfirm("description contains ([{\"andSegmenting\": true}]\"a\")"); parseAndConfirm("description contains ([{\"weight\": 37}]\"a\")"); parseAndConfirm("description contains ([{\"id\": 37}]\"a\")"); @@ -289,29 +292,29 @@ public class VespaSerializerTestCase { } @Test - public final void testPrefix() { + public void testPrefix() { parseAndConfirm("description contains ([{\"prefix\": true}]\"a\")"); } @Test - public final void testSuffix() { + public void testSuffix() { parseAndConfirm("description contains ([{\"suffix\": true}]\"a\")"); } @Test - public final void testSubstring() { + public void testSubstring() { parseAndConfirm("description contains ([{\"substring\": true}]\"a\")"); } @Test - public final void testExoticItemTypes() { + public void testExoticItemTypes() { Item item = MarkerWordItem.createEndOfHost(); String q = VespaSerializer.serialize(item); assertEquals("default contains ([{\"implicitTransforms\": false}]\"$\")", q); } @Test - public final void testEmptyIndex() { + public void testEmptyIndex() { Item item = new WordItem("nalle", true); String q = VespaSerializer.serialize(item); assertEquals("default contains \"nalle\"", q); @@ -319,7 +322,7 @@ public class VespaSerializerTestCase { @Test - public final void testLongAndNot() { + public void testLongAndNot() { NotItem item = new NotItem(); item.addItem(new WordItem("a")); item.addItem(new WordItem("b")); @@ -330,7 +333,7 @@ public class VespaSerializerTestCase { } @Test - public final void testPhraseAsOperatorArgument() { + public void testPhraseAsOperatorArgument() { // flattening phrases is a feature, not a bug parseAndConfirm("description contains phrase(\"a\", \"b\", \"c\")", "description contains phrase(\"a\", phrase(\"b\", \"c\"))"); @@ -344,7 +347,7 @@ public class VespaSerializerTestCase { } @Test - public final void testNumberTypeInt() { + public void testNumberTypeInt() { parseAndConfirm("title = 500"); parseAndConfirm("title > 500"); parseAndConfirm("title < (-500)"); @@ -354,7 +357,7 @@ public class VespaSerializerTestCase { } @Test - public final void testNumberTypeLong() { + public void testNumberTypeLong() { parseAndConfirm("title = 549755813888L"); parseAndConfirm("title > 549755813888L"); parseAndConfirm("title < (-549755813888L)"); @@ -364,7 +367,7 @@ public class VespaSerializerTestCase { } @Test - public final void testNumberTypeFloat() { + public void testNumberTypeFloat() { parseAndConfirm("title = 500.0"); // silly parseAndConfirm("title > 500.0"); parseAndConfirm("title < (-500.0)"); @@ -374,19 +377,19 @@ public class VespaSerializerTestCase { } @Test - public final void testAnnotatedLong() { + public void testAnnotatedLong() { parseAndConfirm("title >= ([{\"id\": 2014}](-549755813888L))"); } @Test - public final void testHitLimit() { + public void testHitLimit() { parseAndConfirm("title <= ([{\"hitLimit\": 89}](-500))"); parseAndConfirm("title <= ([{\"hitLimit\": 89}](-500))"); parseAndConfirm("[{\"hitLimit\": 89}]range(title, 1, 500)"); } @Test - public final void testOpenIntervals() { + public void testOpenIntervals() { parseAndConfirm("range(title, 0.0, 500.0)"); parseAndConfirm("[{\"bounds\": \"open\"}]range(title, 0.0, 500.0)"); parseAndConfirm("[{\"bounds\": \"leftOpen\"}]range(title, 0.0, 500.0)"); @@ -395,18 +398,18 @@ public class VespaSerializerTestCase { } @Test - public final void testRegExp() { + public void testRegExp() { parseAndConfirm("foo matches \"a b\""); } @Test - public final void testWordAlternatives() { + public void testWordAlternatives() { parseAndConfirm("foo contains" + " ([{\"origin\": {\"original\": \" trees \", \"offset\": 1, \"length\": 5}}]" + "alternatives({\"trees\": 1.0, \"tree\": 0.7}))"); } @Test - public final void testWordAlternativesInPhrase() { + public void testWordAlternativesInPhrase() { parseAndConfirm("foo contains phrase(\"forest\"," + " ([{\"origin\": {\"original\": \" trees \", \"offset\": 1, \"length\": 5}}]" + "alternatives({\"trees\": 1.0, \"tree\": 0.7}))" diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java index 31a057c158f..531167bb342 100644 --- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java @@ -7,6 +7,7 @@ import com.yahoo.language.Language; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.IndexModel; import com.yahoo.prelude.query.AndItem; +import com.yahoo.prelude.query.BoolItem; import com.yahoo.prelude.query.IndexedItem; import com.yahoo.prelude.query.ExactStringItem; import com.yahoo.prelude.query.Item; @@ -249,7 +250,11 @@ public class YqlParserTestCase { @Test public void testBoolean() { assertParse("select foo from bar where flag = true;", "flag:true"); - assertParse("select foo from bar where flag = false;", "flag:false"); + QueryTree query = assertParse("select foo from bar where flag = false;", "flag:false"); + assertEquals(BoolItem.class, query.getRoot().getClass()); + BoolItem item = (BoolItem)query.getRoot(); + assertEquals("flag", item.getIndexName()); + assertEquals(false, item.value()); } @Test @@ -922,8 +927,10 @@ public class YqlParserTestCase { } } - private void assertParse(String yqlQuery, String expectedQueryTree) { - assertEquals(expectedQueryTree, parse(yqlQuery).toString()); + private QueryTree assertParse(String yqlQuery, String expectedQueryTree) { + QueryTree query = parse(yqlQuery); + assertEquals(expectedQueryTree, query.toString()); + return query; } private void assertCanonicalParse(String yqlQuery, String expectedQueryTree) { @@ -935,15 +942,17 @@ public class YqlParserTestCase { assertEquals(q.getModel().getQueryTree().toString(), expectedQueryTree); } - private void assertParseFail(String yqlQuery, Throwable expectedException) { + private QueryTree assertParseFail(String yqlQuery, Throwable expectedException) { + QueryTree query = null; try { - parse(yqlQuery); + query = parse(yqlQuery); } catch (Throwable t) { assertEquals(expectedException.getClass(), t.getClass()); assertEquals(expectedException.getMessage(), t.getMessage()); - return; + return query; } fail("Parse succeeded: " + yqlQuery); + return query; } private void assertSources(String yqlQuery, Collection<String> expectedSources) { diff --git a/eval/src/vespa/eval/eval/basic_nodes.h b/eval/src/vespa/eval/eval/basic_nodes.h index 95e6cdf34f7..6af0a04b31a 100644 --- a/eval/src/vespa/eval/eval/basic_nodes.h +++ b/eval/src/vespa/eval/eval/basic_nodes.h @@ -14,7 +14,7 @@ namespace vespalib::eval { -namespace nodes { class Node; } +namespace nodes { struct Node; } struct NodeTraverser; struct NodeVisitor; diff --git a/eval/src/vespa/eval/eval/compile_tensor_function.h b/eval/src/vespa/eval/eval/compile_tensor_function.h index bfac0e0f036..013d228c2f9 100644 --- a/eval/src/vespa/eval/eval/compile_tensor_function.h +++ b/eval/src/vespa/eval/eval/compile_tensor_function.h @@ -9,7 +9,7 @@ namespace vespalib { class Stash; } namespace vespalib::eval { -class TensorFunction; +struct TensorFunction; std::vector<InterpretedFunction::Instruction> compile_tensor_function(const TensorFunction &function, Stash &stash); diff --git a/eval/src/vespa/eval/eval/gbdt.h b/eval/src/vespa/eval/eval/gbdt.h index 23d937604ca..378b6cc4b08 100644 --- a/eval/src/vespa/eval/eval/gbdt.h +++ b/eval/src/vespa/eval/eval/gbdt.h @@ -8,7 +8,7 @@ namespace vespalib { namespace eval { -namespace nodes { class Node; } +namespace nodes { struct Node; } namespace gbdt { diff --git a/eval/src/vespa/eval/eval/interpreted_function.h b/eval/src/vespa/eval/eval/interpreted_function.h index a9b6082fa4e..dbe5345fc9b 100644 --- a/eval/src/vespa/eval/eval/interpreted_function.h +++ b/eval/src/vespa/eval/eval/interpreted_function.h @@ -10,9 +10,9 @@ namespace vespalib { namespace eval { -namespace nodes { class Node; } -class TensorEngine; -class TensorFunction; +namespace nodes { struct Node; } +struct TensorEngine; +struct TensorFunction; class TensorSpec; /** diff --git a/eval/src/vespa/eval/eval/make_tensor_function.h b/eval/src/vespa/eval/eval/make_tensor_function.h index f9f415b9b9f..bf6a9a44f4a 100644 --- a/eval/src/vespa/eval/eval/make_tensor_function.h +++ b/eval/src/vespa/eval/eval/make_tensor_function.h @@ -6,11 +6,11 @@ namespace vespalib { class Stash; } namespace vespalib::eval { -class TensorEngine; +struct TensorEngine; class NodeTypes; -class TensorFunction; +struct TensorFunction; -namespace nodes { class Node; } +namespace nodes { struct Node; } const TensorFunction &make_tensor_function(const TensorEngine &engine, const nodes::Node &root, const NodeTypes &types, Stash &stash); diff --git a/eval/src/vespa/eval/eval/node_types.h b/eval/src/vespa/eval/eval/node_types.h index f8a13bfb2ac..0b049598f4c 100644 --- a/eval/src/vespa/eval/eval/node_types.h +++ b/eval/src/vespa/eval/eval/node_types.h @@ -8,7 +8,7 @@ namespace vespalib { namespace eval { -namespace nodes { class Node; } +namespace nodes { struct Node; } class Function; /** diff --git a/eval/src/vespa/eval/eval/tensor.h b/eval/src/vespa/eval/eval/tensor.h index 149e2774bfb..ddc341ed910 100644 --- a/eval/src/vespa/eval/eval/tensor.h +++ b/eval/src/vespa/eval/eval/tensor.h @@ -8,7 +8,7 @@ namespace vespalib { namespace eval { -class TensorEngine; +struct TensorEngine; /** * Base class for all tensors. Tensor operations are defined by the diff --git a/eval/src/vespa/eval/eval/tensor_engine.h b/eval/src/vespa/eval/eval/tensor_engine.h index a01a6f889fd..d9f6d35609a 100644 --- a/eval/src/vespa/eval/eval/tensor_engine.h +++ b/eval/src/vespa/eval/eval/tensor_engine.h @@ -17,7 +17,7 @@ class nbostream; namespace eval { -class Value; +struct Value; class Tensor; class TensorSpec; diff --git a/eval/src/vespa/eval/eval/tensor_spec.h b/eval/src/vespa/eval/eval/tensor_spec.h index 66feb02de40..25af4c7a93c 100644 --- a/eval/src/vespa/eval/eval/tensor_spec.h +++ b/eval/src/vespa/eval/eval/tensor_spec.h @@ -11,8 +11,8 @@ namespace vespalib { namespace slime { -class Cursor; -class Inspector; +struct Cursor; +struct Inspector; } // namespace vespalib::slime diff --git a/eval/src/vespa/eval/eval/visit_stuff.h b/eval/src/vespa/eval/eval/visit_stuff.h index cbbca9be056..ef21352535d 100644 --- a/eval/src/vespa/eval/eval/visit_stuff.h +++ b/eval/src/vespa/eval/eval/visit_stuff.h @@ -9,7 +9,7 @@ namespace vespalib { class ObjectVisitor; namespace eval { enum class Aggr; -class TensorFunction; +struct TensorFunction; namespace visit { using map_fun_t = double (*)(double); using join_fun_t = double (*)(double, double); diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h index 49e075f6999..52d49b8e95b 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_apply.h @@ -3,7 +3,7 @@ #pragma once namespace vespalib::tensor { - class Tensor; + struct Tensor; class DenseTensor; } diff --git a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h index e80cd063e30..b53a3af9e19 100644 --- a/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h +++ b/eval/src/vespa/eval/tensor/serialization/slime_binary_format.h @@ -8,11 +8,11 @@ namespace vespalib { class Slime; -namespace slime { class Inserter; } +namespace slime { struct Inserter; } namespace tensor { -class Tensor; +struct Tensor; class TensorBuilder; /** diff --git a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h index db05574dfce..23d77a5c704 100644 --- a/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h +++ b/eval/src/vespa/eval/tensor/serialization/sparse_binary_format.h @@ -8,7 +8,7 @@ class nbostream; namespace tensor { -class Tensor; +struct Tensor; class TensorBuilder; /** diff --git a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h index c655210907f..38c3373213c 100644 --- a/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h +++ b/eval/src/vespa/eval/tensor/serialization/typed_binary_format.h @@ -11,7 +11,7 @@ class nbostream; namespace tensor { -class Tensor; +struct Tensor; class TensorBuilder; /** diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h index ec6edf2d847..2c1c57de8ac 100644 --- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h +++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_apply.h @@ -3,7 +3,7 @@ #pragma once namespace vespalib::tensor { - class Tensor; + struct Tensor; class SparseTensor; } diff --git a/eval/src/vespa/eval/tensor/tensor.h b/eval/src/vespa/eval/tensor/tensor.h index 8e31448e026..4d4a40907fb 100644 --- a/eval/src/vespa/eval/tensor/tensor.h +++ b/eval/src/vespa/eval/tensor/tensor.h @@ -10,7 +10,7 @@ #include <vespa/eval/eval/value_type.h> namespace vespalib { -namespace eval { class BinaryOperation; } +namespace eval { struct BinaryOperation; } namespace tensor { class TensorVisitor; diff --git a/eval/src/vespa/eval/tensor/tensor_builder.h b/eval/src/vespa/eval/tensor/tensor_builder.h index 05238b27df5..205da137895 100644 --- a/eval/src/vespa/eval/tensor/tensor_builder.h +++ b/eval/src/vespa/eval/tensor/tensor_builder.h @@ -7,7 +7,7 @@ namespace vespalib { namespace tensor { -class Tensor; +struct Tensor; /** * An interfrace for builder of tensors (sparse multi-dimensional array). diff --git a/eval/src/vespa/eval/tensor/tensor_factory.h b/eval/src/vespa/eval/tensor/tensor_factory.h index 5fe31afc4dd..f3c9aae7328 100644 --- a/eval/src/vespa/eval/tensor/tensor_factory.h +++ b/eval/src/vespa/eval/tensor/tensor_factory.h @@ -8,7 +8,7 @@ namespace vespalib { namespace tensor { -class Tensor; +struct Tensor; class TensorBuilder; /** diff --git a/eval/src/vespa/eval/tensor/tensor_mapper.h b/eval/src/vespa/eval/tensor/tensor_mapper.h index 99994bd15e8..6218146496a 100644 --- a/eval/src/vespa/eval/tensor/tensor_mapper.h +++ b/eval/src/vespa/eval/tensor/tensor_mapper.h @@ -7,7 +7,7 @@ namespace vespalib { namespace tensor { -class Tensor; +struct Tensor; /** * Class to map a tensor to a given tensor type. Dimensions in input diff --git a/fastos/src/vespa/fastos/unix_ipc.cpp b/fastos/src/vespa/fastos/unix_ipc.cpp index 79fbe3ee076..d1b7d199782 100644 --- a/fastos/src/vespa/fastos/unix_ipc.cpp +++ b/fastos/src/vespa/fastos/unix_ipc.cpp @@ -660,7 +660,7 @@ void FastOS_UNIX_IPCHelper::DeliverMessages (FastOS_RingBuffer *buffer) if((readSpace - sizeof(int)) >= bufferData->_messageSize) { - _app->OnReceivedIPCMessage(&bufferData->_buffer[sizeof(int)], + _app->OnReceivedIPCMessage(&bufferData->_buffer[0] + sizeof(int), bufferData->_messageSize); buffer->Consume(sizeof(int) + bufferData->_messageSize); buffer->RepositionDataAt0(); diff --git a/fnet/src/vespa/fnet/channellookup.h b/fnet/src/vespa/fnet/channellookup.h index 52365a89e5f..63a160a9955 100644 --- a/fnet/src/vespa/fnet/channellookup.h +++ b/fnet/src/vespa/fnet/channellookup.h @@ -6,7 +6,7 @@ #include <vector> namespace fnet { - class ChannelMap; + struct ChannelMap; } class FNET_Channel; diff --git a/fnet/src/vespa/fnet/frt/reflection.h b/fnet/src/vespa/fnet/frt/reflection.h index 5189cf81d0a..3aee3267b12 100644 --- a/fnet/src/vespa/fnet/frt/reflection.h +++ b/fnet/src/vespa/fnet/frt/reflection.h @@ -7,7 +7,7 @@ class FRT_Values; class FRT_Supervisor; -class FRT_StringValue; +struct FRT_StringValue; class FRT_Method { diff --git a/fnet/src/vespa/fnet/frt/values.h b/fnet/src/vespa/fnet/frt/values.h index 0b81a9f9f47..e00aec8423c 100644 --- a/fnet/src/vespa/fnet/frt/values.h +++ b/fnet/src/vespa/fnet/frt/values.h @@ -9,7 +9,7 @@ namespace fnet { char * copyString(char *dst, const char *src, size_t len); char * copyData(char *dst, const void *src, size_t len); - class BlobRef; + struct BlobRef; } class FNET_DataBuffer; diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java index 1291418083b..770c59dec35 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/StandaloneMain.java @@ -1,7 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.jdisc.core; -import com.yahoo.yolean.system.CatchSigTerm; +import com.yahoo.yolean.system.CatchSignals; import java.util.Arrays; import java.util.concurrent.atomic.AtomicBoolean; @@ -41,7 +41,7 @@ public class StandaloneMain { System.out.println("debug\tInitializing application without privileges."); loader.init(bundleLocation, false); loader.start(); - setupSigTermHandler(); + setupSignalHandlers(); waitForShutdown(); System.out.println("debug\tTrying to shutdown in a controlled manner."); log.log(Level.INFO, "JDisc shutting down"); @@ -59,8 +59,8 @@ public class StandaloneMain { } private final AtomicBoolean signalCaught = new AtomicBoolean(false); - private void setupSigTermHandler() { - CatchSigTerm.setup(signalCaught); // catch termination signal + private void setupSignalHandlers() { + CatchSignals.setup(signalCaught); } private void waitForShutdown() { synchronized (signalCaught) { diff --git a/logserver/pom.xml b/logserver/pom.xml index be2d8ba4cee..1045b93185e 100644 --- a/logserver/pom.xml +++ b/logserver/pom.xml @@ -26,6 +26,11 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> + <artifactId>yolean</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>com.yahoo.vespa</groupId> <artifactId>vespalog</artifactId> <version>${project.version}</version> </dependency> diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java index 36b1c3e31a0..d0df5bf2972 100644 --- a/logserver/src/main/java/com/yahoo/logserver/Server.java +++ b/logserver/src/main/java/com/yahoo/logserver/Server.java @@ -10,7 +10,7 @@ import com.yahoo.logserver.handlers.HandlerThread; import com.yahoo.logserver.handlers.LogHandler; import com.yahoo.logserver.net.LogConnectionFactory; import com.yahoo.logserver.net.control.Levels; -import com.yahoo.system.CatchSigTerm; +import com.yahoo.yolean.system.CatchSignals; import java.io.IOException; import java.util.HashMap; @@ -150,8 +150,8 @@ public class Server implements Runnable { } } - private void setupSigTermHandler() { - CatchSigTerm.setup(signalCaught); // catch termination signal + private void setupSignalHandler() { + CatchSignals.setup(signalCaught); // catch termination and interrupt signals } private void waitForShutdown() { @@ -191,7 +191,7 @@ public class Server implements Runnable { String portString = System.getProperty(APPNAME + ".listenport", LISTEN_PORT); Server server = Server.getInstance(); - server.setupSigTermHandler(); + server.setupSignalHandler(); server.initialize(Integer.parseInt(portString)); Thread t = new Thread(server, "logserver main"); diff --git a/metrics/src/vespa/metrics/countmetricvalues.cpp b/metrics/src/vespa/metrics/countmetricvalues.cpp index 7fe3bb5b8ca..76ab2d4d83a 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.cpp +++ b/metrics/src/vespa/metrics/countmetricvalues.cpp @@ -4,6 +4,6 @@ namespace metrics { -template class CountMetricValues<uint64_t>; +template struct CountMetricValues<uint64_t>; } // metrics diff --git a/metrics/src/vespa/metrics/memoryconsumption.h b/metrics/src/vespa/metrics/memoryconsumption.h index 1cbd8f1deab..9b2e0ec0254 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.h +++ b/metrics/src/vespa/metrics/memoryconsumption.h @@ -21,8 +21,8 @@ namespace metrics { -class SeenStrings; -class SnapShotUsage; +struct SeenStrings; +struct SnapShotUsage; class MemoryConsumption : public vespalib::Printable { public: diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h index d1313c3ca1a..85832ba08d1 100644 --- a/metrics/src/vespa/metrics/metric.h +++ b/metrics/src/vespa/metrics/metric.h @@ -8,8 +8,8 @@ namespace metrics { -class AbstractCountMetric; -class AbstractValueMetric; +struct AbstractCountMetric; +struct AbstractValueMetric; class Metric; class MetricSet; class MetricSnapshot; diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h index 4089236ca48..3b8de5927ec 100644 --- a/metrics/src/vespa/metrics/metricmanager.h +++ b/metrics/src/vespa/metrics/metricmanager.h @@ -274,8 +274,8 @@ public: private: void takeSnapshots(const MetricLockGuard &, time_t timeToProcess); - friend class MetricManagerTest; - friend class SnapshotTest; + friend struct MetricManagerTest; + friend struct SnapshotTest; void configure(const MetricLockGuard & guard, std::unique_ptr<MetricsmanagerConfig> conf); void run() override; diff --git a/metrics/src/vespa/metrics/summetric.h b/metrics/src/vespa/metrics/summetric.h index a9827bcca7d..c461fb25313 100644 --- a/metrics/src/vespa/metrics/summetric.h +++ b/metrics/src/vespa/metrics/summetric.h @@ -72,7 +72,7 @@ public: void addToSnapshot(Metric&, std::vector<Metric::UP> &) const override; private: - friend class MetricManagerTest; + friend struct MetricManagerTest; std::pair<std::vector<Metric::UP>, Metric::UP> generateSum() const; virtual void addTo(Metric&, std::vector<Metric::UP> *ownerList) const; diff --git a/metrics/src/vespa/metrics/valuemetricvalues.cpp b/metrics/src/vespa/metrics/valuemetricvalues.cpp index 12928db08dd..f309b07b1a4 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.cpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.cpp @@ -3,10 +3,10 @@ namespace metrics { -template class ValueMetricValues<int64_t, int64_t>; +template struct ValueMetricValues<int64_t, int64_t>; template std::ostream & operator << (std::ostream & os, const ValueMetricValues<int64_t, int64_t> & v); -template class ValueMetricValues<double, double>; +template struct ValueMetricValues<double, double>; template std::ostream & operator << (std::ostream & os, const ValueMetricValues<double, double> & v); } // metrics diff --git a/processing/src/main/java/com/yahoo/processing/response/Data.java b/processing/src/main/java/com/yahoo/processing/response/Data.java index 2a631c3946d..fb8a296f0f3 100644 --- a/processing/src/main/java/com/yahoo/processing/response/Data.java +++ b/processing/src/main/java/com/yahoo/processing/response/Data.java @@ -17,6 +17,6 @@ public interface Data extends ListenableFreezable { /** * Returns the request that created this data */ - public Request request(); + Request request(); } diff --git a/vespajlib/src/main/java/com/yahoo/system/CatchSigTerm.java b/vespajlib/src/main/java/com/yahoo/system/CatchSigTerm.java deleted file mode 100644 index e1f037f5d98..00000000000 --- a/vespajlib/src/main/java/com/yahoo/system/CatchSigTerm.java +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.system; - -import java.lang.reflect.*; - -// import sun.misc.Signal; -// import sun.misc.SignalHandler; - -import java.util.concurrent.atomic.AtomicBoolean; - -public class CatchSigTerm { - /** - * Sets up a signal handler for SIGTERM, where a given AtomicBoolean - * gets a true value when the TERM signal is caught. - * - * Callers basically have two options for acting on the TERM signal: - * - * They may choose to synchronize and wait() on this variable, - * and they will be notified when it changes state to true. To avoid - * problems with spurious wakeups, use a while loop and wait() - * again if the state is still false. As soon as the caller has been - * woken up and the state is true, the application should exit as - * soon as possible. - * - * They may also choose to poll the state of this variable. As soon - * as its state becomes true, the signal has been received, and the - * application should exit as soon as possible. - * - * @param signalCaught set to false initially, will be set to true when SIGTERM is caught. - */ - @SuppressWarnings("rawtypes") - public static void setup(final AtomicBoolean signalCaught) { - signalCaught.set(false); - try { - Class shc = Class.forName("sun.misc.SignalHandler"); - Class ssc = Class.forName("sun.misc.Signal"); - - InvocationHandler ihandler = new InvocationHandler() { - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - synchronized (signalCaught) { - signalCaught.set(true); - signalCaught.notifyAll(); - } - return null; - } - }; - Object shandler = Proxy.newProxyInstance(CatchSigTerm.class.getClassLoader(), - new Class[] { shc }, - ihandler); - Constructor[] c = ssc.getDeclaredConstructors(); - assert c.length == 1; - Object sigterm = c[0].newInstance("TERM"); - Method m = findMethod(ssc, "handle"); - assert m != null; // "NoSuchMethodException" - m.invoke(null, sigterm, shandler); - } catch (ClassNotFoundException | InvocationTargetException | InstantiationException | IllegalAccessException e) { - System.err.println("FAILED setting up signal catching: "+e); - } - } - - @SuppressWarnings("rawtypes") - private static Method findMethod(Class c, String name) { - for (Method m : c.getDeclaredMethods()) { - if (m.getName().equals(name)) { - return m; - } - } - return null; - } -} diff --git a/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java b/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java deleted file mode 100644 index 9b370d4ce10..00000000000 --- a/vespajlib/src/test/java/com/yahoo/system/CatchSigTermTestCase.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.system; - -import org.junit.Test; - -import java.util.concurrent.atomic.AtomicBoolean; - -/** - * @author arnej27959 - */ -public class CatchSigTermTestCase { - - @Test - public void testThatSetupCompiles() { - CatchSigTerm.setup(new AtomicBoolean(false)); - } - -} diff --git a/vespalib/src/vespa/vespalib/data/input_reader.h b/vespalib/src/vespa/vespalib/data/input_reader.h index f92ced7e508..41c42327b6c 100644 --- a/vespalib/src/vespa/vespalib/data/input_reader.h +++ b/vespalib/src/vespa/vespalib/data/input_reader.h @@ -8,7 +8,7 @@ namespace vespalib { -class Input; +struct Input; /** * A utility wrapper for the Input interface that supplies us with an diff --git a/vespalib/src/vespa/vespalib/data/output_writer.h b/vespalib/src/vespa/vespalib/data/output_writer.h index 70790fa6b5d..1e8afac0dfa 100644 --- a/vespalib/src/vespa/vespalib/data/output_writer.h +++ b/vespalib/src/vespa/vespalib/data/output_writer.h @@ -7,7 +7,7 @@ namespace vespalib { -class Output; +struct Output; /** * Thin layer on top of the Output interface that supplies us with an diff --git a/vespalib/src/vespa/vespalib/data/slime/inserter.h b/vespalib/src/vespa/vespalib/data/slime/inserter.h index dff37183ac7..e23c7ea7ec0 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inserter.h +++ b/vespalib/src/vespa/vespalib/data/slime/inserter.h @@ -13,7 +13,7 @@ class Slime; namespace slime { -class Cursor; +struct Cursor; //----------------------------------------------------------------------------- diff --git a/vespalib/src/vespa/vespalib/data/slime/json_format.h b/vespalib/src/vespa/vespalib/data/slime/json_format.h index f657f0439bf..dca77780e09 100644 --- a/vespalib/src/vespa/vespalib/data/slime/json_format.h +++ b/vespalib/src/vespa/vespalib/data/slime/json_format.h @@ -13,7 +13,7 @@ class Slime; namespace slime { -class Inspector; +struct Inspector; struct JsonFormat { static void encode(const Inspector &inspector, Output &output, bool compact); diff --git a/vespalib/src/vespa/vespalib/net/tls/crypto_codec.h b/vespalib/src/vespa/vespalib/net/tls/crypto_codec.h index 246fd5cfc66..1eed1ae0612 100644 --- a/vespalib/src/vespa/vespalib/net/tls/crypto_codec.h +++ b/vespalib/src/vespa/vespalib/net/tls/crypto_codec.h @@ -47,7 +47,7 @@ struct DecodeResult { bool frame_decoded_ok() const noexcept { return (state == State::OK); } }; -class TlsContext; +struct TlsContext; // TODO move to different namespace, not dependent on TLS? diff --git a/vespalib/src/vespa/vespalib/net/tls/impl/openssl_crypto_codec_impl.h b/vespalib/src/vespa/vespalib/net/tls/impl/openssl_crypto_codec_impl.h index 21581256ce6..3c491c2bd72 100644 --- a/vespalib/src/vespa/vespalib/net/tls/impl/openssl_crypto_codec_impl.h +++ b/vespalib/src/vespa/vespalib/net/tls/impl/openssl_crypto_codec_impl.h @@ -6,7 +6,7 @@ #include <vespa/vespalib/net/tls/crypto_codec.h> #include <memory> -namespace vespalib::net::tls { class TlsContext; } +namespace vespalib::net::tls { struct TlsContext; } namespace vespalib::net::tls::impl { diff --git a/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h b/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h index 6e8fa368df7..e0effb1b52e 100644 --- a/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h +++ b/vespalib/src/vespa/vespalib/util/threadstackexecutorbase.h @@ -17,7 +17,7 @@ class FastOS_ThreadPool; namespace vespalib { -namespace thread { class ThreadInit; } +namespace thread { struct ThreadInit; } // Convenience macro used to create a function that can be used as an // init function when creating an executor to inject a frame with the diff --git a/vespalib/src/vespa/vespalib/websocket/handler.cpp b/vespalib/src/vespa/vespalib/websocket/handler.cpp index c2010c874dc..ba4a3307c1f 100644 --- a/vespalib/src/vespa/vespalib/websocket/handler.cpp +++ b/vespalib/src/vespa/vespalib/websocket/handler.cpp @@ -10,6 +10,6 @@ struct DummyItem {}; } // namespace vespalib::ws::<unnamed> -template class Handler<DummyItem>; +template struct Handler<DummyItem>; } // namespace vespalib::ws diff --git a/yolean/src/main/java/com/yahoo/yolean/system/CatchSigTerm.java b/yolean/src/main/java/com/yahoo/yolean/system/CatchSignals.java index ee87ab9c081..dce70fbbb5f 100644 --- a/yolean/src/main/java/com/yahoo/yolean/system/CatchSigTerm.java +++ b/yolean/src/main/java/com/yahoo/yolean/system/CatchSignals.java @@ -8,12 +8,12 @@ import java.lang.reflect.*; import java.util.concurrent.atomic.AtomicBoolean; -public class CatchSigTerm { +public class CatchSignals { /** - * Sets up a signal handler for SIGTERM, where a given AtomicBoolean - * gets a true value when the TERM signal is caught. + * Sets up a signal handler for SIGTERM and SIGINT, where a given AtomicBoolean + * gets a true value when the signal is caught. * - * Callers basically have two options for acting on the TERM signal: + * Callers basically have two options for acting on the signal: * * They may choose to synchronize and wait() on this variable, * and they will be notified when it changes state to true. To avoid @@ -26,7 +26,7 @@ public class CatchSigTerm { * as its state becomes true, the signal has been received, and the * application should exit as soon as possible. * - * @param signalCaught set to false initially, will be set to true when SIGTERM is caught. + * @param signalCaught set to false initially, will be set to true when SIGTERM or SIGINT is caught. */ @SuppressWarnings("rawtypes") public static void setup(final AtomicBoolean signalCaught) { @@ -44,15 +44,17 @@ public class CatchSigTerm { return null; } }; - Object shandler = Proxy.newProxyInstance(CatchSigTerm.class.getClassLoader(), + Object shandler = Proxy.newProxyInstance(CatchSignals.class.getClassLoader(), new Class[] { shc }, ihandler); Constructor[] c = ssc.getDeclaredConstructors(); assert c.length == 1; Object sigterm = c[0].newInstance("TERM"); + Object sigint = c[0].newInstance("INT"); Method m = findMethod(ssc, "handle"); assert m != null; // "NoSuchMethodException" m.invoke(null, sigterm, shandler); + m.invoke(null, sigint, shandler); } catch (ClassNotFoundException | InvocationTargetException | InstantiationException | IllegalAccessException e) { System.err.println("FAILED setting up signal catching: "+e); } diff --git a/yolean/src/test/java/com/yahoo/yolean/system/CatchSigTermTestCase.java b/yolean/src/test/java/com/yahoo/yolean/system/CatchSignalsTestCase.java index 056db2d3592..e68ce334f31 100644 --- a/yolean/src/test/java/com/yahoo/yolean/system/CatchSigTermTestCase.java +++ b/yolean/src/test/java/com/yahoo/yolean/system/CatchSignalsTestCase.java @@ -8,11 +8,11 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * @author arnej27959 */ -public class CatchSigTermTestCase { +public class CatchSignalsTestCase { @Test public void testThatSetupCompiles() { - CatchSigTerm.setup(new AtomicBoolean(false)); + CatchSignals.setup(new AtomicBoolean(false)); } } |