aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-12-13 15:21:44 +0100
committerJon Bratseth <bratseth@yahoo-inc.com>2017-12-13 15:21:44 +0100
commit3783a9b21f8ab7ca3700903d9780a9f7374cf0c5 (patch)
treeec003528946a37b9f0aeb49e1b314fdc6601c26e /container-search/src/main/java/com/yahoo
parent5b67e6f8f641141f848ad3989156151f9f182441 (diff)
Check agreement between TF and Vespa execution
Diffstat (limited to 'container-search/src/main/java/com/yahoo')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java12
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java8
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java2
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java2
4 files changed, 12 insertions, 12 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
index fc1bbace092..1e44a8fa64d 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/DocsumField.java
@@ -1,16 +1,16 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.prelude.fastsearch;
+import com.yahoo.container.search.LegacyEmulationConfig;
+import com.yahoo.data.access.Inspector;
+import com.yahoo.log.LogLevel;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
-import com.yahoo.data.access.Inspector;
-import com.yahoo.container.search.LegacyEmulationConfig;
-
-import com.yahoo.log.LogLevel;
/**
* @author Bjørn Borud
@@ -25,7 +25,7 @@ public abstract class DocsumField {
Map<String, Constructor<? extends DocsumField>> constructors = new HashMap<>();
- void put(String typename, Class<? extends DocsumField> fieldClass)
+ void put(String typename, Class<? extends DocsumField> fieldClass)
throws NoSuchMethodException, SecurityException {
Constructor<? extends DocsumField> constructor = fieldClass.getConstructor(String.class);
constructors.put(typename, constructor);
@@ -106,7 +106,7 @@ public abstract class DocsumField {
public abstract Object decode(ByteBuffer b);
/**
- * Get the number of bytes this field occupies in the given buffer
+ * Get the number of bytes this field occupies in the given buffer
* AND SET(!) the position to the first byte after this field.
*/
public abstract int getLength(ByteBuffer b);
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 1524a4da426..692e93bed7e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -109,7 +109,7 @@ public class FastHit extends Hit {
/**
* Returns the explicitly set uri if available, returns "index:[source]/[partid]/[id]" otherwise
- *
+ *
* @return uri of hit
*/
public URI getUri() {
@@ -128,9 +128,9 @@ public class FastHit extends Hit {
}
/**
- * The uri of the index location of this hit ("index:[source]/[partid]/[id]").
+ * The uri of the index location of this hit ("index:[source]/[partid]/[id]").
* This is the uri if no other uri is assigned
- *
+ *
* @return uri to the index.
*/
public URI getIndexUri() {
@@ -215,7 +215,7 @@ public class FastHit extends Hit {
* The empty string ("") if no value is assigned in the document.
*
* <li><b>Dynamic summary string fields</b>: A Java String before JuniperSearcher and a HitField after.</li>
- *
+ *
* <li><b>Numerics</b>: The corresponding numeric Java type.<br>
* If the field has <i>no value</i> assigned in the document,
* the special numeric {@link com.yahoo.search.result.NanNumber#NaN} is returned.
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java
index e0ca7fbe6e1..d8b38667224 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/TensorField.java
@@ -13,7 +13,7 @@ import java.util.Optional;
/**
* A tensor field. Tensors are encoded as a data field where the data (following the length)
* is encoded in a tensor binary format defined by com.yahoo.tensor.serialization.TypedBinaryFormat
- *
+ *
* @author bratseth
*/
public class TensorField extends DocsumField implements VariableLengthField {
diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java b/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
index 0ec15b95b0d..0fd529bf262 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/types/TensorFieldType.java
@@ -16,7 +16,7 @@ import java.util.Optional;
public class TensorFieldType extends FieldType {
// TODO: Require tensor type
-
+
private final Optional<TensorType> type;
/** Creates a tensor field type with optional information about the kind of tensor this will hold */