diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-05-12 12:26:36 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-05-12 12:26:36 +0000 |
| commit | 579ce1c7cee8880426b76fc24ad14e02282d880b (patch) | |
| tree | 22c4091e5fe1d65a52b7ecf40fef470454c3359a | |
| parent | 9f6559f0104c6abb45852b82c0386e5702100c63 (diff) | |
Pack the State a bit closer together
| -rw-r--r-- | searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/queryeval/blueprint.cpp | 4 | ||||
| -rw-r--r-- | searchlib/src/vespa/searchlib/queryeval/blueprint.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp index fb98d1b2227..cd61c4c9669 100644 --- a/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp +++ b/searchlib/src/tests/queryeval/blueprint/blueprint_test.cpp @@ -767,9 +767,9 @@ TEST("requireThatDocIdLimitInjectionWorks") } TEST("Control object sizes") { - EXPECT_EQUAL(48u, sizeof(Blueprint::State)); + EXPECT_EQUAL(40u, sizeof(Blueprint::State)); EXPECT_EQUAL(32u, sizeof(Blueprint)); - EXPECT_EQUAL(80u, sizeof(LeafBlueprint)); + EXPECT_EQUAL(72u, sizeof(LeafBlueprint)); } TEST_MAIN() { diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp index b0cb38f5a32..60e24431351 100644 --- a/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.cpp @@ -90,8 +90,8 @@ Blueprint::sat_sum(const std::vector<HitEstimate> &data, uint32_t docid_limit) Blueprint::State::State() : _fields(), _estimate(), - _cost_tier(COST_TIER_NORMAL), _tree_size(1), + _cost_tier(COST_TIER_NORMAL), _allow_termwise_eval(true), _want_global_filter(false) {} @@ -105,8 +105,8 @@ Blueprint::State::State(FieldSpecBase field) Blueprint::State::State(FieldSpecBaseList fields_in) : _fields(std::move(fields_in)), _estimate(), - _cost_tier(COST_TIER_NORMAL), _tree_size(1), + _cost_tier(COST_TIER_NORMAL), _allow_termwise_eval(true), _want_global_filter(false) { diff --git a/searchlib/src/vespa/searchlib/queryeval/blueprint.h b/searchlib/src/vespa/searchlib/queryeval/blueprint.h index 3e0b56206bb..b607a5d421f 100644 --- a/searchlib/src/vespa/searchlib/queryeval/blueprint.h +++ b/searchlib/src/vespa/searchlib/queryeval/blueprint.h @@ -66,15 +66,15 @@ public: private: FieldSpecBaseList _fields; HitEstimate _estimate; - uint32_t _cost_tier; uint32_t _tree_size; + uint8_t _cost_tier; bool _allow_termwise_eval; bool _want_global_filter; public: - static constexpr uint32_t COST_TIER_NORMAL = 1; - static constexpr uint32_t COST_TIER_EXPENSIVE = 2; - static constexpr uint32_t COST_TIER_MAX = 999; + static constexpr uint8_t COST_TIER_NORMAL = 1; + static constexpr uint8_t COST_TIER_EXPENSIVE = 2; + static constexpr uint8_t COST_TIER_MAX = 255; State(); State(FieldSpecBase field); |