Remove remains of RISE.

5 files changed, 1 insertions, 53 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 39d51414607..f8766afbc7b 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,9 +114,6 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer {
                 .prefix(f.hasPrefix())
                 .phrases(f.hasPhrases())
                 .positions(f.hasPositions());
-            if (f.getSdType() !=null && !f.getSdType().equals(com.yahoo.searchdefinition.Index.Type.VESPA)) {
-                ifB.indextype(IndexschemaConfig.Indexfield.Indextype.Enum.valueOf(f.getSdType().toString()));
-            }
             if (!f.getCollectionType().equals("SINGLE")) {
                 ifB.collectiontype(IndexschemaConfig.Indexfield.Collectiontype.Enum.valueOf(f.getCollectionType()));
             }
@@ -194,10 +191,7 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer {
         public Index.Type getRawType() { return type; }
         public String getType() {
             return type.equals(Index.Type.INT64)
-                    ? "INT64"
-                    : type.equals(Index.Type.BOOLEANTREE)
-                        ? "BOOLEANTREE"
-                        : "STRING";
+                    ? "INT64" : "STRING";
         }
 	    public String getCollectionType() {
 	        return (sdFieldType == null)
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 50ca2b204fe..883dfc7ac72 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -221,7 +221,6 @@ TOKEN :
 | < WEIGHT: "weight" >
 | < TYPE: "type" >
 | < INDEX: "index" >
-| < RISE: "rise" >
 | < MTOKEN: "token" >
 | < TEXT: "text" >
 | < WORD: "word" >
@@ -1777,11 +1776,6 @@ Object indexBody(IndexOperation index) :
     ( <PREFIX>                                   { index.setPrefix(true); }
       | <ALIAS> <COLON> str = identifier()       { index.addAlias(str); }
       | <STEMMING> <COLON> str = identifier()    { index.setStemming(str); }
-      | <RISE> {
-              if (true) throw new ParseException("'index:rise' is no longer an option. Use 'indexing:attribute' instead. " +
-                                       "If it is a weighted set field you should also add 'attribute:fast-search'." +
-                                       "This change will require refeeding.");
-          }
       | <ARITY> <COLON> arity = integer()                              { index.setArity(arity); }
       | <LOWERBOUND> <COLON> num = consumeLong()                       { index.setLowerBound(num); }
       | <UPPERBOUND> <COLON> num = consumeLong()                       { index.setUpperBound(num); }
@@ -2555,7 +2549,6 @@ String identifier() : { }
       | <REFERENCE>
       | <REMOVEIFZERO>
       | <RERANKCOUNT>
-      | <RISE>
       | <SEARCH>
       | <SECONDARY>
       | <SECONDPHASE>
diff --git a/config-model/src/test/derived/indexschema/indexschema.cfg b/config-model/src/test/derived/indexschema/indexschema.cfg
index 7d081869b22..d1f43c4a81e 100644
--- a/config-model/src/test/derived/indexschema/indexschema.cfg
+++ b/config-model/src/test/derived/indexschema/indexschema.cfg
@@ -1,5 +1,4 @@
 indexfield[].name "sa"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -7,7 +6,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sb"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -15,7 +13,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sc"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -23,7 +20,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sd"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -31,7 +27,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sf"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -39,7 +34,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sg"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -47,7 +41,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -55,7 +48,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "si"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix true
@@ -63,7 +55,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "exact1"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -71,7 +62,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "exact2"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -79,7 +69,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "nostemstring1"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -87,7 +76,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "nostemstring2"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -95,7 +83,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "nostemstring3"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -103,7 +90,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "nostemstring4"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -111,7 +97,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "fs9"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -119,7 +104,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sd_literal"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -127,7 +111,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.fragment"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -135,7 +118,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.host"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -143,7 +125,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.hostname"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -151,7 +132,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.path"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -159,7 +139,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.port"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -167,7 +146,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.query"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
@@ -175,7 +153,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "sh.scheme"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype SINGLE
 indexfield[].prefix false
diff --git a/config-model/src/test/derived/uri_array/indexschema.cfg b/config-model/src/test/derived/uri_array/indexschema.cfg
index be7bf609579..8593c594e3c 100644
--- a/config-model/src/test/derived/uri_array/indexschema.cfg
+++ b/config-model/src/test/derived/uri_array/indexschema.cfg
@@ -1,5 +1,4 @@
 indexfield[].name "my_uri"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -7,7 +6,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.fragment"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -15,7 +13,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.host"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -23,7 +20,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.hostname"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -31,7 +27,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.path"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -39,7 +34,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.port"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -47,7 +41,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.query"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
@@ -55,7 +48,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.scheme"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype ARRAY
 indexfield[].prefix false
diff --git a/config-model/src/test/derived/uri_wset/indexschema.cfg b/config-model/src/test/derived/uri_wset/indexschema.cfg
index 5997a47c48a..a432556bb6b 100644
--- a/config-model/src/test/derived/uri_wset/indexschema.cfg
+++ b/config-model/src/test/derived/uri_wset/indexschema.cfg
@@ -1,5 +1,4 @@
 indexfield[].name "my_uri"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -7,7 +6,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.fragment"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -15,7 +13,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.host"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -23,7 +20,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.hostname"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -31,7 +27,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.path"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -39,7 +34,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.port"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -47,7 +41,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.query"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false
@@ -55,7 +48,6 @@ indexfield[].phrases false
 indexfield[].positions true
 indexfield[].averageelementlen 512
 indexfield[].name "my_uri.scheme"
-indexfield[].indextype VESPA
 indexfield[].datatype STRING
 indexfield[].collectiontype WEIGHTEDSET
 indexfield[].prefix false