diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2022-03-18 14:26:46 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2022-03-18 14:26:46 +0100 |
| commit | 72fc31a9364cd26c03d079cb83fff47f5376db45 (patch) | |
| tree | 26088b64feff76547bba433e1832132ed71ac2e2 | |
| parent | bb53b8143d0ecda7856046655b4088230a4a562d (diff) | |
Reserve slot for MultiTermItem in serialisation format table
4 files changed, 6 insertions, 4 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index eade8d7338a..9b560e86d86 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -741,6 +741,7 @@ "public static final enum com.yahoo.prelude.query.Item$ItemType GEO_LOCATION_TERM", "public static final enum com.yahoo.prelude.query.Item$ItemType TRUE", "public static final enum com.yahoo.prelude.query.Item$ItemType FALSE", + "public static final enum com.yahoo.prelude.query.Item$ItemType MULTI_TERM", "public final int code" ] }, 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 a29e1ac923a..06fe07d3895 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 @@ -59,7 +59,8 @@ public abstract class Item implements Cloneable { NEAREST_NEIGHBOR(26), GEO_LOCATION_TERM(27), TRUE(28), - FALSE(29); + FALSE(29), + MULTI_TERM(30); public final int code; diff --git a/searchlib/src/vespa/searchlib/parsequery/parse.h b/searchlib/src/vespa/searchlib/parsequery/parse.h index 7db9f0e43ea..c9b7940b887 100644 --- a/searchlib/src/vespa/searchlib/parsequery/parse.h +++ b/searchlib/src/vespa/searchlib/parsequery/parse.h @@ -56,12 +56,12 @@ public: ITEM_GEO_LOCATION_TERM = 27, ITEM_TRUE = 28, ITEM_FALSE = 29, - ITEM_MAX = 30, // Indicates how long tables must be. + ITEM_MULTI_TERM = 30, ITEM_UNDEF = 31, }; /** A tag identifying the origin of this query node. - * Note that descendants may origin from elsewhere. + * Note that descendants may originate from elsewhere. * If changes necessary: * NB! Append at end of list - corresponding type * used in Juniper and updates of these two types must be synchronized. diff --git a/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp b/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp index c28446cf01f..b31173c74c2 100644 --- a/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp +++ b/searchsummary/src/tests/extractkeywords/simplequerystackitem.cpp @@ -187,7 +187,7 @@ SimpleQueryStackItem::AppendBuffer(RawBuf *buf) const buf->appendCompressedPositiveNumber(_arg3); // explore_additional_hits break; case ITEM_PREDICATE_QUERY: // not handled at all here - case ITEM_MAX: + case ITEM_MULTI_TERM: // TODO: handle case ITEM_UNDEF: abort(); break; |