summaryrefslogtreecommitdiffstats
path: root/config-model/src
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-06-20 12:39:09 +0200
committerJon Bratseth <bratseth@gmail.com>2022-06-20 12:39:09 +0200
commita524d56a67d892e4f431732981647c55714d2f84 (patch)
tree9cd2560b18724eff27bdfce86f9f177314a783ce /config-model/src
parent6fbf962ae13e6eb45a358017229949778ed08a85 (diff)
64k -> 64Mb max bolded field size
Diffstat (limited to 'config-model/src')
-rw-r--r--config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java22
-rw-r--r--config-model/src/test/derived/multiplesummaries/juniperrc.cfg12
-rw-r--r--config-model/src/test/derived/music/juniperrc.cfg4
-rw-r--r--config-model/src/test/derived/newrank/juniperrc.cfg4
4 files changed, 21 insertions, 21 deletions
diff --git a/config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java b/config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java
index 162efbb25b4..eb336e1fc72 100644
--- a/config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java
+++ b/config-model/src/main/java/com/yahoo/schema/derived/Juniperrc.java
@@ -15,20 +15,22 @@ import java.util.Set;
*/
public class Juniperrc extends Derived implements JuniperrcConfig.Producer {
- // List of all fields that should be bolded.
- private Set<String> boldingFields = new java.util.LinkedHashSet<>();
+ private static final int Mb = 1024 * 1024;
+
+ /** List of all fields that should be bolded. */
+ private final Set<String> boldingFields = new java.util.LinkedHashSet<>();
/**
- * Constructs a new juniper rc instance for a given search object. This will derive the configuration automatically,
+ * Constructs a new juniper rc instance for a given search object.
+ * This will derive the configuration automatically,
* so there is no need to call {@link #derive(Schema)}.
*
- * @param schema The search model to use for deriving.
+ * @param schema the search model to use for deriving
*/
public Juniperrc(Schema schema) {
derive(schema);
}
- // Inherit doc from Derived.
@Override
protected void derive(Schema schema) {
super.derive(schema);
@@ -39,11 +41,8 @@ public class Juniperrc extends Derived implements JuniperrcConfig.Producer {
}
}
- // Inherit doc from Derived.
@Override
- protected String getDerivedName() {
- return "juniperrc";
- }
+ protected String getDerivedName() { return "juniperrc"; }
@Override
public void getConfig(JuniperrcConfig.Builder builder) {
@@ -52,11 +51,12 @@ public class Juniperrc extends Derived implements JuniperrcConfig.Producer {
for (String name : boldingFields) {
builder.override(new JuniperrcConfig.Override.Builder()
.fieldname(name)
- .length(65536)
+ .length(64*Mb)
.max_matches(1)
.min_length(8192)
- .surround_max(65536));
+ .surround_max(64*Mb));
}
}
}
+
}
diff --git a/config-model/src/test/derived/multiplesummaries/juniperrc.cfg b/config-model/src/test/derived/multiplesummaries/juniperrc.cfg
index 9b5c6a5a7ba..13d68f62e8b 100644
--- a/config-model/src/test/derived/multiplesummaries/juniperrc.cfg
+++ b/config-model/src/test/derived/multiplesummaries/juniperrc.cfg
@@ -9,33 +9,33 @@ max_match_candidates 1000
stem_min_length 5
stem_max_extend 3
override[].fieldname "d"
-override[].length 65536
+override[].length 67108864
override[].max_matches 1
override[].min_length 8192
override[].prefix true
-override[].surround_max 65536
+override[].surround_max 67108864
override[].winsize 200
override[].winsize_fallback_multiplier 10.0
override[].max_match_candidates 1000
override[].stem_min_length 5
override[].stem_max_extend 3
override[].fieldname "abolded2"
-override[].length 65536
+override[].length 67108864
override[].max_matches 1
override[].min_length 8192
override[].prefix true
-override[].surround_max 65536
+override[].surround_max 67108864
override[].winsize 200
override[].winsize_fallback_multiplier 10.0
override[].max_match_candidates 1000
override[].stem_min_length 5
override[].stem_max_extend 3
override[].fieldname "abolded"
-override[].length 65536
+override[].length 67108864
override[].max_matches 1
override[].min_length 8192
override[].prefix true
-override[].surround_max 65536
+override[].surround_max 67108864
override[].winsize 200
override[].winsize_fallback_multiplier 10.0
override[].max_match_candidates 1000
diff --git a/config-model/src/test/derived/music/juniperrc.cfg b/config-model/src/test/derived/music/juniperrc.cfg
index f5b2c166687..ec5cb1b6a0d 100644
--- a/config-model/src/test/derived/music/juniperrc.cfg
+++ b/config-model/src/test/derived/music/juniperrc.cfg
@@ -9,11 +9,11 @@ max_match_candidates 1000
stem_min_length 5
stem_max_extend 3
override[].fieldname "ew"
-override[].length 65536
+override[].length 67108864
override[].max_matches 1
override[].min_length 8192
override[].prefix true
-override[].surround_max 65536
+override[].surround_max 67108864
override[].winsize 200
override[].winsize_fallback_multiplier 10.0
override[].max_match_candidates 1000
diff --git a/config-model/src/test/derived/newrank/juniperrc.cfg b/config-model/src/test/derived/newrank/juniperrc.cfg
index f5b2c166687..ec5cb1b6a0d 100644
--- a/config-model/src/test/derived/newrank/juniperrc.cfg
+++ b/config-model/src/test/derived/newrank/juniperrc.cfg
@@ -9,11 +9,11 @@ max_match_candidates 1000
stem_min_length 5
stem_max_extend 3
override[].fieldname "ew"
-override[].length 65536
+override[].length 67108864
override[].max_matches 1
override[].min_length 8192
override[].prefix true
-override[].surround_max 65536
+override[].surround_max 67108864
override[].winsize 200
override[].winsize_fallback_multiplier 10.0
override[].max_match_candidates 1000