summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-03-23 14:43:53 +0100
committerJon Bratseth <bratseth@gmail.com>2022-03-23 14:43:53 +0100
commit67722f72878f0e19855ccb58bf06ffc9d39339c3 (patch)
treeab55a2742aa52c988f7a9a90e87041a0aecb9dcb /container-search
parent54329a8946debe301d2036397bc4a9d47764555f (diff)
No functional changes
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/Item.java16
-rw-r--r--container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java4
-rw-r--r--container-search/src/main/java/com/yahoo/search/query/QueryTree.java10
3 files changed, 11 insertions, 19 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Item.java b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
index 06fe07d3895..87b6de875c6 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/Item.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
@@ -26,10 +26,7 @@ import java.util.Objects;
*/
public abstract class Item implements Cloneable {
- /**
- * The definitions in Item.ItemType must match the ones in
- * searchlib/src/vespa/searchlib/parsequery/parse.h
- */
+ // These must match the types in searchlib/src/vespa/searchlib/parsequery/parse.h
public enum ItemType {
OR(0),
AND(1),
@@ -70,10 +67,7 @@ public abstract class Item implements Cloneable {
}
- /**
- * The definitions in Item.ItemCreator must match the ones in
- * searchlib/src/searchlib/parsequery/parse.h
- */
+ // These must match the definitions in searchlib/src/searchlib/parsequery/parse.h
public enum ItemCreator {
ORIG(0),
@@ -266,11 +260,11 @@ public abstract class Item implements Cloneable {
}
/**
- * Returns an integer that contains all feature flags for this item. This must be kept in sync with the flags
- * defined in searchlib/parsequery/parse.h.
+ * Returns an integer that contains all feature flags for this item.
*
* @return the feature flags
*/
+ // This must be kept in sync with the flags in searchlib/parsequery/parse.h.
private byte getFlagsFeature() {
byte FLAGS_NORANK = 0x01;
byte FLAGS_SPECIALTOKEN = 0x02;
@@ -419,7 +413,7 @@ public abstract class Item implements Cloneable {
* the back-end to identify specific items for ranking purposes.
*
* @param label label for this item
- **/
+ */
public void setLabel(String label) {
setHasUniqueID(true);
this.label = label;
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java b/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java
index 353e92c723f..b7d8ce9fc77 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/DocIdNsSpecificValue.java
@@ -10,9 +10,7 @@ package com.yahoo.search.grouping.request;
*/
public class DocIdNsSpecificValue extends DocumentValue {
- /**
- * Constructs a new instance of this class.
- */
+ /** Constructs a new instance of this class. */
public DocIdNsSpecificValue() {
this(null, null);
}
diff --git a/container-search/src/main/java/com/yahoo/search/query/QueryTree.java b/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
index 115a2f6dbdc..3dac5648660 100644
--- a/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
+++ b/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
@@ -48,7 +48,7 @@ public class QueryTree extends CompositeItem {
return getRoot().encode(buffer);
}
- //Lets not pollute toString() by adding "ROOT"
+ // Let's not pollute toString() by adding "ROOT"
protected void appendHeadingString(StringBuilder sb) {
}
@@ -65,7 +65,7 @@ public class QueryTree extends CompositeItem {
if (this.getItemCount() == 0) // initializing
super.addItem(root);
else
- setItem(0,root); // replacing
+ setItem(0, root); // replacing
}
@Override
@@ -88,7 +88,7 @@ public class QueryTree extends CompositeItem {
@Override
public void addItem(Item item) {
- if (getItemCount()==0)
+ if (getItemCount() == 0)
super.addItem(item);
else
throw new RuntimeException("Programming error: Cannot add multiple roots");
@@ -96,8 +96,8 @@ public class QueryTree extends CompositeItem {
@Override
public void addItem(int index, Item item) {
- if (getItemCount()==0 && index==0)
- super.addItem(index,item);
+ if (getItemCount() == 0 && index == 0)
+ super.addItem(index, item);
else
throw new RuntimeException("Programming error: Cannot add multiple roots, have '" + getRoot() + "'");
}