diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-09-14 15:36:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-14 15:36:23 +0200 |
commit | e0e654e144726e50265fccc3fb8085c6273b1a44 (patch) | |
tree | 4ba065804cd44d3e04ba5df812ee79ec36b38bfb /vespa-documentgen-plugin | |
parent | d166163770dde9d20975220457f4f6eb45336919 (diff) | |
parent | e4b377a9fee4a1bad8e7293b577f6b082ebf1cb3 (diff) |
Merge pull request #6964 from vespa-engine/revert-6960-balder/ensure-the-extra-fields-are-included-in-the-concrete-documents-too
Revert "Use a normal SearchBuilder to get all sanity checks and preprocessing…"
Diffstat (limited to 'vespa-documentgen-plugin')
7 files changed, 22 insertions, 11 deletions
diff --git a/vespa-documentgen-plugin/etc/complex/book.sd b/vespa-documentgen-plugin/etc/complex/book.sd index 16bf4447979..2635ebe9881 100644 --- a/vespa-documentgen-plugin/etc/complex/book.sd +++ b/vespa-documentgen-plugin/etc/complex/book.sd @@ -30,7 +30,7 @@ search book { attribute: prefetch } - field mynestedwsfloat type weightedset<float> {} + field mynestedwsfloat type weightedset<weightedset<float>> {} field myarrayint type array<int> { indexing: attribute diff --git a/vespa-documentgen-plugin/etc/complex/common.sd b/vespa-documentgen-plugin/etc/complex/common.sd index e0505eba05b..0764421ac8d 100644 --- a/vespa-documentgen-plugin/etc/complex/common.sd +++ b/vespa-documentgen-plugin/etc/complex/common.sd @@ -17,13 +17,19 @@ search common { indexing: summary } field weight type float { - indexing: attribute | summary + indexing { + input weight * 10 | attribute | summary; + } } field w1 type float { - indexing: summary + indexing { + input weight * 6 + input w1 | summary; + } } field w2 type float { - indexing: summary + indexing { + input w2 + input weight | summary; + } } field did type string { indexing: attribute|index|summary diff --git a/vespa-documentgen-plugin/etc/complex/music2.sd b/vespa-documentgen-plugin/etc/complex/music2.sd index 2e2d96ecdec..5657580e622 100644 --- a/vespa-documentgen-plugin/etc/complex/music2.sd +++ b/vespa-documentgen-plugin/etc/complex/music2.sd @@ -56,7 +56,7 @@ search music2 { } field didinteger type array<int> { - indexing: input did | split " " | for_each { to_int } | attribute + indexing: input did | split " " | attribute } rank-profile default { diff --git a/vespa-documentgen-plugin/etc/localapp/common.sd b/vespa-documentgen-plugin/etc/localapp/common.sd index 724897b4e7f..ada7ce7436a 100644 --- a/vespa-documentgen-plugin/etc/localapp/common.sd +++ b/vespa-documentgen-plugin/etc/localapp/common.sd @@ -17,13 +17,19 @@ search common { indexing: summary } field weight type float { - indexing: attribute|summary + indexing { + input weight * 10 | attribute | summary; + } } field w1 type float { - indexing: summary + indexing { + input weight * 6 + input w1 | summary; + } } field w2 type float { - indexing: summary + indexing { + input w2 + input weight | summary; + } } field did type string { indexing: attribute|index|summary diff --git a/vespa-documentgen-plugin/etc/localapp/music.sd b/vespa-documentgen-plugin/etc/localapp/music.sd index e00e046f511..0cfe5cf923a 100644 --- a/vespa-documentgen-plugin/etc/localapp/music.sd +++ b/vespa-documentgen-plugin/etc/localapp/music.sd @@ -51,7 +51,7 @@ search music { } field didinteger type array<int> { - indexing: input did | split " " | for_each { to_int } | attribute + indexing: input did | split " " | attribute } rank-profile default { diff --git a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java index 309b9b73aa6..eab3983dc69 100644 --- a/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java +++ b/vespa-documentgen-plugin/src/main/java/com/yahoo/vespa/DocumentGenMojo.java @@ -109,7 +109,7 @@ public class DocumentGenMojo extends AbstractMojo { public boolean accept(File dir, String name) { return name.endsWith(".sd"); }}); - SearchBuilder builder = new SearchBuilder(); + SearchBuilder builder = new UnprocessingSearchBuilder(); for (File f : sdFiles) { try { long modTime = f.lastModified(); 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 b21f38c586a..a9a5893cf96 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 @@ -33,7 +33,6 @@ public class DocumentGenTest { mojo.execute(new File("etc/complex/"), new File("target/generated-test-sources/vespa-documentgen-plugin/"), "com.yahoo.vespa.document"); Map<String, Search> searches = mojo.getSearches(); assertEquals(searches.get("video").getDocument("video").getField("weight").getDataType(), DataType.FLOAT); - assertEquals(searches.get("book").getDocument("book").getField("sw1").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); |