diff options
| -rw-r--r-- | vespa-documentgen-plugin/etc/complex/book.sd | 6 | ||||
| -rw-r--r-- | vespa-documentgen-plugin/etc/localapp/book.sd | 2 | ||||
| -rw-r--r-- | vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/vespa-documentgen-plugin/etc/complex/book.sd b/vespa-documentgen-plugin/etc/complex/book.sd index 68cb2e0b2ad..addc556fc9b 100644 --- a/vespa-documentgen-plugin/etc/complex/book.sd +++ b/vespa-documentgen-plugin/etc/complex/book.sd @@ -25,11 +25,11 @@ search book { field mystruct2 type ss2 {} - field mywsfloat type weightedset<float> { + field mywsinteger type weightedset<int> { indexing: attribute } - field mynestedwsfloat type weightedset<float> {} + field mynestedwsinteger type weightedset<int> {} field myarrayint type array<int> { indexing: attribute @@ -80,9 +80,7 @@ search book { } } rank-profile rp1 inherits default { - #static-rank: weight1 } rank-profile rp2 inherits default { - #static-rank: weight2 } } diff --git a/vespa-documentgen-plugin/etc/localapp/book.sd b/vespa-documentgen-plugin/etc/localapp/book.sd index 58a3c121261..a6f1ed9286f 100644 --- a/vespa-documentgen-plugin/etc/localapp/book.sd +++ b/vespa-documentgen-plugin/etc/localapp/book.sd @@ -25,7 +25,7 @@ search book { field mystruct2 type ss2 {} - field mywsfloat type weightedset<float> { + field mywsinteger type weightedset<int> { indexing: attribute } diff --git a/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java b/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java index c619a1ff56b..2a7eb261a0b 100644 --- a/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java +++ b/vespa-documentgen-plugin/src/test/java/com/yahoo/vespa/DocumentGenTest.java @@ -36,8 +36,8 @@ public class DocumentGenTest { assertTrue(searches.get("music3").getDocument("music3").getField("pos").getDataType() instanceof StructDataType); assertEquals(searches.get("music3").getDocument("music3").getField("pos").getDataType().getName(), "position"); assertTrue(searches.get("book").getDocument("book").getField("mystruct").getDataType() instanceof StructDataType); - assertTrue(searches.get("book").getDocument("book").getField("mywsfloat").getDataType() instanceof WeightedSetDataType); - assertTrue(((WeightedSetDataType)(searches.get("book").getDocument("book").getField("mywsfloat").getDataType())).getNestedType() == DataType.FLOAT); + assertTrue(searches.get("book").getDocument("book").getField("mywsinteger").getDataType() instanceof WeightedSetDataType); + assertTrue(((WeightedSetDataType)(searches.get("book").getDocument("book").getField("mywsinteger").getDataType())).getNestedType() == DataType.INT); } @Test @@ -47,8 +47,8 @@ public class DocumentGenTest { Map<String, Schema> searches = mojo.getSearches(); assertEquals(searches.get("video").getDocument("video").getField("weight").getDataType(), DataType.FLOAT); assertTrue(searches.get("book").getDocument("book").getField("mystruct").getDataType() instanceof StructDataType); - assertTrue(searches.get("book").getDocument("book").getField("mywsfloat").getDataType() instanceof WeightedSetDataType); - assertTrue(((WeightedSetDataType)(searches.get("book").getDocument("book").getField("mywsfloat").getDataType())).getNestedType() == DataType.FLOAT); + assertTrue(searches.get("book").getDocument("book").getField("mywsinteger").getDataType() instanceof WeightedSetDataType); + assertTrue(((WeightedSetDataType)(searches.get("book").getDocument("book").getField("mywsinteger").getDataType())).getNestedType() == DataType.INT); } @Test |