Max tree size 64k -> 1m

2 files changed, 7 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
index 8c3857ca539..488c58e3119 100644
--- a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
+++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp
@@ -91,10 +91,10 @@ Blueprint::State::State()
     : _fields(),
       _estimateHits(0),
       _tree_size(1),
-      _cost_tier(COST_TIER_NORMAL),
       _estimateEmpty(true),
       _allow_termwise_eval(true),
-      _want_global_filter(false)
+      _want_global_filter(false),
+      _cost_tier(COST_TIER_NORMAL)
 {}
 
 Blueprint::State::State(FieldSpecBase field)
@@ -107,10 +107,10 @@ Blueprint::State::State(FieldSpecBaseList fields_in)
     : _fields(std::move(fields_in)),
       _estimateHits(0),
       _tree_size(1),
-      _cost_tier(COST_TIER_NORMAL),
       _estimateEmpty(true),
       _allow_termwise_eval(true),
-      _want_global_filter(false)
+      _want_global_filter(false),
+      _cost_tier(COST_TIER_NORMAL)
 {
 }
 
diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.h b/searchlib/src/vespa/searchlib/queryeval/blueprint.h
index 870309dab7d..1ea02e41a62 100644
--- a/searchlib/src/vespa/searchlib/queryeval/blueprint.h
+++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.h
@@ -66,11 +66,11 @@ public:
     private:
         FieldSpecBaseList _fields;
         uint32_t          _estimateHits;
-        uint16_t          _tree_size;
-        uint8_t           _cost_tier;
+        uint32_t          _tree_size : 20;
         bool              _estimateEmpty : 1;
         bool              _allow_termwise_eval : 1;
         bool              _want_global_filter : 1;
+        uint8_t           _cost_tier;
 
     public:
         static constexpr uint8_t COST_TIER_NORMAL = 1;
@@ -111,7 +111,7 @@ public:
             return (total_docs == 0) ? 0.0 : double(total_hits) / double(total_docs);
         }
         void tree_size(uint32_t value) {
-            assert(value < 0x10000);
+            assert(value < 0x100000);
             _tree_size = value;
         }
         uint32_t tree_size() const { return _tree_size; }