diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-11 22:33:34 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-01-11 22:33:34 +0100 |
| commit | 2c132b3f907ebfe733f04d92c09758a3160375ec (patch) | |
| tree | 530b626d7de0518ac7a369583a3c44344209e39b /config-model | |
| parent | 84684afff128e90365b7d759c88bc11a7caaec72 (diff) | |
Unify behavior of attribute matching over streaming and indexed.
Diffstat (limited to 'config-model')
4 files changed, 10 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/VsmFields.java b/config-model/src/main/java/com/yahoo/schema/derived/VsmFields.java index 564161b725d..f05f8b17762 100644 --- a/config-model/src/main/java/com/yahoo/schema/derived/VsmFields.java +++ b/config-model/src/main/java/com/yahoo/schema/derived/VsmFields.java @@ -264,6 +264,7 @@ public class VsmFields extends Derived implements VsmfieldsConfig.Producer { private static VsmfieldsConfig.Fieldspec.Normalize.Enum toNormalize(Matching matching) { if (matching.getType() == MatchType.EXACT) return VsmfieldsConfig.Fieldspec.Normalize.Enum.LOWERCASE; + if (matching.getType() == MatchType.WORD) return VsmfieldsConfig.Fieldspec.Normalize.Enum.LOWERCASE; if (matching.getCase() == Case.CASED) return VsmfieldsConfig.Fieldspec.Normalize.Enum.NONE; return VsmfieldsConfig.Fieldspec.Normalize.LOWERCASE_AND_FOLD; } diff --git a/config-model/src/test/derived/indexschema/vsmfields.cfg b/config-model/src/test/derived/indexschema/vsmfields.cfg index a2152f9787f..8fbd8835f91 100644 --- a/config-model/src/test/derived/indexschema/vsmfields.cfg +++ b/config-model/src/test/derived/indexschema/vsmfields.cfg @@ -33,7 +33,7 @@ fieldspec[].fieldtype INDEX fieldspec[].name "se" fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "word" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "sf" diff --git a/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg b/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg index ec06d01f05a..ab9a96f819b 100644 --- a/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg +++ b/config-model/src/test/derived/nearestneighbor_streaming/vsmfields.cfg @@ -3,25 +3,25 @@ searchall 1 fieldspec[].name "vec_a" fieldspec[].searchmethod NEAREST_NEIGHBOR fieldspec[].arg1 "EUCLIDEAN" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "vec_b" fieldspec[].searchmethod NEAREST_NEIGHBOR fieldspec[].arg1 "ANGULAR" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "vec_c" fieldspec[].searchmethod NEAREST_NEIGHBOR fieldspec[].arg1 "INNERPRODUCT" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "vec_d" fieldspec[].searchmethod NONE fieldspec[].arg1 "" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE documenttype[].name "test" diff --git a/config-model/src/test/derived/streamingstruct/vsmfields.cfg b/config-model/src/test/derived/streamingstruct/vsmfields.cfg index b5a234e8095..07dbb991324 100644 --- a/config-model/src/test/derived/streamingstruct/vsmfields.cfg +++ b/config-model/src/test/derived/streamingstruct/vsmfields.cfg @@ -75,7 +75,7 @@ fieldspec[].fieldtype INDEX fieldspec[].name "c.f1" fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "word" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "c.f1s" @@ -93,7 +93,7 @@ fieldspec[].fieldtype INDEX fieldspec[].name "c2.f1" fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "word" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "c2.f1s" @@ -117,7 +117,7 @@ fieldspec[].fieldtype INDEX fieldspec[].name "c3.f1" fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "word" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "c3.f1s" @@ -237,7 +237,7 @@ fieldspec[].fieldtype INDEX fieldspec[].name "array3.f1" fieldspec[].searchmethod AUTOUTF8 fieldspec[].arg1 "word" -fieldspec[].normalize LOWERCASE_AND_FOLD +fieldspec[].normalize LOWERCASE fieldspec[].maxlength 1048576 fieldspec[].fieldtype ATTRIBUTE fieldspec[].name "array3.f1s" |