Rename wordstore* -> word_store*.

10 files changed, 13 insertions, 15 deletions

diff --git a/searchlib/src/tests/memoryindex/datastore/.gitignore b/searchlib/src/tests/memoryindex/datastore/.gitignore
index 4b4a9e38d84..a5842a0fd69 100644
--- a/searchlib/src/tests/memoryindex/datastore/.gitignore
+++ b/searchlib/src/tests/memoryindex/datastore/.gitignore
@@ -1,6 +1,4 @@
 .depend
 Makefile
-feature_store_test
-wordstore_test
 searchlib_feature_store_test_app
-searchlib_wordstore_test_app
+searchlib_word_store_test_app
diff --git a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
index fe613e425be..45507f3b0ae 100644
--- a/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
+++ b/searchlib/src/tests/memoryindex/datastore/CMakeLists.txt
@@ -6,10 +6,10 @@ vespa_add_executable(searchlib_feature_store_test_app TEST
     searchlib
 )
 vespa_add_test(NAME searchlib_feature_store_test_app COMMAND searchlib_feature_store_test_app)
-vespa_add_executable(searchlib_wordstore_test_app TEST
+vespa_add_executable(searchlib_word_store_test_app TEST
     SOURCES
-    wordstore_test.cpp
+    word_store_test.cpp
     DEPENDS
     searchlib
 )
-vespa_add_test(NAME searchlib_wordstore_test_app COMMAND searchlib_wordstore_test_app)
+vespa_add_test(NAME searchlib_word_store_test_app COMMAND searchlib_word_store_test_app)
diff --git a/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp b/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp
index c1baff72514..b7f454bfdf7 100644
--- a/searchlib/src/tests/memoryindex/datastore/wordstore_test.cpp
+++ b/searchlib/src/tests/memoryindex/datastore/word_store_test.cpp
@@ -1,8 +1,8 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/log/log.h>
-LOG_SETUP("wordstore_test");
+LOG_SETUP("word_store_test");
 #include <vespa/vespalib/testkit/testapp.h>
-#include <vespa/searchlib/memoryindex/wordstore.h>
+#include <vespa/searchlib/memoryindex/word_store.h>
 
 using namespace search::datastore;
 
@@ -75,7 +75,7 @@ Test::requireThatAddWordTriggersChangeOfBuffer()
 int
 Test::Main()
 {
-    TEST_INIT("wordstore_test");
+    TEST_INIT("word_store_test");
 
     requireThatWordsCanBeAddedAndRetrieved();
     requireThatAddWordTriggersChangeOfBuffer();
diff --git a/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp b/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp
index 17bee6f1236..fed6d963b70 100644
--- a/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index_remover/field_index_remover_test.cpp
@@ -4,7 +4,7 @@
 
 #include <vespa/searchlib/memoryindex/field_index_remover.h>
 #include <vespa/searchlib/memoryindex/i_field_index_remove_listener.h>
-#include <vespa/searchlib/memoryindex/wordstore.h>
+#include <vespa/searchlib/memoryindex/word_store.h>
 #include <vespa/vespalib/test/insertion_operators.h>
 #include <algorithm>
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt
index a5a1006b5e2..64faee3f3db 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt
@@ -12,6 +12,6 @@ vespa_add_library(searchlib_memoryindex OBJECT
     ordered_field_index_inserter.cpp
     posting_iterator.cpp
     url_field_inverter.cpp
-    wordstore.cpp
+    word_store.cpp
     DEPENDS
 )
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.h b/searchlib/src/vespa/searchlib/memoryindex/field_index.h
index 999b1bcd3b7..3b0675b5fdf 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/field_index.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.h
@@ -4,7 +4,7 @@
 
 #include "feature_store.h"
 #include "field_index_remover.h"
-#include "wordstore.h"
+#include "word_store.h"
 #include <vespa/searchlib/btree/btree.h>
 #include <vespa/searchlib/btree/btreenodeallocator.h>
 #include <vespa/searchlib/btree/btreeroot.h>
diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp
index 0606192f3ac..1b9b7f8f752 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_remover.cpp
@@ -2,7 +2,7 @@
 
 #include "field_index_remover.h"
 #include "i_field_index_remove_listener.h"
-#include "wordstore.h"
+#include "word_store.h"
 #include <vespa/searchlib/common/sort.h>
 
 namespace search::memoryindex {
diff --git a/searchlib/src/vespa/searchlib/memoryindex/wordstore.cpp b/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp
index b65fe192e58..ffdc26f5eb0 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/wordstore.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp
@@ -1,6 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include "wordstore.h"
+#include "word_store.h"
 #include <vespa/searchlib/datastore/datastore.hpp>
 
 namespace search::memoryindex {
diff --git a/searchlib/src/vespa/searchlib/memoryindex/wordstore.h b/searchlib/src/vespa/searchlib/memoryindex/word_store.h
index 4c1526df527..4c1526df527 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/wordstore.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/word_store.h
diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.h b/searchlib/src/vespa/searchlib/predicate/document_features_store.h
index 2cf3e15337a..4c55b67cb11 100644
--- a/searchlib/src/vespa/searchlib/predicate/document_features_store.h
+++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.h
@@ -4,7 +4,7 @@
 
 #include "predicate_tree_annotator.h"
 #include <vespa/searchlib/btree/btree.h>
-#include <vespa/searchlib/memoryindex/wordstore.h>
+#include <vespa/searchlib/memoryindex/word_store.h>
 #include <vespa/vespalib/data/databuffer.h>
 #include <vespa/vespalib/stllike/hash_map.h>
 #include <unordered_set>