From 95979285c20b384c3053d210c9e4e4661e13ecd5 Mon Sep 17 00:00:00 2001
From: Arnstein Ressem <aressem@gmail.com>
Date: Thu, 3 Mar 2022 13:59:48 +0100
Subject: Revert "'true' and 'false' literals in ranking expressions"

---
 .../derived/rankingexpression/macro.expression     |   1 -
 .../derived/rankingexpression/overflow.expression  | 300 -----------------
 .../derived/rankingexpression/rank-profiles.cfg    | 374 ---------------------
 .../rankingexpression/rankexpression.expression    |   1 -
 .../derived/rankingexpression/rankexpression.sd    | 364 --------------------
 .../src/test/derived/rankingexpression/summary.cfg |  46 ---
 .../test/derived/rankingexpression/summarymap.cfg  |  37 --
 7 files changed, 1123 deletions(-)
 delete mode 100644 config-model/src/test/derived/rankingexpression/macro.expression
 delete mode 100644 config-model/src/test/derived/rankingexpression/overflow.expression
 delete mode 100644 config-model/src/test/derived/rankingexpression/rank-profiles.cfg
 delete mode 100644 config-model/src/test/derived/rankingexpression/rankexpression.expression
 delete mode 100644 config-model/src/test/derived/rankingexpression/rankexpression.sd
 delete mode 100644 config-model/src/test/derived/rankingexpression/summary.cfg
 delete mode 100644 config-model/src/test/derived/rankingexpression/summarymap.cfg

(limited to 'config-model/src/test/derived/rankingexpression')

diff --git a/config-model/src/test/derived/rankingexpression/macro.expression b/config-model/src/test/derived/rankingexpression/macro.expression
deleted file mode 100644
index 054b025b2e7..00000000000
--- a/config-model/src/test/derived/rankingexpression/macro.expression
+++ /dev/null
@@ -1 +0,0 @@
-703 * fieldMatch(fromfile).completeness
\ No newline at end of file
diff --git a/config-model/src/test/derived/rankingexpression/overflow.expression b/config-model/src/test/derived/rankingexpression/overflow.expression
deleted file mode 100644
index 4d3a6faeeb5..00000000000
--- a/config-model/src/test/derived/rankingexpression/overflow.expression
+++ /dev/null
@@ -1,300 +0,0 @@
-feature1(argument1, argument2, argument3, argument4).output +
-feature2(argument1, argument2, argument3, argument4).output +
-feature3(argument1, argument2, argument3, argument4).output +
-feature4(argument1, argument2, argument3, argument4).output +
-feature5(argument1, argument2, argument3, argument4).output +
-feature6(argument1, argument2, argument3, argument4).output +
-feature7(argument1, argument2, argument3, argument4).output +
-feature8(argument1, argument2, argument3, argument4).output +
-feature9(argument1, argument2, argument3, argument4).output +
-feature10(argument1, argument2, argument3, argument4).output +
-feature11(argument1, argument2, argument3, argument4).output +
-feature12(argument1, argument2, argument3, argument4).output +
-feature13(argument1, argument2, argument3, argument4).output +
-feature14(argument1, argument2, argument3, argument4).output +
-feature15(argument1, argument2, argument3, argument4).output +
-feature16(argument1, argument2, argument3, argument4).output +
-feature17(argument1, argument2, argument3, argument4).output +
-feature18(argument1, argument2, argument3, argument4).output +
-feature19(argument1, argument2, argument3, argument4).output +
-feature20(argument1, argument2, argument3, argument4).output +
-feature21(argument1, argument2, argument3, argument4).output +
-feature22(argument1, argument2, argument3, argument4).output +
-feature23(argument1, argument2, argument3, argument4).output +
-feature24(argument1, argument2, argument3, argument4).output +
-feature25(argument1, argument2, argument3, argument4).output +
-feature26(argument1, argument2, argument3, argument4).output +
-feature27(argument1, argument2, argument3, argument4).output +
-feature28(argument1, argument2, argument3, argument4).output +
-feature29(argument1, argument2, argument3, argument4).output +
-feature30(argument1, argument2, argument3, argument4).output +
-feature31(argument1, argument2, argument3, argument4).output +
-feature32(argument1, argument2, argument3, argument4).output +
-feature33(argument1, argument2, argument3, argument4).output +
-feature34(argument1, argument2, argument3, argument4).output +
-feature35(argument1, argument2, argument3, argument4).output +
-feature36(argument1, argument2, argument3, argument4).output +
-feature37(argument1, argument2, argument3, argument4).output +
-feature38(argument1, argument2, argument3, argument4).output +
-feature39(argument1, argument2, argument3, argument4).output +
-feature40(argument1, argument2, argument3, argument4).output +
-feature41(argument1, argument2, argument3, argument4).output +
-feature42(argument1, argument2, argument3, argument4).output +
-feature43(argument1, argument2, argument3, argument4).output +
-feature44(argument1, argument2, argument3, argument4).output +
-feature45(argument1, argument2, argument3, argument4).output +
-feature46(argument1, argument2, argument3, argument4).output +
-feature47(argument1, argument2, argument3, argument4).output +
-feature48(argument1, argument2, argument3, argument4).output +
-feature49(argument1, argument2, argument3, argument4).output +
-feature50(argument1, argument2, argument3, argument4).output +
-feature51(argument1, argument2, argument3, argument4).output +
-feature52(argument1, argument2, argument3, argument4).output +
-feature53(argument1, argument2, argument3, argument4).output +
-feature54(argument1, argument2, argument3, argument4).output +
-feature55(argument1, argument2, argument3, argument4).output +
-feature56(argument1, argument2, argument3, argument4).output +
-feature57(argument1, argument2, argument3, argument4).output +
-feature58(argument1, argument2, argument3, argument4).output +
-feature59(argument1, argument2, argument3, argument4).output +
-feature60(argument1, argument2, argument3, argument4).output +
-feature61(argument1, argument2, argument3, argument4).output +
-feature62(argument1, argument2, argument3, argument4).output +
-feature63(argument1, argument2, argument3, argument4).output +
-feature64(argument1, argument2, argument3, argument4).output +
-feature65(argument1, argument2, argument3, argument4).output +
-feature66(argument1, argument2, argument3, argument4).output +
-feature67(argument1, argument2, argument3, argument4).output +
-feature68(argument1, argument2, argument3, argument4).output +
-feature69(argument1, argument2, argument3, argument4).output +
-feature70(argument1, argument2, argument3, argument4).output +
-feature71(argument1, argument2, argument3, argument4).output +
-feature72(argument1, argument2, argument3, argument4).output +
-feature73(argument1, argument2, argument3, argument4).output +
-feature74(argument1, argument2, argument3, argument4).output +
-feature75(argument1, argument2, argument3, argument4).output +
-feature76(argument1, argument2, argument3, argument4).output +
-feature77(argument1, argument2, argument3, argument4).output +
-feature78(argument1, argument2, argument3, argument4).output +
-feature79(argument1, argument2, argument3, argument4).output +
-feature80(argument1, argument2, argument3, argument4).output +
-feature81(argument1, argument2, argument3, argument4).output +
-feature82(argument1, argument2, argument3, argument4).output +
-feature83(argument1, argument2, argument3, argument4).output +
-feature84(argument1, argument2, argument3, argument4).output +
-feature85(argument1, argument2, argument3, argument4).output +
-feature86(argument1, argument2, argument3, argument4).output +
-feature87(argument1, argument2, argument3, argument4).output +
-feature88(argument1, argument2, argument3, argument4).output +
-feature89(argument1, argument2, argument3, argument4).output +
-feature90(argument1, argument2, argument3, argument4).output +
-feature91(argument1, argument2, argument3, argument4).output +
-feature92(argument1, argument2, argument3, argument4).output +
-feature93(argument1, argument2, argument3, argument4).output +
-feature94(argument1, argument2, argument3, argument4).output +
-feature95(argument1, argument2, argument3, argument4).output +
-feature96(argument1, argument2, argument3, argument4).output +
-feature97(argument1, argument2, argument3, argument4).output +
-feature98(argument1, argument2, argument3, argument4).output +
-feature99(argument1, argument2, argument3, argument4).output +
-feature100(argument1, argument2, argument3, argument4).output +
-feature101(argument1, argument2, argument3, argument4).output +
-feature102(argument1, argument2, argument3, argument4).output +
-feature103(argument1, argument2, argument3, argument4).output +
-feature104(argument1, argument2, argument3, argument4).output +
-feature105(argument1, argument2, argument3, argument4).output +
-feature106(argument1, argument2, argument3, argument4).output +
-feature107(argument1, argument2, argument3, argument4).output +
-feature108(argument1, argument2, argument3, argument4).output +
-feature109(argument1, argument2, argument3, argument4).output +
-feature110(argument1, argument2, argument3, argument4).output +
-feature111(argument1, argument2, argument3, argument4).output +
-feature112(argument1, argument2, argument3, argument4).output +
-feature113(argument1, argument2, argument3, argument4).output +
-feature114(argument1, argument2, argument3, argument4).output +
-feature115(argument1, argument2, argument3, argument4).output +
-feature116(argument1, argument2, argument3, argument4).output +
-feature117(argument1, argument2, argument3, argument4).output +
-feature118(argument1, argument2, argument3, argument4).output +
-feature119(argument1, argument2, argument3, argument4).output +
-feature120(argument1, argument2, argument3, argument4).output +
-feature121(argument1, argument2, argument3, argument4).output +
-feature122(argument1, argument2, argument3, argument4).output +
-feature123(argument1, argument2, argument3, argument4).output +
-feature124(argument1, argument2, argument3, argument4).output +
-feature125(argument1, argument2, argument3, argument4).output +
-feature126(argument1, argument2, argument3, argument4).output +
-feature127(argument1, argument2, argument3, argument4).output +
-feature128(argument1, argument2, argument3, argument4).output +
-feature129(argument1, argument2, argument3, argument4).output +
-feature130(argument1, argument2, argument3, argument4).output +
-feature131(argument1, argument2, argument3, argument4).output +
-feature132(argument1, argument2, argument3, argument4).output +
-feature133(argument1, argument2, argument3, argument4).output +
-feature134(argument1, argument2, argument3, argument4).output +
-feature135(argument1, argument2, argument3, argument4).output +
-feature136(argument1, argument2, argument3, argument4).output +
-feature137(argument1, argument2, argument3, argument4).output +
-feature138(argument1, argument2, argument3, argument4).output +
-feature139(argument1, argument2, argument3, argument4).output +
-feature140(argument1, argument2, argument3, argument4).output +
-feature141(argument1, argument2, argument3, argument4).output +
-feature142(argument1, argument2, argument3, argument4).output +
-feature143(argument1, argument2, argument3, argument4).output +
-feature144(argument1, argument2, argument3, argument4).output +
-feature145(argument1, argument2, argument3, argument4).output +
-feature146(argument1, argument2, argument3, argument4).output +
-feature147(argument1, argument2, argument3, argument4).output +
-feature148(argument1, argument2, argument3, argument4).output +
-feature149(argument1, argument2, argument3, argument4).output +
-feature150(argument1, argument2, argument3, argument4).output +
-feature151(argument1, argument2, argument3, argument4).output +
-feature152(argument1, argument2, argument3, argument4).output +
-feature153(argument1, argument2, argument3, argument4).output +
-feature154(argument1, argument2, argument3, argument4).output +
-feature155(argument1, argument2, argument3, argument4).output +
-feature156(argument1, argument2, argument3, argument4).output +
-feature157(argument1, argument2, argument3, argument4).output +
-feature158(argument1, argument2, argument3, argument4).output +
-feature159(argument1, argument2, argument3, argument4).output +
-feature160(argument1, argument2, argument3, argument4).output +
-feature161(argument1, argument2, argument3, argument4).output +
-feature162(argument1, argument2, argument3, argument4).output +
-feature163(argument1, argument2, argument3, argument4).output +
-feature164(argument1, argument2, argument3, argument4).output +
-feature165(argument1, argument2, argument3, argument4).output +
-feature166(argument1, argument2, argument3, argument4).output +
-feature167(argument1, argument2, argument3, argument4).output +
-feature168(argument1, argument2, argument3, argument4).output +
-feature169(argument1, argument2, argument3, argument4).output +
-feature170(argument1, argument2, argument3, argument4).output +
-feature171(argument1, argument2, argument3, argument4).output +
-feature172(argument1, argument2, argument3, argument4).output +
-feature173(argument1, argument2, argument3, argument4).output +
-feature174(argument1, argument2, argument3, argument4).output +
-feature175(argument1, argument2, argument3, argument4).output +
-feature176(argument1, argument2, argument3, argument4).output +
-feature177(argument1, argument2, argument3, argument4).output +
-feature178(argument1, argument2, argument3, argument4).output +
-feature179(argument1, argument2, argument3, argument4).output +
-feature180(argument1, argument2, argument3, argument4).output +
-feature181(argument1, argument2, argument3, argument4).output +
-feature182(argument1, argument2, argument3, argument4).output +
-feature183(argument1, argument2, argument3, argument4).output +
-feature184(argument1, argument2, argument3, argument4).output +
-feature185(argument1, argument2, argument3, argument4).output +
-feature186(argument1, argument2, argument3, argument4).output +
-feature187(argument1, argument2, argument3, argument4).output +
-feature188(argument1, argument2, argument3, argument4).output +
-feature189(argument1, argument2, argument3, argument4).output +
-feature190(argument1, argument2, argument3, argument4).output +
-feature191(argument1, argument2, argument3, argument4).output +
-feature192(argument1, argument2, argument3, argument4).output +
-feature193(argument1, argument2, argument3, argument4).output +
-feature194(argument1, argument2, argument3, argument4).output +
-feature195(argument1, argument2, argument3, argument4).output +
-feature196(argument1, argument2, argument3, argument4).output +
-feature197(argument1, argument2, argument3, argument4).output +
-feature198(argument1, argument2, argument3, argument4).output +
-feature199(argument1, argument2, argument3, argument4).output +
-feature200(argument1, argument2, argument3, argument4).output +
-feature201(argument1, argument2, argument3, argument4).output +
-feature202(argument1, argument2, argument3, argument4).output +
-feature203(argument1, argument2, argument3, argument4).output +
-feature204(argument1, argument2, argument3, argument4).output +
-feature205(argument1, argument2, argument3, argument4).output +
-feature206(argument1, argument2, argument3, argument4).output +
-feature207(argument1, argument2, argument3, argument4).output +
-feature208(argument1, argument2, argument3, argument4).output +
-feature209(argument1, argument2, argument3, argument4).output +
-feature210(argument1, argument2, argument3, argument4).output +
-feature211(argument1, argument2, argument3, argument4).output +
-feature212(argument1, argument2, argument3, argument4).output +
-feature213(argument1, argument2, argument3, argument4).output +
-feature214(argument1, argument2, argument3, argument4).output +
-feature215(argument1, argument2, argument3, argument4).output +
-feature216(argument1, argument2, argument3, argument4).output +
-feature217(argument1, argument2, argument3, argument4).output +
-feature218(argument1, argument2, argument3, argument4).output +
-feature219(argument1, argument2, argument3, argument4).output +
-feature220(argument1, argument2, argument3, argument4).output +
-feature221(argument1, argument2, argument3, argument4).output +
-feature222(argument1, argument2, argument3, argument4).output +
-feature223(argument1, argument2, argument3, argument4).output +
-feature224(argument1, argument2, argument3, argument4).output +
-feature225(argument1, argument2, argument3, argument4).output +
-feature226(argument1, argument2, argument3, argument4).output +
-feature227(argument1, argument2, argument3, argument4).output +
-feature228(argument1, argument2, argument3, argument4).output +
-feature229(argument1, argument2, argument3, argument4).output +
-feature230(argument1, argument2, argument3, argument4).output +
-feature231(argument1, argument2, argument3, argument4).output +
-feature232(argument1, argument2, argument3, argument4).output +
-feature233(argument1, argument2, argument3, argument4).output +
-feature234(argument1, argument2, argument3, argument4).output +
-feature235(argument1, argument2, argument3, argument4).output +
-feature236(argument1, argument2, argument3, argument4).output +
-feature237(argument1, argument2, argument3, argument4).output +
-feature238(argument1, argument2, argument3, argument4).output +
-feature239(argument1, argument2, argument3, argument4).output +
-feature240(argument1, argument2, argument3, argument4).output +
-feature241(argument1, argument2, argument3, argument4).output +
-feature242(argument1, argument2, argument3, argument4).output +
-feature243(argument1, argument2, argument3, argument4).output +
-feature244(argument1, argument2, argument3, argument4).output +
-feature245(argument1, argument2, argument3, argument4).output +
-feature246(argument1, argument2, argument3, argument4).output +
-feature247(argument1, argument2, argument3, argument4).output +
-feature248(argument1, argument2, argument3, argument4).output +
-feature249(argument1, argument2, argument3, argument4).output +
-feature250(argument1, argument2, argument3, argument4).output +
-feature251(argument1, argument2, argument3, argument4).output +
-feature252(argument1, argument2, argument3, argument4).output +
-feature253(argument1, argument2, argument3, argument4).output +
-feature254(argument1, argument2, argument3, argument4).output +
-feature255(argument1, argument2, argument3, argument4).output +
-feature256(argument1, argument2, argument3, argument4).output +
-feature257(argument1, argument2, argument3, argument4).output +
-feature258(argument1, argument2, argument3, argument4).output +
-feature259(argument1, argument2, argument3, argument4).output +
-feature260(argument1, argument2, argument3, argument4).output +
-feature261(argument1, argument2, argument3, argument4).output +
-feature262(argument1, argument2, argument3, argument4).output +
-feature263(argument1, argument2, argument3, argument4).output +
-feature264(argument1, argument2, argument3, argument4).output +
-feature265(argument1, argument2, argument3, argument4).output +
-feature266(argument1, argument2, argument3, argument4).output +
-feature267(argument1, argument2, argument3, argument4).output +
-feature268(argument1, argument2, argument3, argument4).output +
-feature269(argument1, argument2, argument3, argument4).output +
-feature270(argument1, argument2, argument3, argument4).output +
-feature271(argument1, argument2, argument3, argument4).output +
-feature272(argument1, argument2, argument3, argument4).output +
-feature273(argument1, argument2, argument3, argument4).output +
-feature274(argument1, argument2, argument3, argument4).output +
-feature275(argument1, argument2, argument3, argument4).output +
-feature276(argument1, argument2, argument3, argument4).output +
-feature277(argument1, argument2, argument3, argument4).output +
-feature278(argument1, argument2, argument3, argument4).output +
-feature279(argument1, argument2, argument3, argument4).output +
-feature280(argument1, argument2, argument3, argument4).output +
-feature281(argument1, argument2, argument3, argument4).output +
-feature282(argument1, argument2, argument3, argument4).output +
-feature283(argument1, argument2, argument3, argument4).output +
-feature284(argument1, argument2, argument3, argument4).output +
-feature285(argument1, argument2, argument3, argument4).output +
-feature286(argument1, argument2, argument3, argument4).output +
-feature287(argument1, argument2, argument3, argument4).output +
-feature288(argument1, argument2, argument3, argument4).output +
-feature289(argument1, argument2, argument3, argument4).output +
-feature290(argument1, argument2, argument3, argument4).output +
-feature291(argument1, argument2, argument3, argument4).output +
-feature292(argument1, argument2, argument3, argument4).output +
-feature293(argument1, argument2, argument3, argument4).output +
-feature294(argument1, argument2, argument3, argument4).output +
-feature295(argument1, argument2, argument3, argument4).output +
-feature296(argument1, argument2, argument3, argument4).output +
-feature297(argument1, argument2, argument3, argument4).output +
-feature298(argument1, argument2, argument3, argument4).output +
-feature299(argument1, argument2, argument3, argument4).output +
-feature300(argument1, argument2, argument3, argument4).output 
\ No newline at end of file
diff --git a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg b/config-model/src/test/derived/rankingexpression/rank-profiles.cfg
deleted file mode 100644
index 6bad0434ac3..00000000000
--- a/config-model/src/test/derived/rankingexpression/rank-profiles.cfg
+++ /dev/null
@@ -1,374 +0,0 @@
-rankprofile[].name "default"
-rankprofile[].fef.property[].name "foo"
-rankprofile[].fef.property[].value "bar, baz"
-rankprofile[].fef.property[].name "foo"
-rankprofile[].fef.property[].value "foobar"
-rankprofile[].fef.property[].name "qux"
-rankprofile[].fef.property[].value "quux"
-rankprofile[].fef.property[].name "foo.bar"
-rankprofile[].fef.property[].value "foo.bar"
-rankprofile[].fef.property[].name "foo.bar.baz"
-rankprofile[].fef.property[].value "123"
-rankprofile[].fef.property[].name "foo(bar).baz.2"
-rankprofile[].fef.property[].value "123.4"
-rankprofile[].fef.property[].name "foo(bar).baz.qux"
-rankprofile[].fef.property[].value "foo(bar)"
-rankprofile[].fef.property[].name "nud"
-rankprofile[].fef.property[].value "ity"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "classicRank"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "4"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(foo1).out"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(bar1)"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(foo2).out"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(bar2).out"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(foo3).out"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(bar3).out"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(foo4).out"
-rankprofile[].fef.property[].name "vespa.dump.feature"
-rankprofile[].fef.property[].value "attribute(bar4).out"
-rankprofile[].fef.property[].name "vespa.hitcollector.heapsize"
-rankprofile[].fef.property[].value "10"
-rankprofile[].fef.property[].name "vespa.hitcollector.arraysize"
-rankprofile[].fef.property[].value "20"
-rankprofile[].fef.property[].name "vespa.hitcollector.rankscoredroplimit"
-rankprofile[].fef.property[].value "-0.5"
-rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures"
-rankprofile[].fef.property[].value "true"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "unranked"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "value(0)"
-rankprofile[].fef.property[].name "vespa.hitcollector.heapsize"
-rankprofile[].fef.property[].value "0"
-rankprofile[].fef.property[].name "vespa.hitcollector.arraysize"
-rankprofile[].fef.property[].value "0"
-rankprofile[].fef.property[].name "vespa.dump.ignoredefaultfeatures"
-rankprofile[].fef.property[].value "true"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "static"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "attribute"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "10 + feature(arg1).out.out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(foo1).out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(bar1)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(foo2).out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(bar2).out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(foo3).out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(bar3).out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(foo4).out"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "attribute(bar4).out"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "overflow"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).expressionName"
-rankprofile[].fef.property[].value "overflow.firstphase"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "exp(0) + mysum(attribute(foo),\"attribute( bar )\",\"attribute( \\\"baz\\\" )\")"
-rankprofile[].fef.property[].name "vespa.hitcollector.heapsize"
-rankprofile[].fef.property[].value "101"
-rankprofile[].fef.property[].name "vespa.hitcollector.arraysize"
-rankprofile[].fef.property[].value "201"
-rankprofile[].fef.property[].name "vespa.hitcollector.rankscoredroplimit"
-rankprofile[].fef.property[].value "501.5"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "duplicates"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityLimit"
-rankprofile[].fef.property[].value "4"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.2"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.4"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.6"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.8"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "1"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.8"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.6"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.4"
-rankprofile[].fef.property[].name "fieldMatch(a).proximityTable"
-rankprofile[].fef.property[].value "0.2"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "whitespace1"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
-rankprofile[].fef.property[].value "1"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "whitespace2"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
-rankprofile[].fef.property[].value "1"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros"
-rankprofile[].fef.property[].name "rankingExpression(myfeature).rankingScript"
-rankprofile[].fef.property[].value "70 * fieldMatch(title).completeness * pow(0 - fieldMatch(title).earliness,2) + 30 * pow(0 - fieldMatch(description).earliness,2)"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum@5cf279212355b980.67f1e87166cfef86).rankingScript"
-rankprofile[].fef.property[].value "4 * (match + rankBoost)"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum).rankingScript"
-rankprofile[].fef.property[].value "4 * (var1 + var2)"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
-rankprofile[].fef.property[].value "match + fieldMatch(title) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(fourtimessum@5cf279212355b980.67f1e87166cfef86)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "fieldMatch(title)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros2"
-rankprofile[].fef.property[].name "foo"
-rankprofile[].fef.property[].value "some, list"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum@2b1138e8965e7ff5.67f1e87166cfef86).rankingScript"
-rankprofile[].fef.property[].value "4 * (match + match)"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature).rankingScript"
-rankprofile[].fef.property[].value "70 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(myfeature).rankingScript"
-rankprofile[].fef.property[].value "70 * fieldMatch(title).completeness * pow(0 - fieldMatch(title).earliness,2) + 30 * pow(0 - fieldMatch(description).earliness,2)"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum).rankingScript"
-rankprofile[].fef.property[].value "4 * (var1 + var2)"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature2).rankingScript"
-rankprofile[].fef.property[].value "71 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "classicRank"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(fourtimessum@2b1138e8965e7ff5.67f1e87166cfef86) + rankingExpression(mysummaryfeature) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros3"
-rankprofile[].fef.property[].name "rankingExpression(onlyusedinsummaryfeature).rankingScript"
-rankprofile[].fef.property[].value "5"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(matches(title,rankingExpression(onlyusedinsummaryfeature)))"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros3-inherited"
-rankprofile[].fef.property[].name "rankingExpression(onlyusedinsummaryfeature).rankingScript"
-rankprofile[].fef.property[].value "5"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(matches(title,rankingExpression(onlyusedinsummaryfeature)))"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-inherited"
-rankprofile[].fef.property[].name "foo"
-rankprofile[].fef.property[].value "some, list"
-rankprofile[].fef.property[].name "rankingExpression(myfeature).rankingScript"
-rankprofile[].fef.property[].value "70 * fieldMatch(title).completeness * pow(0 - fieldMatch(title).earliness,2) + 30 * pow(0 - fieldMatch(description).earliness,2)"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature).rankingScript"
-rankprofile[].fef.property[].value "80 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum@2b1138e8965e7ff5.67f1e87166cfef86).rankingScript"
-rankprofile[].fef.property[].value "4 * (match + match)"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum).rankingScript"
-rankprofile[].fef.property[].value "4 * (var1 + var2)"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature2).rankingScript"
-rankprofile[].fef.property[].value "71 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
-rankprofile[].fef.property[].value "20000 * rankingExpression(myfeature) + rankingExpression(mysummaryfeature)"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(fourtimessum@2b1138e8965e7ff5.67f1e87166cfef86) + rankingExpression(mysummaryfeature) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-inherited2"
-rankprofile[].fef.property[].name "foo"
-rankprofile[].fef.property[].value "some, list"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature).rankingScript"
-rankprofile[].fef.property[].value "80 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(myfeature).rankingScript"
-rankprofile[].fef.property[].value "70 * fieldMatch(title).completeness * pow(0 - fieldMatch(title).earliness,2) + 30 * pow(0 - fieldMatch(description).earliness,2)"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum@2b1138e8965e7ff5.67f1e87166cfef86).rankingScript"
-rankprofile[].fef.property[].value "4 * (match + match)"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum).rankingScript"
-rankprofile[].fef.property[].value "4 * (var1 + var2)"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature2).rankingScript"
-rankprofile[].fef.property[].value "71 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
-rankprofile[].fef.property[].value "30000 * rankingExpression(mysummaryfeature) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(fourtimessum@2b1138e8965e7ff5.67f1e87166cfef86) + rankingExpression(mysummaryfeature) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-inherited3"
-rankprofile[].fef.property[].name "foo"
-rankprofile[].fef.property[].value "some, list"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature).rankingScript"
-rankprofile[].fef.property[].value "80 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(myfeature).rankingScript"
-rankprofile[].fef.property[].value "700 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(fourtimessum).rankingScript"
-rankprofile[].fef.property[].value "4 * (var1 + var2)"
-rankprofile[].fef.property[].name "rankingExpression(mysummaryfeature2).rankingScript"
-rankprofile[].fef.property[].value "71 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "rankingExpression(firstphase)"
-rankprofile[].fef.property[].name "rankingExpression(firstphase).rankingScript"
-rankprofile[].fef.property[].value "30000 * rankingExpression(mysummaryfeature) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "40000 * rankingExpression(mysummaryfeature) + rankingExpression(myfeature)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature2)"
-rankprofile[].fef.property[].name "vespa.summary.feature"
-rankprofile[].fef.property[].value "rankingExpression(mysummaryfeature)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-refering-macros"
-rankprofile[].fef.property[].name "rankingExpression(m1).rankingScript"
-rankprofile[].fef.property[].value "700 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(m2).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(m1) * 67"
-rankprofile[].fef.property[].name "rankingExpression(m4).rankingScript"
-rankprofile[].fef.property[].value "703 * fieldMatch(fromfile).completeness"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "40000 * rankingExpression(m2) * rankingExpression(m4)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-refering-macros-inherited"
-rankprofile[].fef.property[].name "rankingExpression(m1).rankingScript"
-rankprofile[].fef.property[].value "700 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(m2).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(m1) * 67"
-rankprofile[].fef.property[].name "rankingExpression(m4).rankingScript"
-rankprofile[].fef.property[].value "703 * fieldMatch(fromfile).completeness"
-rankprofile[].fef.property[].name "rankingExpression(m3).rankingScript"
-rankprofile[].fef.property[].value "if (isNan(attribute(nrtgmp)) == 1, 0.0, rankingExpression(m2))"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "3000 * rankingExpression(m2) * rankingExpression(m4)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-refering-macros-inherited2"
-rankprofile[].fef.property[].name "rankingExpression(m1).rankingScript"
-rankprofile[].fef.property[].value "700 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(m2).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(m1) * 67"
-rankprofile[].fef.property[].name "rankingExpression(m4).rankingScript"
-rankprofile[].fef.property[].value "703 * fieldMatch(fromfile).completeness"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "3002 * rankingExpression(m2)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "macros-refering-macros-inherited-two-levels"
-rankprofile[].fef.property[].name "rankingExpression(m1).rankingScript"
-rankprofile[].fef.property[].value "700 * fieldMatch(title).completeness"
-rankprofile[].fef.property[].name "rankingExpression(m2).rankingScript"
-rankprofile[].fef.property[].value "rankingExpression(m1) * 67"
-rankprofile[].fef.property[].name "rankingExpression(m4).rankingScript"
-rankprofile[].fef.property[].value "703 * fieldMatch(fromfile).completeness"
-rankprofile[].fef.property[].name "rankingExpression(m3).rankingScript"
-rankprofile[].fef.property[].value "if (isNan(attribute(nrtgmp)) == 1, 0.0, rankingExpression(m2))"
-rankprofile[].fef.property[].name "rankingExpression(m5).rankingScript"
-rankprofile[].fef.property[].value "if (isNan(attribute(glmpfw)) == 1, rankingExpression(m1), rankingExpression(m4))"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "rankingExpression(secondphase)"
-rankprofile[].fef.property[].name "rankingExpression(secondphase).rankingScript"
-rankprofile[].fef.property[].value "3000 * rankingExpression(m2) * rankingExpression(m4)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "withmf"
-rankprofile[].fef.property[].name "rankingExpression(myplus).rankingScript"
-rankprofile[].fef.property[].value "attribute(foo1) + attribute(foo2)"
-rankprofile[].fef.property[].name "rankingExpression(mymul).rankingScript"
-rankprofile[].fef.property[].value "attribute(t1) * query(fromq)"
-rankprofile[].fef.property[].name "vespa.rank.firstphase"
-rankprofile[].fef.property[].value "attribute(foo1)"
-rankprofile[].fef.property[].name "vespa.rank.secondphase"
-rankprofile[].fef.property[].value "attribute(foo2)"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(foo1).out"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(bar1)"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(foo2).out"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(bar2).out"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(foo3).out"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(bar3).out"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "attribute(foo4)"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "firstPhase"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "secondPhase"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "rankingExpression(myplus)"
-rankprofile[].fef.property[].name "vespa.match.feature"
-rankprofile[].fef.property[].value "rankingExpression(mymul)"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
-rankprofile[].name "withboolean"
-rankprofile[].fef.property[].name "rankingExpression(mytrue).rankingScript"
-rankprofile[].fef.property[].value "1.0"
-rankprofile[].fef.property[].name "rankingExpression(myfalse).rankingScript"
-rankprofile[].fef.property[].value "0.0"
-rankprofile[].fef.property[].name "rankingExpression(mybooleanexpression).rankingScript"
-rankprofile[].fef.property[].value "5.0"
-rankprofile[].fef.property[].name "vespa.type.attribute.t1"
-rankprofile[].fef.property[].value "tensor(m{},v[3])"
diff --git a/config-model/src/test/derived/rankingexpression/rankexpression.expression b/config-model/src/test/derived/rankingexpression/rankexpression.expression
deleted file mode 100644
index d6cb73c829d..00000000000
--- a/config-model/src/test/derived/rankingexpression/rankexpression.expression
+++ /dev/null
@@ -1 +0,0 @@
-if ( 3 > 2 , 10 , 24 ) + feature ( arg1 ) . out.out
diff --git a/config-model/src/test/derived/rankingexpression/rankexpression.sd b/config-model/src/test/derived/rankingexpression/rankexpression.sd
deleted file mode 100644
index 25d657eaf0b..00000000000
--- a/config-model/src/test/derived/rankingexpression/rankexpression.sd
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search rankexpression {
-  
-  document rankexpression {
-
-    field artist type string {
-      indexing: summary | index
-    }
-
-    field title type string {
-      indexing: summary | index
-    }
-
-    field surl type string {
-      indexing: summary
-    }
-
-    field year type int {
-      indexing: summary | attribute
-    }
-
-    field foo1 type int {
-      indexing: attribute
-    }
-
-    field foo2 type int {
-      indexing: attribute
-    }
-
-    field foo3 type int {
-      indexing: attribute
-    }
-
-    field foo4 type int {
-      indexing: attribute
-    }
-
-    field bar1 type int {
-      indexing: attribute
-    }
-
-    field bar2 type int {
-      indexing: attribute
-    }
-
-    field bar3 type int {
-      indexing: attribute
-    }
-
-    field bar4 type int {
-      indexing: attribute
-    }
-
-    field t1 type tensor(m{},v[3]) {
-      indexing: attribute
-    }
-  }
-
-  rank-profile default {
-      first-phase {
-        expression: classicRank
-        keep-rank-count: 20
-        rank-score-drop-limit: -0.5
-      }
-      second-phase {
-        expression: if(3>2,4,2)
-        rerank-count: 10
-      }
-      rank-features: attribute(foo1).out attribute(bar1)
-      rank-features { attribute(foo2).out attribute(bar2).out }
-      rank-features {
-        attribute(foo3).out attribute(bar3).out
-      }
-      rank-features {
-        attribute(foo4).out
-        attribute(bar4).out 
-      }
-      ignore-default-rank-features
-
-      rank-properties {
-          foo: "bar, baz"
-          qux: "quux"
-          foo: "foobar"
-          foo.bar: "foo.bar"
-          foo.bar.baz: 123
-          foo ( bar ) . baz.2  : 123.4
-          foo(bar).baz.qux: "foo(bar)"
-          "nud":"ity"
-      }
-
-  }
-
-  rank-profile static {
-      first-phase {
-        expression { attribute }
-      }
-      second-phase {
-        expression {
-            file:rankexpression
-        }
-      }
-      summary-features: attribute(foo1).out attribute(bar1)
-      summary-features { attribute(foo2).out attribute(bar2).out }
-      summary-features {
-        attribute(foo3).out attribute(bar3).out
-      }
-      summary-features {
-        attribute(foo4).out
-        attribute(bar4).out
-      }
-  }
-
-  rank-profile overflow {
-      first-phase {
-        expression: file:overflow.expression
-        keep-rank-count: 201
-        rank-score-drop-limit: 501.5
-      }
-      second-phase {
-        expression {
-            exp(0) + 
-            mysum(attribute(foo),
-                  "attribute( bar )",
-                  "attribute( \"baz\" )")
-        }
-        rerank-count: 101
-      }
-  }
-
-  rank-profile duplicates {
-    rank-properties {
-      fieldMatch(a).proximityLimit: 4
-      fieldMatch(a).proximityTable: 0.2
-      fieldMatch(a).proximityTable: 0.4
-      fieldMatch(a).proximityTable: 0.6
-      fieldMatch(a).proximityTable: 0.8
-      fieldMatch(a).proximityTable: 1
-      fieldMatch(a).proximityTable: 0.8
-      fieldMatch(a).proximityTable: 0.6
-      fieldMatch(a).proximityTable: 0.4
-      fieldMatch(a).proximityTable: 0.2
-    }
-  }
-
-  rank-profile whitespace1 {
-    first-phase {
-      expression
-        	{
-
-        1
-        }}}
-
-  rank-profile whitespace2 {
-    first-phase
-    {
-      expression		{ 1 }
-    }
-  }
-
-  rank-profile macros {
-    first-phase {
-      expression: match + fieldMatch(title) + myfeature
-    }
-    second-phase {
-      expression: fourtimessum(match,rankBoost)
-    }
-    function fourtimessum(var1, var2) {
-      expression: 4*(var1+var2)
-    }
-    function myfeature() {
-       expression {
-         70 * fieldMatch(title).completeness * pow(0 - fieldMatch(title).earliness, 2) +
-         30 * pow(0 - fieldMatch(description).earliness, 2)
-       }
-    }
-    summary-features { 
-      fieldMatch(title)
-    }
-  }
-
-  rank-profile macros2 {
-    first-phase {
-      expression: classicRank
-    }
-    rank-properties {
-      foo: "some, list"
-    }
-    
-    second-phase {
-      expression: fourtimessum(match,match) + mysummaryfeature + myfeature
-    }
-    function fourtimessum(var1, var2) {
-      expression: 4*(var1+var2)
-    }
-    function myfeature() {
-       expression {
-         70 * fieldMatch(title).completeness * pow(0 - fieldMatch(title).earliness, 2) +
-         30 * pow(0 - fieldMatch(description).earliness, 2)
-       }
-    }
-    function mysummaryfeature() {
-       expression {
-         70 * fieldMatch(title).completeness
-       }
-    }
-    function mysummaryfeature2() {
-       expression {
-         71 * fieldMatch(title).completeness
-       }
-    }    
-    summary-features { 
-      mysummaryfeature
-      rankingExpression(mysummaryfeature2) # Required form earlier
-    }
-  }
-
-  rank-profile macros3 {
-    function onlyusedinsummaryfeature() {
-      expression: 5
-    }
-    summary-features {
-      rankingExpression(matches(title,rankingExpression(onlyusedinsummaryfeature)))
-    }
-      
-  }
-
-  rank-profile macros3-inherited inherits macros3 {
-    summary-features {
-      rankingExpression(matches(title,rankingExpression(onlyusedinsummaryfeature)))
-    }
-  }
-
-  rank-profile macros-inherited inherits macros2 {
-    function mysummaryfeature() {
-       expression {
-         80 * fieldMatch(title).completeness
-       }
-    }
-    first-phase {
-      expression {
-        20000 * myfeature + mysummaryfeature
-      }
-    }
-  }
-  
-  rank-profile macros-inherited2 inherits macros-inherited {
-    first-phase {
-      expression {
-        30000 * mysummaryfeature + myfeature
-      }
-    }
-  }
-
- rank-profile macros-inherited3 inherits macros-inherited2 {
-    function myfeature() {
-       expression {
-         700 * fieldMatch(title).completeness
-       }
-    }
-    second-phase {
-       expression {
-         40000 * mysummaryfeature + myfeature
-       }
-    }
-  }
-
-  rank-profile macros-refering-macros {
-    function m2() {
-      expression: m1 * 67
-    }    
-
-    function m1() {
-      expression {
-         700 * fieldMatch(title).completeness
-       }
-    }
-
-    function m4() {
-      expression: file:macro.expression
-    }
-    
-    second-phase {
-      expression {
-        40000 * m2 * m4
-      }
-    }
-    
-  }
-
-  rank-profile macros-refering-macros-inherited inherits macros-refering-macros {
-    function m3() {
-      expression {
-        if(isNan(attribute(nrtgmp))==1,
-          0.0,
-          (m2)
-        )
-      }
-    }
-    second-phase {
-      expression {
-        3000 * m2 * m4
-      }
-    }
-  }
-
-  rank-profile macros-refering-macros-inherited2 inherits macros-refering-macros {
-    second-phase {
-      expression {
-        3002 * m2
-      }
-    }
-  }
-
-  rank-profile macros-refering-macros-inherited-two-levels inherits macros-refering-macros-inherited {
-    function m5() {
-      expression {
-        if(isNan(attribute(glmpfw))==1,
-          m1,
-          (m4)
-        )
-      }          
-    }
-  }
-
-  rank-profile withmf {
-      function myplus() {
-        expression: attribute(foo1)+attribute(foo2)
-      }
-      function mymul() {
-        expression: attribute(t1)*query(fromq)
-      }
-      first-phase {
-        expression: attribute(foo1)
-      }
-      second-phase {
-        expression: attribute(foo2)
-      }
-      match-features: attribute(foo1).out attribute(bar1)
-      match-features { attribute(foo2).out attribute(bar2).out }
-      match-features {
-        attribute(foo3).out attribute(bar3).out
-      }
-      match-features {
-        attribute(foo4)
-        myplus
-        mymul
-        firstPhase
-        secondPhase
-      }
-  }
-
-  rank-profile withboolean {
-      function mytrue() {
-        expression: true
-      }
-      function myfalse() {
-        expression: false
-      }
-      function mybooleanexpression() {
-        expression: true + if(false, 3.0, 4.0)
-      }
-  }
-
-}
diff --git a/config-model/src/test/derived/rankingexpression/summary.cfg b/config-model/src/test/derived/rankingexpression/summary.cfg
deleted file mode 100644
index aec076aa8fe..00000000000
--- a/config-model/src/test/derived/rankingexpression/summary.cfg
+++ /dev/null
@@ -1,46 +0,0 @@
-defaultsummaryid 1753207254
-usev8geopositions false
-classes[].id 1753207254
-classes[].name "default"
-classes[].omitsummaryfeatures false
-classes[].fields[].name "artist"
-classes[].fields[].type "longstring"
-classes[].fields[].name "title"
-classes[].fields[].type "longstring"
-classes[].fields[].name "surl"
-classes[].fields[].type "longstring"
-classes[].fields[].name "year"
-classes[].fields[].type "integer"
-classes[].fields[].name "rankfeatures"
-classes[].fields[].type "featuredata"
-classes[].fields[].name "summaryfeatures"
-classes[].fields[].type "featuredata"
-classes[].fields[].name "documentid"
-classes[].fields[].type "longstring"
-classes[].id 203924099
-classes[].name "attributeprefetch"
-classes[].omitsummaryfeatures false
-classes[].fields[].name "year"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo1"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo2"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo3"
-classes[].fields[].type "integer"
-classes[].fields[].name "foo4"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar1"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar2"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar3"
-classes[].fields[].type "integer"
-classes[].fields[].name "bar4"
-classes[].fields[].type "integer"
-classes[].fields[].name "t1"
-classes[].fields[].type "tensor"
-classes[].fields[].name "rankfeatures"
-classes[].fields[].type "featuredata"
-classes[].fields[].name "summaryfeatures"
-classes[].fields[].type "featuredata"
diff --git a/config-model/src/test/derived/rankingexpression/summarymap.cfg b/config-model/src/test/derived/rankingexpression/summarymap.cfg
deleted file mode 100644
index bd92b36548c..00000000000
--- a/config-model/src/test/derived/rankingexpression/summarymap.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-defaultoutputclass -1
-override[].field "year"
-override[].command "attribute"
-override[].arguments "year"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "foo1"
-override[].command "attribute"
-override[].arguments "foo1"
-override[].field "foo2"
-override[].command "attribute"
-override[].arguments "foo2"
-override[].field "foo3"
-override[].command "attribute"
-override[].arguments "foo3"
-override[].field "foo4"
-override[].command "attribute"
-override[].arguments "foo4"
-override[].field "bar1"
-override[].command "attribute"
-override[].arguments "bar1"
-override[].field "bar2"
-override[].command "attribute"
-override[].arguments "bar2"
-override[].field "bar3"
-override[].command "attribute"
-override[].arguments "bar3"
-override[].field "bar4"
-override[].command "attribute"
-override[].arguments "bar4"
-override[].field "t1"
-override[].command "attribute"
-override[].arguments "t1"
-- 
cgit v1.2.3