From bf36335a51ebd64240d4003052ef4a2bd332e0aa Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Fri, 12 Jan 2024 08:31:42 +0100
Subject: Revert "Balder/unify attributes over streaming indexed"

---
 .../src/main/java/com/yahoo/schema/derived/VsmFields.java         | 1 -
 config-model/src/test/derived/indexschema/vsmfields.cfg           | 2 +-
 .../src/test/derived/nearestneighbor_streaming/vsmfields.cfg      | 8 ++++----
 config-model/src/test/derived/streamingstruct/vsmfields.cfg       | 8 ++++----
 4 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'config-model/src')

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 f05f8b17762..564161b725d 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,7 +264,6 @@ 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 8fbd8835f91..a2152f9787f 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
+fieldspec[].normalize LOWERCASE_AND_FOLD
 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 ab9a96f819b..ec06d01f05a 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
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "vec_b"
 fieldspec[].searchmethod NEAREST_NEIGHBOR
 fieldspec[].arg1 "ANGULAR"
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "vec_c"
 fieldspec[].searchmethod NEAREST_NEIGHBOR
 fieldspec[].arg1 "INNERPRODUCT"
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "vec_d"
 fieldspec[].searchmethod NONE
 fieldspec[].arg1 ""
-fieldspec[].normalize LOWERCASE
+fieldspec[].normalize LOWERCASE_AND_FOLD
 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 07dbb991324..b5a234e8095 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
+fieldspec[].normalize LOWERCASE_AND_FOLD
 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
+fieldspec[].normalize LOWERCASE_AND_FOLD
 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
+fieldspec[].normalize LOWERCASE_AND_FOLD
 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
+fieldspec[].normalize LOWERCASE_AND_FOLD
 fieldspec[].maxlength 1048576
 fieldspec[].fieldtype ATTRIBUTE
 fieldspec[].name "array3.f1s"
-- 
cgit v1.2.3