Rename urlfieldinverter* -> url_field_inverter*.

10 files changed, 16 insertions, 16 deletions

diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 5d780a9e99d..92ddcf75aa7 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -180,7 +180,7 @@ vespa_define_module(
     src/tests/memoryindex/field_index_remover
     src/tests/memoryindex/field_inverter
     src/tests/memoryindex/memory_index
-    src/tests/memoryindex/urlfieldinverter
+    src/tests/memoryindex/url_field_inverter
     src/tests/nativerank
     src/tests/nearsearch
     src/tests/postinglistbm
diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/.gitignore b/searchlib/src/tests/memoryindex/url_field_inverter/.gitignore
new file mode 100644
index 00000000000..694dc947042
--- /dev/null
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/.gitignore
@@ -0,0 +1 @@
+searchlib_url_field_inverter_test_app
diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
new file mode 100644
index 00000000000..28efc8a861e
--- /dev/null
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/CMakeLists.txt
@@ -0,0 +1,9 @@
+# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_executable(searchlib_url_field_inverter_test_app TEST
+    SOURCES
+    url_field_inverter_test.cpp
+    DEPENDS
+    searchlib_test
+    searchlib
+)
+vespa_add_test(NAME searchlib_url_field_inverter_test_app COMMAND searchlib_url_field_inverter_test_app)
diff --git a/searchlib/src/tests/memoryindex/urlfieldinverter/urlfieldinverter_test.cpp b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
index 5ebc4ba56cb..76fbf662b77 100644
--- a/searchlib/src/tests/memoryindex/urlfieldinverter/urlfieldinverter_test.cpp
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
@@ -4,7 +4,7 @@
 #include <vespa/document/repo/fixedtyperepo.h>
 #include <vespa/searchlib/index/docbuilder.h>
 #include <vespa/searchlib/memoryindex/field_inverter.h>
-#include <vespa/searchlib/memoryindex/urlfieldinverter.h>
+#include <vespa/searchlib/memoryindex/url_field_inverter.h>
 #include <vespa/searchlib/test/memoryindex/ordered_field_index_inserter.h>
 #include <vespa/vespalib/testkit/testapp.h>
 
diff --git a/searchlib/src/tests/memoryindex/urlfieldinverter/.gitignore b/searchlib/src/tests/memoryindex/urlfieldinverter/.gitignore
deleted file mode 100644
index b2636fe5e81..00000000000
--- a/searchlib/src/tests/memoryindex/urlfieldinverter/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-searchlib_urlfieldinverter_test_app
diff --git a/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt b/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt
deleted file mode 100644
index 16fa8f5952e..00000000000
--- a/searchlib/src/tests/memoryindex/urlfieldinverter/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_executable(searchlib_urlfieldinverter_test_app TEST
-    SOURCES
-    urlfieldinverter_test.cpp
-    DEPENDS
-    searchlib_test
-    searchlib
-)
-vespa_add_test(NAME searchlib_urlfieldinverter_test_app COMMAND searchlib_urlfieldinverter_test_app)
diff --git a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt
index 707948f5eb6..a5a1006b5e2 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/memoryindex/CMakeLists.txt
@@ -11,7 +11,7 @@ vespa_add_library(searchlib_memoryindex OBJECT
     memory_index.cpp
     ordered_field_index_inserter.cpp
     posting_iterator.cpp
-    urlfieldinverter.cpp
+    url_field_inverter.cpp
     wordstore.cpp
     DEPENDS
 )
diff --git a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
index 11248493491..a468428e21f 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/document_inverter.cpp
@@ -4,7 +4,7 @@
 #include "field_index_collection.h"
 #include "field_inverter.h"
 #include "ordered_field_index_inserter.h"
-#include "urlfieldinverter.h"
+#include "url_field_inverter.h"
 #include <vespa/document/annotation/alternatespanlist.h>
 #include <vespa/document/datatype/urldatatype.h>
 #include <vespa/document/repo/fixedtyperepo.h>
diff --git a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp b/searchlib/src/vespa/searchlib/memoryindex/url_field_inverter.cpp
index 7238bf18116..c185ec93c9d 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.cpp
+++ b/searchlib/src/vespa/searchlib/memoryindex/url_field_inverter.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "field_inverter.h"
-#include "urlfieldinverter.h"
+#include "url_field_inverter.h"
 #include <vespa/document/datatype/urldatatype.h>
 #include <vespa/document/fieldvalue/arrayfieldvalue.h>
 #include <vespa/document/fieldvalue/stringfieldvalue.h>
@@ -14,7 +14,7 @@
 #include <stdexcept>
 
 #include <vespa/log/log.h>
-LOG_SETUP(".memoryindex.urlfieldinverter");
+LOG_SETUP(".memoryindex.url_field_inverter");
 
 namespace search::memoryindex {
 
diff --git a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.h b/searchlib/src/vespa/searchlib/memoryindex/url_field_inverter.h
index 1659e460af3..1659e460af3 100644
--- a/searchlib/src/vespa/searchlib/memoryindex/urlfieldinverter.h
+++ b/searchlib/src/vespa/searchlib/memoryindex/url_field_inverter.h