Allow query time control of spli/delay query optimisations.

1 files changed, 2 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
index a2af40aae96..a086a719d95 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_tools.cpp
@@ -187,8 +187,8 @@ MatchToolsFactory(QueryLimiter               & queryLimiter,
     _query.setWhiteListBlueprint(metaStore.createWhiteListBlueprint());
     trace.addEvent(5, "Deserialize and build query tree");
     _valid = _query.buildTree(queryStack, location, viewResolver, indexEnv,
-                              rankSetup.split_unpacking_iterators(),
-                              rankSetup.delay_unpacking_iterators());
+                              SplitUnpackingIterators::check(_queryEnv.getProperties(), rankSetup.split_unpacking_iterators()),
+                              DelayUnpackingIterators::check(_queryEnv.getProperties(), rankSetup.delay_unpacking_iterators()));
     if (_valid) {
         _query.extractTerms(_queryEnv.terms());
         _query.extractLocations(_queryEnv.locations());