aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java2
-rw-r--r--config-model/src/test/derived/indexschema/indexschema.cfg48
-rw-r--r--config-model/src/test/derived/uri_array/indexschema.cfg16
-rw-r--r--config-model/src/test/derived/uri_wset/indexschema.cfg16
4 files changed, 41 insertions, 41 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java
index 6f6e97a0876..3b62807ce73 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java
@@ -114,7 +114,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer {
.prefix(f.hasPrefix())
.phrases(f.hasPhrases())
.positions(f.hasPositions())
- .experimentalpostinglistformat(f.useExperimentalPostingListFormat());
+ .interleavedfeatures(f.useExperimentalPostingListFormat());
if (!f.getCollectionType().equals("SINGLE")) {
ifB.collectiontype(IndexschemaConfig.Indexfield.Collectiontype.Enum.valueOf(f.getCollectionType()));
}
diff --git a/config-model/src/test/derived/indexschema/indexschema.cfg b/config-model/src/test/derived/indexschema/indexschema.cfg
index 612af087b0c..998e53136a4 100644
--- a/config-model/src/test/derived/indexschema/indexschema.cfg
+++ b/config-model/src/test/derived/indexschema/indexschema.cfg
@@ -5,7 +5,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sb"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -13,7 +13,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sc"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -21,7 +21,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sd"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -29,7 +29,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sf"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -37,7 +37,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sg"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -45,7 +45,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -53,7 +53,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "si"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -61,7 +61,7 @@ indexfield[].prefix true
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "exact1"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -69,7 +69,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "exact2"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -77,7 +77,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "experimental"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -85,7 +85,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat true
+indexfield[].interleavedfeatures true
indexfield[].name "nostemstring1"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -93,7 +93,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "nostemstring2"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -101,7 +101,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "nostemstring3"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -109,7 +109,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "nostemstring4"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -117,7 +117,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "fs9"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -125,7 +125,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sd_literal"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -133,7 +133,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.fragment"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -141,7 +141,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.host"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -149,7 +149,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.hostname"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -157,7 +157,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.path"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -165,7 +165,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.port"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -173,7 +173,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.query"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -181,7 +181,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "sh.scheme"
indexfield[].datatype STRING
indexfield[].collectiontype SINGLE
@@ -189,7 +189,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
fieldset[].name "fs9"
fieldset[].field[].name "se"
fieldset[].name "fs1"
diff --git a/config-model/src/test/derived/uri_array/indexschema.cfg b/config-model/src/test/derived/uri_array/indexschema.cfg
index 1a556daf558..1d0012b89be 100644
--- a/config-model/src/test/derived/uri_array/indexschema.cfg
+++ b/config-model/src/test/derived/uri_array/indexschema.cfg
@@ -5,7 +5,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.fragment"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -13,7 +13,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.host"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -21,7 +21,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.hostname"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -29,7 +29,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.path"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -37,7 +37,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.port"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -45,7 +45,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.query"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -53,7 +53,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.scheme"
indexfield[].datatype STRING
indexfield[].collectiontype ARRAY
@@ -61,4 +61,4 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
diff --git a/config-model/src/test/derived/uri_wset/indexschema.cfg b/config-model/src/test/derived/uri_wset/indexschema.cfg
index 7fe7f7a4941..897f7004d48 100644
--- a/config-model/src/test/derived/uri_wset/indexschema.cfg
+++ b/config-model/src/test/derived/uri_wset/indexschema.cfg
@@ -5,7 +5,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.fragment"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -13,7 +13,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.host"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -21,7 +21,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.hostname"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -29,7 +29,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.path"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -37,7 +37,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.port"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -45,7 +45,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.query"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -53,7 +53,7 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false
indexfield[].name "my_uri.scheme"
indexfield[].datatype STRING
indexfield[].collectiontype WEIGHTEDSET
@@ -61,4 +61,4 @@ indexfield[].prefix false
indexfield[].phrases false
indexfield[].positions true
indexfield[].averageelementlen 512
-indexfield[].experimentalpostinglistformat false
+indexfield[].interleavedfeatures false