Publish

6 files changed, 306 insertions, 0 deletions

diff --git a/config-model/src/test/derived/inheritdiamond/.gitignore b/config-model/src/test/derived/inheritdiamond/.gitignore
new file mode 100644
index 00000000000..fc6b63d95e9
--- /dev/null
+++ b/config-model/src/test/derived/inheritdiamond/.gitignore
@@ -0,0 +1 @@
+/documentmanager.15.cfg
diff --git a/config-model/src/test/derived/inheritdiamond/child.sd b/config-model/src/test/derived/inheritdiamond/child.sd
new file mode 100644
index 00000000000..795f01edbaa
--- /dev/null
+++ b/config-model/src/test/derived/inheritdiamond/child.sd
@@ -0,0 +1,12 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+search child {
+    document child inherits mother, father {
+        struct child_struct {
+            field child_field type string { }
+        }
+        field foo type grandparent_struct { }
+        field bar type mother_struct { }
+        field baz type father_struct { }
+        field cox type child_struct { }
+    }
+}
diff --git a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
new file mode 100644
index 00000000000..5f3edfb8475
--- /dev/null
+++ b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
@@ -0,0 +1,269 @@
+enablecompression false
+datatype[0].id -126593034
+datatype[0].structtype[0].name "child.body"
+datatype[0].structtype[0].version 0
+datatype[0].structtype[0].compresstype NONE
+datatype[0].structtype[0].compresslevel 0
+datatype[0].structtype[0].compressthreshold 95
+datatype[0].structtype[0].compressminsize 800
+datatype[1].id 336538650
+datatype[1].structtype[0].name "child_struct"
+datatype[1].structtype[0].version 0
+datatype[1].structtype[0].compresstype NONE
+datatype[1].structtype[0].compresslevel 0
+datatype[1].structtype[0].compressthreshold 95
+datatype[1].structtype[0].compressminsize 800
+datatype[1].structtype[0].field[0].name "child_field"
+datatype[1].structtype[0].field[0].datatype 2
+datatype[2].id 81425825
+datatype[2].structtype[0].name "child.header"
+datatype[2].structtype[0].version 0
+datatype[2].structtype[0].compresstype NONE
+datatype[2].structtype[0].compresslevel 0
+datatype[2].structtype[0].compressthreshold 95
+datatype[2].structtype[0].compressminsize 800
+datatype[2].structtype[0].field[0].name "foo"
+datatype[2].structtype[0].field[0].datatype 1246084544
+datatype[2].structtype[0].field[1].name "bar"
+datatype[2].structtype[0].field[1].datatype 1561776723
+datatype[2].structtype[0].field[2].name "baz"
+datatype[2].structtype[0].field[2].datatype -1913265190
+datatype[2].structtype[0].field[3].name "cox"
+datatype[2].structtype[0].field[3].datatype 336538650
+datatype[3].id 746267614
+datatype[3].documenttype[0].name "child"
+datatype[3].documenttype[0].version 0
+datatype[3].documenttype[0].inherits[0].name "mother"
+datatype[3].documenttype[0].inherits[0].version 0
+datatype[3].documenttype[0].inherits[1].name "document"
+datatype[3].documenttype[0].inherits[1].version 0
+datatype[3].documenttype[0].inherits[2].name "father"
+datatype[3].documenttype[0].inherits[2].version 0
+datatype[3].documenttype[0].headerstruct 81425825
+datatype[3].documenttype[0].bodystruct -126593034
+datatype[4].id -1913265190
+datatype[4].structtype[0].name "father_struct"
+datatype[4].structtype[0].version 0
+datatype[4].structtype[0].compresstype NONE
+datatype[4].structtype[0].compresslevel 0
+datatype[4].structtype[0].compressthreshold 95
+datatype[4].structtype[0].compressminsize 800
+datatype[4].structtype[0].field[0].name "father_field"
+datatype[4].structtype[0].field[0].datatype 2
+datatype[5].id 1246084544
+datatype[5].structtype[0].name "grandparent_struct"
+datatype[5].structtype[0].version 0
+datatype[5].structtype[0].compresstype NONE
+datatype[5].structtype[0].compresslevel 0
+datatype[5].structtype[0].compressthreshold 95
+datatype[5].structtype[0].compressminsize 800
+datatype[5].structtype[0].field[0].name "grandparent_field"
+datatype[5].structtype[0].field[0].datatype 2
+datatype[6].id -1962244686
+datatype[6].structtype[0].name "father_search.header"
+datatype[6].structtype[0].version 0
+datatype[6].structtype[0].compresstype NONE
+datatype[6].structtype[0].compresslevel 0
+datatype[6].structtype[0].compressthreshold 95
+datatype[6].structtype[0].compressminsize 800
+datatype[6].structtype[0].field[0].name "rankfeatures"
+datatype[6].structtype[0].field[0].datatype 2
+datatype[6].structtype[0].field[1].name "summaryfeatures"
+datatype[6].structtype[0].field[1].datatype 2
+datatype[7].id -52742073
+datatype[7].structtype[0].name "father_search.body"
+datatype[7].structtype[0].version 0
+datatype[7].structtype[0].compresstype NONE
+datatype[7].structtype[0].compresslevel 0
+datatype[7].structtype[0].compressthreshold 95
+datatype[7].structtype[0].compressminsize 800
+datatype[8].id 1464571117
+datatype[8].documenttype[0].name "father_search"
+datatype[8].documenttype[0].version 0
+datatype[8].documenttype[0].inherits[0].name "document"
+datatype[8].documenttype[0].inherits[0].version 0
+datatype[8].documenttype[0].headerstruct -1962244686
+datatype[8].documenttype[0].bodystruct -52742073
+datatype[9].id -1852215954
+datatype[9].structtype[0].name "mother_search.body"
+datatype[9].structtype[0].version 0
+datatype[9].structtype[0].compresstype NONE
+datatype[9].structtype[0].compresslevel 0
+datatype[9].structtype[0].compressthreshold 95
+datatype[9].structtype[0].compressminsize 800
+datatype[10].id -384824039
+datatype[10].structtype[0].name "mother_search.header"
+datatype[10].structtype[0].version 0
+datatype[10].structtype[0].compresstype NONE
+datatype[10].structtype[0].compresslevel 0
+datatype[10].structtype[0].compressthreshold 95
+datatype[10].structtype[0].compressminsize 800
+datatype[10].structtype[0].field[0].name "rankfeatures"
+datatype[10].structtype[0].field[0].datatype 2
+datatype[10].structtype[0].field[1].name "summaryfeatures"
+datatype[10].structtype[0].field[1].datatype 2
+datatype[11].id 1561776723
+datatype[11].structtype[0].name "mother_struct"
+datatype[11].structtype[0].version 0
+datatype[11].structtype[0].compresstype NONE
+datatype[11].structtype[0].compresslevel 0
+datatype[11].structtype[0].compressthreshold 95
+datatype[11].structtype[0].compressminsize 800
+datatype[11].structtype[0].field[0].name "mother_field"
+datatype[11].structtype[0].field[0].datatype 2
+datatype[12].id 644645734
+datatype[12].documenttype[0].name "mother_search"
+datatype[12].documenttype[0].version 0
+datatype[12].documenttype[0].inherits[0].name "document"
+datatype[12].documenttype[0].inherits[0].version 0
+datatype[12].documenttype[0].headerstruct -384824039
+datatype[12].documenttype[0].bodystruct -1852215954
+datatype[13].id 1306663898
+datatype[13].structtype[0].name "mother.header"
+datatype[13].structtype[0].version 0
+datatype[13].structtype[0].compresstype NONE
+datatype[13].structtype[0].compresslevel 0
+datatype[13].structtype[0].compressthreshold 95
+datatype[13].structtype[0].compressminsize 800
+datatype[14].id -1989003153
+datatype[14].structtype[0].name "mother.body"
+datatype[14].structtype[0].version 0
+datatype[14].structtype[0].compresstype NONE
+datatype[14].structtype[0].compresslevel 0
+datatype[14].structtype[0].compressthreshold 95
+datatype[14].structtype[0].compressminsize 800
+datatype[15].id -158393403
+datatype[15].documenttype[0].name "mother"
+datatype[15].documenttype[0].version 0
+datatype[15].documenttype[0].inherits[0].name "grandparent"
+datatype[15].documenttype[0].inherits[0].version 0
+datatype[15].documenttype[0].inherits[1].name "document"
+datatype[15].documenttype[0].inherits[1].version 0
+datatype[15].documenttype[0].headerstruct 1306663898
+datatype[15].documenttype[0].bodystruct -1989003153
+datatype[16].id -205818510
+datatype[16].structtype[0].name "child_search.header"
+datatype[16].structtype[0].version 0
+datatype[16].structtype[0].compresstype NONE
+datatype[16].structtype[0].compresslevel 0
+datatype[16].structtype[0].compressthreshold 95
+datatype[16].structtype[0].compressminsize 800
+datatype[16].structtype[0].field[0].name "rankfeatures"
+datatype[16].structtype[0].field[0].datatype 2
+datatype[16].structtype[0].field[1].name "summaryfeatures"
+datatype[16].structtype[0].field[1].datatype 2
+datatype[17].id -1467672569
+datatype[17].structtype[0].name "child_search.body"
+datatype[17].structtype[0].version 0
+datatype[17].structtype[0].compresstype NONE
+datatype[17].structtype[0].compresslevel 0
+datatype[17].structtype[0].compressthreshold 95
+datatype[17].structtype[0].compressminsize 800
+datatype[18].id -580592339
+datatype[18].documenttype[0].name "child_search"
+datatype[18].documenttype[0].version 0
+datatype[18].documenttype[0].inherits[0].name "document"
+datatype[18].documenttype[0].inherits[0].version 0
+datatype[18].documenttype[0].headerstruct -205818510
+datatype[18].documenttype[0].bodystruct -1467672569
+datatype[19].id 111553393
+datatype[19].structtype[0].name "url"
+datatype[19].structtype[0].version 0
+datatype[19].structtype[0].compresstype NONE
+datatype[19].structtype[0].compresslevel 0
+datatype[19].structtype[0].compressthreshold 95
+datatype[19].structtype[0].compressminsize 800
+datatype[19].structtype[0].field[0].name "all"
+datatype[19].structtype[0].field[0].datatype 2
+datatype[19].structtype[0].field[1].name "scheme"
+datatype[19].structtype[0].field[1].datatype 2
+datatype[19].structtype[0].field[2].name "host"
+datatype[19].structtype[0].field[2].datatype 2
+datatype[19].structtype[0].field[3].name "port"
+datatype[19].structtype[0].field[3].datatype 2
+datatype[19].structtype[0].field[4].name "path"
+datatype[19].structtype[0].field[4].datatype 2
+datatype[19].structtype[0].field[5].name "query"
+datatype[19].structtype[0].field[5].datatype 2
+datatype[19].structtype[0].field[6].name "fragment"
+datatype[19].structtype[0].field[6].datatype 2
+datatype[20].id 1381038251
+datatype[20].structtype[0].name "position"
+datatype[20].structtype[0].version 0
+datatype[20].structtype[0].compresstype NONE
+datatype[20].structtype[0].compresslevel 0
+datatype[20].structtype[0].compressthreshold 95
+datatype[20].structtype[0].compressminsize 800
+datatype[20].structtype[0].field[0].name "x"
+datatype[20].structtype[0].field[0].datatype 0
+datatype[20].structtype[0].field[1].name "y"
+datatype[20].structtype[0].field[1].datatype 0
+datatype[21].id 1845861921
+datatype[21].structtype[0].name "grandparent_search.body"
+datatype[21].structtype[0].version 0
+datatype[21].structtype[0].compresstype NONE
+datatype[21].structtype[0].compresslevel 0
+datatype[21].structtype[0].compressthreshold 95
+datatype[21].structtype[0].compressminsize 800
+datatype[22].id 1530060044
+datatype[22].structtype[0].name "grandparent_search.header"
+datatype[22].structtype[0].version 0
+datatype[22].structtype[0].compresstype NONE
+datatype[22].structtype[0].compresslevel 0
+datatype[22].structtype[0].compressthreshold 95
+datatype[22].structtype[0].compressminsize 800
+datatype[22].structtype[0].field[0].name "rankfeatures"
+datatype[22].structtype[0].field[0].datatype 2
+datatype[22].structtype[0].field[1].name "summaryfeatures"
+datatype[22].structtype[0].field[1].datatype 2
+datatype[23].id 328953555
+datatype[23].documenttype[0].name "grandparent_search"
+datatype[23].documenttype[0].version 0
+datatype[23].documenttype[0].inherits[0].name "document"
+datatype[23].documenttype[0].inherits[0].version 0
+datatype[23].documenttype[0].headerstruct 1530060044
+datatype[23].documenttype[0].bodystruct 1845861921
+datatype[24].id 990971719
+datatype[24].structtype[0].name "grandparent.header"
+datatype[24].structtype[0].version 0
+datatype[24].structtype[0].compresstype NONE
+datatype[24].structtype[0].compresslevel 0
+datatype[24].structtype[0].compressthreshold 95
+datatype[24].structtype[0].compressminsize 800
+datatype[25].id 978262812
+datatype[25].structtype[0].name "grandparent.body"
+datatype[25].structtype[0].version 0
+datatype[25].structtype[0].compresstype NONE
+datatype[25].structtype[0].compresslevel 0
+datatype[25].structtype[0].compressthreshold 95
+datatype[25].structtype[0].compressminsize 800
+datatype[26].id -154107656
+datatype[26].documenttype[0].name "grandparent"
+datatype[26].documenttype[0].version 0
+datatype[26].documenttype[0].inherits[0].name "document"
+datatype[26].documenttype[0].inherits[0].version 0
+datatype[26].documenttype[0].headerstruct 990971719
+datatype[26].documenttype[0].bodystruct 978262812
+datatype[27].id -1742340170
+datatype[27].structtype[0].name "father.body"
+datatype[27].structtype[0].version 0
+datatype[27].structtype[0].compresstype NONE
+datatype[27].structtype[0].compresslevel 0
+datatype[27].structtype[0].compressthreshold 95
+datatype[27].structtype[0].compressminsize 800
+datatype[28].id 2126589281
+datatype[28].structtype[0].name "father.header"
+datatype[28].structtype[0].version 0
+datatype[28].structtype[0].compresstype NONE
+datatype[28].structtype[0].compresslevel 0
+datatype[28].structtype[0].compressthreshold 95
+datatype[28].structtype[0].compressminsize 800
+datatype[29].id 986686494
+datatype[29].documenttype[0].name "father"
+datatype[29].documenttype[0].version 0
+datatype[29].documenttype[0].inherits[0].name "grandparent"
+datatype[29].documenttype[0].inherits[0].version 0
+datatype[29].documenttype[0].inherits[1].name "document"
+datatype[29].documenttype[0].inherits[1].version 0
+datatype[29].documenttype[0].headerstruct 2126589281
+datatype[29].documenttype[0].bodystruct -1742340170
diff --git a/config-model/src/test/derived/inheritdiamond/father.sd b/config-model/src/test/derived/inheritdiamond/father.sd
new file mode 100644
index 00000000000..59bd145cf5a
--- /dev/null
+++ b/config-model/src/test/derived/inheritdiamond/father.sd
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+search father {
+    document father inherits grandparent {
+        struct father_struct {
+            field father_field type string { }
+        }
+    }
+}
diff --git a/config-model/src/test/derived/inheritdiamond/grandparent.sd b/config-model/src/test/derived/inheritdiamond/grandparent.sd
new file mode 100644
index 00000000000..2944c0f32cc
--- /dev/null
+++ b/config-model/src/test/derived/inheritdiamond/grandparent.sd
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+search grandparent {
+    document grandparent {
+        struct grandparent_struct {
+            field grandparent_field type string { }
+        }
+    }
+}
diff --git a/config-model/src/test/derived/inheritdiamond/mother.sd b/config-model/src/test/derived/inheritdiamond/mother.sd
new file mode 100644
index 00000000000..cd5fa8cae4d
--- /dev/null
+++ b/config-model/src/test/derived/inheritdiamond/mother.sd
@@ -0,0 +1,8 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+search mother {
+    document mother inherits grandparent {
+        struct mother_struct {
+            field mother_field type string { }
+        }
+    }
+}