- Use faster std::to_chars.

- Reorganize stackdumpitertor so members accesses frequently are colocated.
- Add test to keep iteratorsize under control.

2 files changed, 5 insertions, 2 deletions

diff --git a/searchlib/src/tests/query/querybuilder_test.cpp b/searchlib/src/tests/query/querybuilder_test.cpp
index 30b4d2ae264..f1207da727d 100644
--- a/searchlib/src/tests/query/querybuilder_test.cpp
+++ b/searchlib/src/tests/query/querybuilder_test.cpp
@@ -592,6 +592,10 @@ TEST("require that empty intermediate node can be added") {
     EXPECT_EQUAL(0u, and_node->getChildren().size());
 }
 
+TEST("control size of SimpleQueryStackDumpIterator") {
+    EXPECT_EQUAL(160u, sizeof(SimpleQueryStackDumpIterator));
+}
+
 TEST("test query parsing error") {
     const char * STACK =
          "\001\002\001\003\000\005\002\004\001\034F\001\002\004term\004\004term\002dx\004\004term\002ifD\002\004term\001xD\003\004term\002dxE\004\004term\001\060F\005\002\004term"
diff --git a/searchlib/src/tests/query/stackdumpquerycreator_test.cpp b/searchlib/src/tests/query/stackdumpquerycreator_test.cpp
index cb3989387b7..c5ef71621d1 100644
--- a/searchlib/src/tests/query/stackdumpquerycreator_test.cpp
+++ b/searchlib/src/tests/query/stackdumpquerycreator_test.cpp
@@ -48,8 +48,7 @@ TEST("requireThatTooLargeNumTermIsTreatedAsFloat") {
     appendNumTerm(buf, term_string);
 
     SimpleQueryStackDumpIterator query_stack(vespalib::stringref(buf.GetDrainPos(), buf.GetUsedLen()));
-    Node::UP node =
-        StackDumpQueryCreator<SimpleQueryNodeTypes>::create(query_stack);
+    Node::UP node = StackDumpQueryCreator<SimpleQueryNodeTypes>::create(query_stack);
     ASSERT_TRUE(node.get());
     NumberTerm *term = dynamic_cast<NumberTerm *>(node.get());
     ASSERT_TRUE(term);