diff options
202 files changed, 398 insertions, 387 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp index 7b7d25d2d52..992a9c56dfb 100644 --- a/searchcore/src/tests/proton/attribute/attribute_test.cpp +++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp @@ -45,7 +45,7 @@ #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchcommon/attribute/iattributevector.h> -#include <vespa/searchlib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> #include <vespa/log/log.h> LOG_SETUP("attribute_test"); diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp index 870226876dd..d37072f5da2 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastore.cpp @@ -5,17 +5,17 @@ #include "documentmetastoresaver.h" #include <vespa/searchlib/attribute/attributevector.hpp> #include <vespa/searchlib/attribute/readerbase.h> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> #include <vespa/searchlib/common/i_gid_to_lid_mapper.h> #include <vespa/searchcore/proton/bucketdb/bucketsessionbase.h> #include <vespa/searchcore/proton/bucketdb/joinbucketssession.h> #include <vespa/searchcore/proton/bucketdb/splitbucketsession.h> -#include <vespa/searchlib/util/bufferwriter.h> #include <vespa/searchlib/query/queryterm.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/util/rcuvector.hpp> #include <vespa/fastos/file.h> diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp index 7d85c01ee74..2a3fd14c6d2 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.cpp +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoresaver.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 "documentmetastoresaver.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> #include "document_meta_store_versions.h" #include <vespa/searchlib/attribute/iattributesavetarget.h> diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h index eb1305baf38..37666879205 100644 --- a/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h +++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/i_document_meta_store.h @@ -5,10 +5,10 @@ #include "lid_gid_key_comparator.h" #include "i_simple_document_meta_store.h" #include <vespa/searchlib/attribute/attributeguard.h> -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> #include <vespa/searchlib/common/idocumentmetastore.h> #include <vespa/searchlib/common/serialnum.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> namespace proton { diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index bde467087da..bae47872d6c 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -23,10 +23,8 @@ vespa_define_module( src/vespa/searchlib/aggregation src/vespa/searchlib/attribute src/vespa/searchlib/bitcompression - src/vespa/searchlib/btree src/vespa/searchlib/common src/vespa/searchlib/config - src/vespa/searchlib/datastore src/vespa/searchlib/diskindex src/vespa/searchlib/docstore src/vespa/searchlib/engine @@ -97,7 +95,6 @@ vespa_define_module( src/tests/attribute/tensorattribute src/tests/bitcompression/expgolomb src/tests/bitvector - src/tests/btree src/tests/bytecomplens src/tests/common/bitvector src/tests/common/foregroundtaskexecutor @@ -106,11 +103,6 @@ vespa_define_module( src/tests/common/resultset src/tests/common/sequencedtaskexecutor src/tests/common/summaryfeatures - src/tests/datastore/array_store - src/tests/datastore/array_store_config - src/tests/datastore/buffer_type - src/tests/datastore/datastore - src/tests/datastore/unique_store src/tests/diskindex/bitvector src/tests/diskindex/diskindex src/tests/diskindex/fieldwriter diff --git a/searchlib/src/apps/tests/btreestress_test.cpp b/searchlib/src/apps/tests/btreestress_test.cpp index ca92ad4865b..e6ef0740fc3 100644 --- a/searchlib/src/apps/tests/btreestress_test.cpp +++ b/searchlib/src/apps/tests/btreestress_test.cpp @@ -1,22 +1,22 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/searchlib/btree/btreeroot.h> -#include <vespa/searchlib/btree/btreebuilder.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreestore.h> +#include <vespa/vespalib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreebuilder.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreestore.h> #include <vespa/searchlib/util/rand48.h> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreeaggregator.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeaggregator.hpp> #include <vespa/vespalib/util/threadstackexecutor.h> #include <vespa/vespalib/util/lambdatask.h> diff --git a/searchlib/src/tests/attribute/comparator/comparator_test.cpp b/searchlib/src/tests/attribute/comparator/comparator_test.cpp index 9493d3d5ca9..6f16cbbe391 100644 --- a/searchlib/src/tests/attribute/comparator/comparator_test.cpp +++ b/searchlib/src/tests/attribute/comparator/comparator_test.cpp @@ -3,12 +3,12 @@ LOG_SETUP("comparator_test"); #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/attribute/enumcomparator.h> -#include <vespa/searchlib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreeroot.h> #include <vespa/searchlib/attribute/enumstore.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> namespace search { diff --git a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp index 9ede6e63c2e..d4dc3adfcea 100644 --- a/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp +++ b/searchlib/src/tests/attribute/enumeratedsave/enumeratedsave_test.cpp @@ -14,10 +14,10 @@ #include <vespa/searchlib/attribute/attrvector.h> #include <vespa/searchlib/attribute/attributefilesavetarget.h> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/vespalib/util/compress.h> #include <vespa/searchlib/index/dummyfileheadercontext.h> #include <vespa/searchlib/util/randomgenerator.h> -#include <vespa/searchlib/util/bufferwriter.h> #include <vespa/searchlib/attribute/attributememoryfilebufferwriter.h> #include <vespa/searchlib/fef/termfieldmatchdata.h> #include <vespa/searchlib/parsequery/parse.h> diff --git a/searchlib/src/tests/attribute/postinglist/postinglist.cpp b/searchlib/src/tests/attribute/postinglist/postinglist.cpp index fe79db163f8..78b93e2b78b 100644 --- a/searchlib/src/tests/attribute/postinglist/postinglist.cpp +++ b/searchlib/src/tests/attribute/postinglist/postinglist.cpp @@ -1,15 +1,16 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchlib/datastore/datastore.h> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/datastore/datastore.h> #include <vespa/searchlib/util/rand48.h> #include <vespa/vespalib/testkit/testapp.h> #include <set> +#include <map> #include <vespa/log/log.h> LOG_SETUP("postinglist_test"); diff --git a/searchlib/src/tests/btree/.gitignore b/searchlib/src/tests/btree/.gitignore deleted file mode 100644 index 0cc4519cf9c..00000000000 --- a/searchlib/src/tests/btree/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -iteratespeed -searchlib_btree_test_app -searchlib_btreeaggregation_test_app -searchlib_frozenbtree_test_app -searchlib_iteratespeed_app diff --git a/searchlib/src/tests/btree/CMakeLists.txt b/searchlib/src/tests/btree/CMakeLists.txt deleted file mode 100644 index 9817f2b9079..00000000000 --- a/searchlib/src/tests/btree/CMakeLists.txt +++ /dev/null @@ -1,29 +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_btree_test_app TEST - SOURCES - btree_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_btree_test_app COMMAND searchlib_btree_test_app) -vespa_add_executable(searchlib_frozenbtree_test_app TEST - SOURCES - frozenbtree_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_frozenbtree_test_app COMMAND searchlib_frozenbtree_test_app) -vespa_add_executable(searchlib_btreeaggregation_test_app TEST - SOURCES - btreeaggregation_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_btreeaggregation_test_app COMMAND searchlib_btreeaggregation_test_app) -vespa_add_executable(searchlib_iteratespeed_app - SOURCES - iteratespeed.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_iteratespeed_app COMMAND searchlib_iteratespeed_app BENCHMARK) diff --git a/searchlib/src/tests/datastore/array_store_config/CMakeLists.txt b/searchlib/src/tests/datastore/array_store_config/CMakeLists.txt deleted file mode 100644 index 7ae62767586..00000000000 --- a/searchlib/src/tests/datastore/array_store_config/CMakeLists.txt +++ /dev/null @@ -1,8 +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_array_store_config_test_app TEST - SOURCES - array_store_config_test.cpp - DEPENDS - searchlib -) -vespa_add_test(NAME searchlib_array_store_config_test_app COMMAND searchlib_array_store_config_test_app) diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp index c46869392f7..e8e780b4376 100644 --- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp +++ b/searchlib/src/tests/diskindex/fusion/fusion_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/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> #include <vespa/searchlib/common/sequencedtaskexecutor.h> #include <vespa/searchlib/diskindex/diskindex.h> #include <vespa/searchlib/diskindex/fusion.h> diff --git a/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp b/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp index a78e4dead86..bda29115db6 100644 --- a/searchlib/src/tests/memoryindex/compact_words_store/compact_words_store_test.cpp +++ b/searchlib/src/tests/memoryindex/compact_words_store/compact_words_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/vespalib/testkit/testapp.h> -#include <vespa/searchlib/datastore/entryref.h> #include <vespa/searchlib/memoryindex/compact_words_store.h> +#include <vespa/vespalib/datastore/entryref.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <iostream> diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp index 2b9b77d32a3..4075a06f882 100644 --- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp +++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.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 <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> #include <vespa/searchlib/common/sequencedtaskexecutor.h> #include <vespa/searchlib/diskindex/fusion.h> #include <vespa/searchlib/diskindex/indexbuilder.h> diff --git a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp index 368804b93d8..7c77dc1883c 100644 --- a/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_bounds_posting_list_test.cpp @@ -4,8 +4,8 @@ #include <vespa/searchlib/predicate/predicate_index.h> #include <vespa/searchlib/predicate/predicate_tree_annotator.h> #include <vespa/searchlib/predicate/predicate_bounds_posting_list.h> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/predicate/predicate_index_test.cpp b/searchlib/src/tests/predicate/predicate_index_test.cpp index 78827c96d2f..12bc192079a 100644 --- a/searchlib/src/tests/predicate/predicate_index_test.cpp +++ b/searchlib/src/tests/predicate/predicate_index_test.cpp @@ -7,8 +7,8 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/attribute/predicate_attribute.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> #include <vespa/log/log.h> LOG_SETUP("predicate_index_test"); diff --git a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp index 5b3f213b698..d91d50bdc8f 100644 --- a/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_interval_posting_list_test.cpp @@ -4,8 +4,8 @@ #include <vespa/searchlib/predicate/predicate_index.h> #include <vespa/searchlib/predicate/predicate_tree_annotator.h> #include <vespa/searchlib/predicate/predicate_interval_posting_list.h> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp index e20895b559f..2e5001a1adb 100644 --- a/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp +++ b/searchlib/src/tests/predicate/predicate_zstar_compressed_posting_list_test.cpp @@ -3,8 +3,8 @@ #include <vespa/searchlib/predicate/predicate_zstar_compressed_posting_list.h> #include <vespa/searchlib/predicate/predicate_index.h> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/predicate/simple_index_test.cpp b/searchlib/src/tests/predicate/simple_index_test.cpp index c9cce14784f..84495dbdbe2 100644 --- a/searchlib/src/tests/predicate/simple_index_test.cpp +++ b/searchlib/src/tests/predicate/simple_index_test.cpp @@ -4,11 +4,11 @@ #include <vespa/searchlib/predicate/simple_index.hpp> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/searchlib/attribute/predicate_attribute.h> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> #include <map> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/util/bufferwriter/bufferwriter_test.cpp b/searchlib/src/tests/util/bufferwriter/bufferwriter_test.cpp index 1830d25fc72..bafb4105996 100644 --- a/searchlib/src/tests/util/bufferwriter/bufferwriter_test.cpp +++ b/searchlib/src/tests/util/bufferwriter/bufferwriter_test.cpp @@ -2,7 +2,7 @@ #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/stllike/string.h> -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/searchlib/util/drainingbufferwriter.h> #include <vespa/searchlib/util/rand48.h> diff --git a/searchlib/src/tests/util/bufferwriter/work.cpp b/searchlib/src/tests/util/bufferwriter/work.cpp index b496bbc8888..bd5bf4a9d81 100644 --- a/searchlib/src/tests/util/bufferwriter/work.cpp +++ b/searchlib/src/tests/util/bufferwriter/work.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 "work.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt index 2ec3cabaf4a..e4e1f92898f 100644 --- a/searchlib/src/vespa/searchlib/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/CMakeLists.txt @@ -4,9 +4,7 @@ vespa_add_library(searchlib $<TARGET_OBJECTS:searchlib_aggregation> $<TARGET_OBJECTS:searchlib_attribute> $<TARGET_OBJECTS:searchlib_bitcompression> - $<TARGET_OBJECTS:searchlib_btree> $<TARGET_OBJECTS:searchlib_common> - $<TARGET_OBJECTS:searchlib_datastore> $<TARGET_OBJECTS:searchlib_diskindex> $<TARGET_OBJECTS:searchlib_docstore> $<TARGET_OBJECTS:searchlib_engine> diff --git a/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h b/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h index a6052f5f6b6..c4a26ff79c5 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h +++ b/searchlib/src/vespa/searchlib/attribute/attributefilebufferwriter.h @@ -3,7 +3,7 @@ #pragma once #include "iattributefilewriter.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp b/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp index 131d580c671..c51267c9f80 100644 --- a/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp +++ b/searchlib/src/vespa/searchlib/attribute/attributeiterators.hpp @@ -3,8 +3,8 @@ #pragma once #include "attributeiterators.h" -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> #include <vespa/searchlib/fef/termfieldmatchdataposition.h> #include <vespa/searchlib/query/queryterm.h> #include <vespa/searchlib/common/bitvector.h> diff --git a/searchlib/src/vespa/searchlib/attribute/dociditerator.h b/searchlib/src/vespa/searchlib/attribute/dociditerator.h index 1eb1829f3fd..0e336dc634f 100644 --- a/searchlib/src/vespa/searchlib/attribute/dociditerator.h +++ b/searchlib/src/vespa/searchlib/attribute/dociditerator.h @@ -3,7 +3,7 @@ #pragma once #include "postingdata.h" -#include <vespa/searchlib/btree/minmaxaggregated.h> +#include <vespa/vespalib/btree/minmaxaggregated.h> #include <algorithm> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/enumattributesaver.cpp b/searchlib/src/vespa/searchlib/attribute/enumattributesaver.cpp index 69ec066176a..7f0422ce78d 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumattributesaver.cpp +++ b/searchlib/src/vespa/searchlib/attribute/enumattributesaver.cpp @@ -2,7 +2,7 @@ #include "enumattributesaver.h" #include "iattributesavetarget.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.h b/searchlib/src/vespa/searchlib/attribute/enumstore.h index fd075504916..2af1fdc1b9d 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstore.h +++ b/searchlib/src/vespa/searchlib/attribute/enumstore.h @@ -4,15 +4,15 @@ #include "enumstorebase.h" #include <vespa/searchlib/util/foldedstringcompare.h> +#include <vespa/vespalib/btree/btreenode.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreebuilder.h> +#include <vespa/vespalib/datastore/entryref.h> #include <vespa/vespalib/util/buffer.h> #include <vespa/vespalib/util/array.h> #include <vespa/vespalib/util/stringfmt.h> #include <cmath> -#include <vespa/searchlib/datastore/entryref.h> -#include <vespa/searchlib/btree/btreenode.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreebuilder.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp index 2cddd5b0286..c1b35b5a5fe 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstore.hpp +++ b/searchlib/src/vespa/searchlib/attribute/enumstore.hpp @@ -6,15 +6,15 @@ #include "enumcomparator.h" #include <vespa/vespalib/util/hdr_abort.h> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> #include <vespa/vespalib/util/array.hpp> +#include <vespa/vespalib/util/bufferwriter.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp b/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp index 47f11b88115..94c431368cb 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp +++ b/searchlib/src/vespa/searchlib/attribute/enumstorebase.cpp @@ -2,13 +2,13 @@ #include "enumstorebase.h" #include "enumstore.h" -#include <vespa/searchlib/datastore/datastore.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/util/rcuvector.hpp> #include <vespa/vespalib/stllike/asciistream.h> diff --git a/searchlib/src/vespa/searchlib/attribute/enumstorebase.h b/searchlib/src/vespa/searchlib/attribute/enumstorebase.h index 4b895542e59..48bf4a56874 100644 --- a/searchlib/src/vespa/searchlib/attribute/enumstorebase.h +++ b/searchlib/src/vespa/searchlib/attribute/enumstorebase.h @@ -3,12 +3,12 @@ #pragma once #include <vespa/searchcommon/attribute/iattributevector.h> -#include <vespa/searchlib/datastore/datastore.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/datastore/datastore.h> #include <vespa/vespalib/util/address_space.h> #include <vespa/vespalib/util/array.h> #include <vespa/vespalib/util/memoryusage.h> #include <vespa/vespalib/stllike/hash_map.h> -#include <vespa/searchlib/btree/btree.h> #include <set> #include <atomic> diff --git a/searchlib/src/vespa/searchlib/attribute/loadedvalue.h b/searchlib/src/vespa/searchlib/attribute/loadedvalue.h index 69a6c948d13..38baed6b3ea 100644 --- a/searchlib/src/vespa/searchlib/attribute/loadedvalue.h +++ b/searchlib/src/vespa/searchlib/attribute/loadedvalue.h @@ -4,7 +4,7 @@ #include <vespa/searchcommon/common/undefinedvalues.h> #include <vespa/searchlib/attribute/enumstorebase.h> -#include <vespa/searchlib/datastore/entryref.h> +#include <vespa/vespalib/datastore/entryref.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h index 7bb0253d626..6246a656bf6 100644 --- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h +++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.h @@ -3,7 +3,7 @@ #pragma once #include "multi_value_mapping_base.h" -#include <vespa/searchlib/datastore/array_store.h> +#include <vespa/vespalib/datastore/array_store.h> #include <vespa/vespalib/util/address_space.h> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp index 13f0a42346b..eb4d5fadd2a 100644 --- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping.hpp @@ -3,7 +3,7 @@ #pragma once #include "multi_value_mapping.h" -#include <vespa/searchlib/datastore/array_store.hpp> +#include <vespa/vespalib/datastore/array_store.hpp> #include <vespa/vespalib/util/rcuvector.hpp> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.h b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.h index f1e9b804016..d3ceb948d6a 100644 --- a/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.h +++ b/searchlib/src/vespa/searchlib/attribute/multi_value_mapping_base.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/datastore/entryref.h> +#include <vespa/vespalib/datastore/entryref.h> #include <vespa/vespalib/util/address_space.h> #include <vespa/vespalib/util/rcuvector.h> #include <functional> diff --git a/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.cpp b/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.cpp index fe19bf236aa..51821389a92 100644 --- a/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.cpp +++ b/searchlib/src/vespa/searchlib/attribute/multinumericattributesaver.cpp @@ -3,7 +3,7 @@ #include "multinumericattributesaver.h" #include "multivalueattributesaverutils.h" #include "multivalue.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> using vespalib::GenerationHandler; using search::multivalueattributesaver::CountWriter; diff --git a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp index 6c459465b51..7ce887f9292 100644 --- a/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/multistringattribute.hpp @@ -6,10 +6,10 @@ #include "multistringattribute.h" #include "enumattribute.hpp" #include "multienumattribute.hpp" -#include <vespa/searchlib/util/bufferwriter.h> #include <vespa/fastlib/io/bufferedfile.h> #include <vespa/vespalib/text/utf8.h> #include <vespa/vespalib/text/lowercase.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/searchlib/query/queryterm.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.cpp b/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.cpp index 16acf70eb59..697dbcfd27b 100644 --- a/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.cpp +++ b/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.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 "multivalueattributesaverutils.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> namespace search::multivalueattributesaver { diff --git a/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.h b/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.h index e34f43deb0b..213fd4c4777 100644 --- a/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.h +++ b/searchlib/src/vespa/searchlib/attribute/multivalueattributesaverutils.h @@ -3,7 +3,7 @@ #pragma once #include "iattributesavetarget.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/vespalib/util/arrayref.h> namespace search::multivalueattributesaver { diff --git a/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h b/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h index 8568661dfdd..6d7693da30e 100644 --- a/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h +++ b/searchlib/src/vespa/searchlib/attribute/posting_list_merger.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/btree/btree_key_data.h> +#include <vespa/vespalib/btree/btree_key_data.h> #include <vespa/searchlib/common/bitvector.h> #include <vespa/vespalib/util/arrayref.h> diff --git a/searchlib/src/vespa/searchlib/attribute/postingdata.h b/searchlib/src/vespa/searchlib/attribute/postingdata.h index 001e1015d19..db8522d0ce5 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingdata.h +++ b/searchlib/src/vespa/searchlib/attribute/postingdata.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/btree/btree_key_data.h> +#include <vespa/vespalib/btree/btree_key_data.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h index c180672e798..829afeb9388 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h +++ b/searchlib/src/vespa/searchlib/attribute/postinglistattribute.h @@ -6,8 +6,8 @@ #include <vespa/searchlib/attribute/stringbase.h> #include <vespa/searchlib/attribute/enumattribute.h> #include <vespa/searchlib/queryeval/searchiterator.h> -#include <vespa/searchlib/datastore/entryref.h> -#include <vespa/searchlib/btree/btreestore.h> +#include <vespa/vespalib/datastore/entryref.h> +#include <vespa/vespalib/btree/btreestore.h> #include "dociditerator.h" #include "postinglistsearchcontext.h" #include "postingchange.h" diff --git a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp index b520b53551c..3c3242ce47c 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglistsearchcontext.cpp @@ -4,7 +4,7 @@ #include "postinglistsearchcontext.hpp" #include "attributeiterators.hpp" #include "diversity.hpp" -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/postinglisttraits.cpp b/searchlib/src/vespa/searchlib/attribute/postinglisttraits.cpp index 28a4a51c84c..6af4bec6a88 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglisttraits.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postinglisttraits.cpp @@ -1,11 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "postinglisttraits.h" -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> namespace search { diff --git a/searchlib/src/vespa/searchlib/attribute/postinglisttraits.h b/searchlib/src/vespa/searchlib/attribute/postinglisttraits.h index 3a03a03641f..d07bdd3100d 100644 --- a/searchlib/src/vespa/searchlib/attribute/postinglisttraits.h +++ b/searchlib/src/vespa/searchlib/attribute/postinglisttraits.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/btree/btreestore.h> +#include <vespa/vespalib/btree/btreestore.h> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp index 3f5223118a7..848e4055fdf 100644 --- a/searchlib/src/vespa/searchlib/attribute/postingstore.cpp +++ b/searchlib/src/vespa/searchlib/attribute/postingstore.cpp @@ -1,12 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "postingstore.h" -#include <vespa/searchlib/datastore/datastore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> #include <vespa/searchlib/common/growablebitvector.h> #include <vespa/searchcommon/attribute/config.h> #include <vespa/searchcommon/attribute/status.h> - +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/reference.h b/searchlib/src/vespa/searchlib/attribute/reference.h index 8d482c7c3c9..bc7f3615fa4 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference.h +++ b/searchlib/src/vespa/searchlib/attribute/reference.h @@ -3,7 +3,7 @@ #pragma once #include <vespa/document/base/globalid.h> -#include <vespa/searchlib/datastore/entryref.h> +#include <vespa/vespalib/datastore/entryref.h> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp index 6cb9def9d8d..f91108d066b 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp +++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.cpp @@ -4,11 +4,11 @@ #include "reference_attribute_saver.h" #include "attributesaver.h" #include "readerbase.h" -#include <vespa/searchlib/datastore/unique_store_builder.h> -#include <vespa/searchlib/datastore/datastore.hpp> -#include <vespa/searchlib/datastore/unique_store.hpp> #include <vespa/searchlib/common/i_gid_to_lid_mapper_factory.h> #include <vespa/searchlib/common/i_gid_to_lid_mapper.h> +#include <vespa/vespalib/datastore/unique_store_builder.h> +#include <vespa/vespalib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/unique_store.hpp> #include <vespa/vespalib/data/fileheader.h> #include <vespa/log/log.h> diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute.h b/searchlib/src/vespa/searchlib/attribute/reference_attribute.h index 21fb2c7337b..87d5a5c27bb 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_attribute.h +++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute.h @@ -5,7 +5,7 @@ #include "not_implemented_attribute.h" #include "reference_mappings.h" #include "reference.h" -#include <vespa/searchlib/datastore/unique_store.h> +#include <vespa/vespalib/datastore/unique_store.h> #include <vespa/vespalib/util/rcuvector.h> namespace search { class IGidToLidMapperFactory; } diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp index 19e4f69b4f6..cb8bb6661d6 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.cpp +++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.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 "reference_attribute_saver.h" -#include <vespa/searchlib/util/bufferwriter.h> #include <vespa/vespalib/util/array.hpp> +#include <vespa/vespalib/util/bufferwriter.h> #include "iattributesavetarget.h" diff --git a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h index c86e43d5d95..42a26911669 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h +++ b/searchlib/src/vespa/searchlib/attribute/reference_attribute_saver.h @@ -4,8 +4,8 @@ #include "attributesaver.h" #include <vespa/document/base/globalid.h> -#include <vespa/searchlib/datastore/unique_store.h> -#include <vespa/searchlib/datastore/unique_store_saver.h> +#include <vespa/vespalib/datastore/unique_store.h> +#include <vespa/vespalib/datastore/unique_store_saver.h> #include <vespa/vespalib/util/rcuvector.h> #include "reference_attribute.h" #include "reference.h" diff --git a/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp b/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp index 5bba0196d5c..f0207828d0f 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp +++ b/searchlib/src/vespa/searchlib/attribute/reference_mappings.cpp @@ -2,8 +2,8 @@ #include "reference_mappings.h" #include "reference.h" -#include <vespa/searchlib/datastore/datastore.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> namespace search::attribute { diff --git a/searchlib/src/vespa/searchlib/attribute/reference_mappings.h b/searchlib/src/vespa/searchlib/attribute/reference_mappings.h index f9119c6aa02..8ec997b307e 100644 --- a/searchlib/src/vespa/searchlib/attribute/reference_mappings.h +++ b/searchlib/src/vespa/searchlib/attribute/reference_mappings.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/btree/btreestore.h> +#include <vespa/vespalib/btree/btreestore.h> #include <vespa/vespalib/util/rcuvector.h> #include <atomic> diff --git a/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp b/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp index 3aae6b32dad..dd92421301c 100644 --- a/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.cpp +++ b/searchlib/src/vespa/searchlib/attribute/singleenumattributesaver.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 "singleenumattributesaver.h" -#include <vespa/searchlib/util/bufferwriter.h> #include <vespa/vespalib/util/array.hpp> +#include <vespa/vespalib/util/bufferwriter.h> #include "iattributesavetarget.h" diff --git a/searchlib/src/vespa/searchlib/attribute/singlestringattribute.hpp b/searchlib/src/vespa/searchlib/attribute/singlestringattribute.hpp index 0842d91c174..4925cee023c 100644 --- a/searchlib/src/vespa/searchlib/attribute/singlestringattribute.hpp +++ b/searchlib/src/vespa/searchlib/attribute/singlestringattribute.hpp @@ -6,10 +6,10 @@ #include "stringattribute.h" #include "singleenumattribute.hpp" #include "attributevector.hpp" -#include <vespa/searchlib/util/bufferwriter.h> #include <vespa/fastlib/io/bufferedfile.h> #include <vespa/vespalib/text/utf8.h> #include <vespa/vespalib/text/lowercase.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/searchlib/query/queryterm.h> namespace search { diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp index 7d90ff4bc60..b3135efc2bb 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.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 "compact_words_store.h" -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/log/log.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.h b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.h index 2ec125826b5..07d7c2e1cce 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/compact_words_store.h @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/searchlib/datastore/datastore.h> -#include <vespa/searchlib/datastore/entryref.h> +#include <vespa/vespalib/datastore/datastore.h> +#include <vespa/vespalib/datastore/entryref.h> #include <vespa/vespalib/util/array.h> #include <vespa/vespalib/util/memoryusage.h> #include <vespa/vespalib/stllike/hash_map.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp index 1d55ed76a09..1e9cd84a541 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/feature_store.cpp @@ -2,7 +2,7 @@ #include "feature_store.h" #include <vespa/searchlib/index/schemautil.h> -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h index 3cacacfb03e..6afc3c02301 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/feature_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/feature_store.h @@ -2,10 +2,10 @@ #pragma once -#include <vespa/searchlib/datastore/datastore.h> #include <vespa/searchlib/index/docidandfeatures.h> #include <vespa/searchlib/bitcompression/compression.h> #include <vespa/searchlib/bitcompression/posocccompression.h> +#include <vespa/vespalib/datastore/datastore.h> namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp index cf22554a4ed..66644d1fd2b 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.cpp @@ -5,13 +5,13 @@ #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/searchlib/bitcompression/posocccompression.h> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btree.hpp> #include <vespa/vespalib/util/array.hpp> using search::index::DocIdAndFeatures; diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index.h b/searchlib/src/vespa/searchlib/memoryindex/field_index.h index 9d869a7c548..3f601fd5b47 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index.h +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index.h @@ -5,12 +5,12 @@ #include "feature_store.h" #include "field_index_remover.h" #include "word_store.h" -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> -#include <vespa/searchlib/btree/btreeroot.h> -#include <vespa/searchlib/btree/btreestore.h> #include <vespa/searchlib/index/docidandfeatures.h> #include <vespa/searchlib/index/indexbuilder.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreestore.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/util/memoryusage.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp index 1a396d62c33..a8d564971c3 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/field_index_collection.cpp @@ -4,13 +4,13 @@ #include "field_inverter.h" #include <vespa/searchlib/bitcompression/posocccompression.h> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btree.hpp> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/exceptions.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h b/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h index 0aacfa53c34..3d349b26d70 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h +++ b/searchlib/src/vespa/searchlib/memoryindex/i_field_index_insert_listener.h @@ -1,6 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/searchlib/datastore/entryref.h> +#include <vespa/vespalib/datastore/entryref.h> namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp index df302533192..a73d483ec2f 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/memory_index.cpp @@ -6,7 +6,7 @@ #include "posting_iterator.h" #include <vespa/document/fieldvalue/arrayfieldvalue.h> #include <vespa/document/fieldvalue/document.h> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> #include <vespa/searchlib/common/sequencedtaskexecutor.h> #include <vespa/searchlib/index/schemautil.h> #include <vespa/searchlib/queryeval/booleanmatchiteratorwrapper.h> diff --git a/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp b/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp index 9b127a8b096..0308c6d276b 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/ordered_field_index_inserter.cpp @@ -8,13 +8,13 @@ #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btree.hpp> #include <vespa/log/log.h> LOG_SETUP(".searchlib.memoryindex.ordered_document_inserter"); diff --git a/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp b/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp index 4c29ec321e3..63040aab66f 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/posting_iterator.cpp @@ -1,11 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "posting_iterator.h" -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> #include <vespa/log/log.h> LOG_SETUP(".searchlib.memoryindex.posting_iterator"); diff --git a/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp b/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp index ffdc26f5eb0..0d699395512 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/word_store.cpp +++ b/searchlib/src/vespa/searchlib/memoryindex/word_store.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 "word_store.h" -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/memoryindex/word_store.h b/searchlib/src/vespa/searchlib/memoryindex/word_store.h index 6739b6152c8..9310910d69c 100644 --- a/searchlib/src/vespa/searchlib/memoryindex/word_store.h +++ b/searchlib/src/vespa/searchlib/memoryindex/word_store.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/datastore/datastore.h> +#include <vespa/vespalib/datastore/datastore.h> #include <vespa/vespalib/stllike/string.h> namespace search::memoryindex { diff --git a/searchlib/src/vespa/searchlib/predicate/common.h b/searchlib/src/vespa/searchlib/predicate/common.h index 6fd9f4562d5..18b5b92a9d5 100644 --- a/searchlib/src/vespa/searchlib/predicate/common.h +++ b/searchlib/src/vespa/searchlib/predicate/common.h @@ -2,7 +2,7 @@ #pragma once -#include <vespa/searchlib/btree/btree.h> +#include <vespa/vespalib/btree/btree.h> namespace search::predicate { diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp index 12728c4c7c3..8e370a13919 100644 --- a/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp +++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.cpp @@ -3,9 +3,9 @@ #include "document_features_store.h" #include "predicate_range_expander.h" #include <vespa/vespalib/stllike/hash_map.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> //#include "predicate_index.h" diff --git a/searchlib/src/vespa/searchlib/predicate/document_features_store.h b/searchlib/src/vespa/searchlib/predicate/document_features_store.h index ad721e7c43a..cca3fa2ef54 100644 --- a/searchlib/src/vespa/searchlib/predicate/document_features_store.h +++ b/searchlib/src/vespa/searchlib/predicate/document_features_store.h @@ -3,8 +3,8 @@ #pragma once #include "predicate_tree_annotator.h" -#include <vespa/searchlib/btree/btree.h> #include <vespa/searchlib/memoryindex/word_store.h> +#include <vespa/vespalib/btree/btree.h> #include <vespa/vespalib/data/databuffer.h> #include <vespa/vespalib/stllike/hash_map.h> #include <unordered_set> diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp index 0b8f5c9a921..99861db31c9 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_index.cpp @@ -2,11 +2,11 @@ #include "predicate_index.h" #include "predicate_hash.h" -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> using search::datastore::EntryRef; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp index d9852dabe25..40c1acf6a7d 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp +++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.cpp @@ -2,7 +2,7 @@ #include "predicate_interval_store.h" #include "predicate_interval.h" -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> using search::datastore::BufferState; using search::datastore::EntryRef; diff --git a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h index 1f1a9f3fa07..8b4eebee9b2 100644 --- a/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h +++ b/searchlib/src/vespa/searchlib/predicate/predicate_interval_store.h @@ -3,8 +3,8 @@ #pragma once #include "predicate_ref_cache.h" -#include <vespa/searchlib/datastore/bufferstate.h> -#include <vespa/searchlib/datastore/datastore.h> +#include <vespa/vespalib/datastore/bufferstate.h> +#include <vespa/vespalib/datastore/datastore.h> #include <vector> namespace search::predicate { diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.cpp b/searchlib/src/vespa/searchlib/predicate/simple_index.cpp index 151a66740e5..96957008255 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.cpp +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.cpp @@ -1,12 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "simple_index.hpp" +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> #include <vespa/vespalib/util/array.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> #include <vespa/log/log.h> LOG_SETUP(".searchlib.predicate.simple_index"); diff --git a/searchlib/src/vespa/searchlib/predicate/simple_index.h b/searchlib/src/vespa/searchlib/predicate/simple_index.h index abf7aa9af42..4edc0ff2d14 100644 --- a/searchlib/src/vespa/searchlib/predicate/simple_index.h +++ b/searchlib/src/vespa/searchlib/predicate/simple_index.h @@ -3,7 +3,7 @@ #pragma once #include "common.h" -#include <vespa/searchlib/btree/btreestore.h> +#include <vespa/vespalib/btree/btreestore.h> #include <vespa/vespalib/data/databuffer.h> #include <vespa/vespalib/util/rcuvector.h> #include <experimental/optional> diff --git a/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.cpp b/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.cpp index b32047ed8c2..3fd08047922 100644 --- a/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.cpp +++ b/searchlib/src/vespa/searchlib/queryeval/predicate_blueprint.cpp @@ -8,11 +8,11 @@ #include <vespa/searchlib/predicate/predicate_hash.h> #include <vespa/searchlib/predicate/predicate_index.h> #include <vespa/searchlib/query/tree/termnodes.h> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> #include <algorithm> #include <vespa/log/log.h> LOG_SETUP(".searchlib.predicate.predicate_blueprint"); diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute_saver.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute_saver.cpp index 0daabfd9a01..fb0554112ef 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute_saver.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_attribute_saver.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 "dense_tensor_attribute_saver.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> #include "dense_tensor_store.h" #include <vespa/searchlib/attribute/iattributesavetarget.h> diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp index c20c3d85d28..205c686df81 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp @@ -6,7 +6,7 @@ #include <vespa/eval/tensor/dense/mutable_dense_tensor_view.h> #include <vespa/eval/tensor/dense/dense_tensor.h> #include <vespa/eval/tensor/serialization/typed_binary_format.h> -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> using search::datastore::Handle; using vespalib::tensor::Tensor; diff --git a/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute_saver.cpp b/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute_saver.cpp index 81ec3a5218e..2f0bb731aa4 100644 --- a/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute_saver.cpp +++ b/searchlib/src/vespa/searchlib/tensor/generic_tensor_attribute_saver.cpp @@ -2,7 +2,7 @@ #include "generic_tensor_attribute_saver.h" #include "generic_tensor_store.h" -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/util/bufferwriter.h> #include <vespa/searchlib/attribute/iattributesavetarget.h> using vespalib::GenerationHandler; diff --git a/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp index 49a78f8d9d9..4e522f27ce2 100644 --- a/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/generic_tensor_store.cpp @@ -3,12 +3,12 @@ #include "generic_tensor_store.h" #include <vespa/eval/tensor/tensor.h> #include <vespa/eval/tensor/serialization/typed_binary_format.h> +#include <vespa/document/util/serializable.h> +#include <vespa/document/util/serializableexceptions.h> +#include <vespa/vespalib/datastore/datastore.hpp> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/util/macro.h> -#include <vespa/document/util/serializable.h> -#include <vespa/document/util/serializableexceptions.h> -#include <vespa/searchlib/datastore/datastore.hpp> using document::DeserializeException; using search::datastore::Handle; diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_store.cpp index b7edf0dd5d4..d0ac5017e4d 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.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 "tensor_store.h" -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> namespace search { diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_store.h b/searchlib/src/vespa/searchlib/tensor/tensor_store.h index 4805c5829c9..4be5701a327 100644 --- a/searchlib/src/vespa/searchlib/tensor/tensor_store.h +++ b/searchlib/src/vespa/searchlib/tensor/tensor_store.h @@ -2,8 +2,8 @@ #pragma once -#include <vespa/searchlib/datastore/entryref.h> -#include <vespa/searchlib/datastore/datastore.h> +#include <vespa/vespalib/datastore/entryref.h> +#include <vespa/vespalib/datastore/datastore.h> #include <vespa/vespalib/util/generationhandler.h> namespace vespalib { namespace tensor { class Tensor; } } diff --git a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp index d59417a1e78..54c0aa866b4 100644 --- a/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp +++ b/searchlib/src/vespa/searchlib/test/fakedata/fakememtreeocc.cpp @@ -2,14 +2,14 @@ #include "fakememtreeocc.h" #include "fpfactory.h" -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> #include <vespa/searchlib/memoryindex/posting_iterator.h> #include <vespa/searchlib/queryeval/iterators.h> #include <vespa/searchlib/util/postingpriorityqueue.h> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> #include <vespa/log/log.h> LOG_SETUP(".fakememtreeocc"); diff --git a/searchlib/src/vespa/searchlib/util/CMakeLists.txt b/searchlib/src/vespa/searchlib/util/CMakeLists.txt index 70242c3aacd..873f1824d04 100644 --- a/searchlib/src/vespa/searchlib/util/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/util/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(searchlib_util OBJECT SOURCES - bufferwriter.cpp comprbuffer.cpp comprfile.cpp dirtraverse.cpp diff --git a/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h b/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h index e4efca0796d..38d8337fab5 100644 --- a/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h +++ b/searchlib/src/vespa/searchlib/util/drainingbufferwriter.h @@ -2,7 +2,7 @@ #pragma once -#include "bufferwriter.h" +#include <vespa/vespalib/util/bufferwriter.h> #include <vector> #include <cstdint> diff --git a/staging_vespalib/CMakeLists.txt b/staging_vespalib/CMakeLists.txt index b95b4fda01f..095caf17a56 100644 --- a/staging_vespalib/CMakeLists.txt +++ b/staging_vespalib/CMakeLists.txt @@ -9,7 +9,6 @@ vespa_define_module( TESTS src/tests/array - src/tests/assert src/tests/benchmark src/tests/bits src/tests/clock diff --git a/staging_vespalib/src/tests/assert/.gitignore b/staging_vespalib/src/tests/assert/.gitignore deleted file mode 100644 index d0e23fcd846..00000000000 --- a/staging_vespalib/src/tests/assert/.gitignore +++ /dev/null @@ -1 +0,0 @@ -staging_vespalib_asserter_app diff --git a/staging_vespalib/src/tests/assert/CMakeLists.txt b/staging_vespalib/src/tests/assert/CMakeLists.txt deleted file mode 100644 index 7403a488645..00000000000 --- a/staging_vespalib/src/tests/assert/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -vespa_add_executable(staging_vespalib_assert_test_app TEST - SOURCES - assert_test.cpp - DEPENDS - staging_vespalib -) -vespa_add_test(NAME staging_vespalib_assert_test_app COMMAND staging_vespalib_assert_test_app) - -vespa_add_executable(staging_vespalib_asserter_app TEST - SOURCES - asserter.cpp - DEPENDS - staging_vespalib -) diff --git a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt index c104c047cd0..20d47c90453 100644 --- a/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt +++ b/staging_vespalib/src/vespa/vespalib/util/CMakeLists.txt @@ -1,7 +1,6 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(staging_vespalib_vespalib_util OBJECT SOURCES - assert.cpp bits.cpp clock.cpp crc.cpp diff --git a/storage/src/vespa/storage/bucketdb/btree_bucket_database.cpp b/storage/src/vespa/storage/bucketdb/btree_bucket_database.cpp index 27c17b207ea..a3715bb3d27 100644 --- a/storage/src/vespa/storage/bucketdb/btree_bucket_database.cpp +++ b/storage/src/vespa/storage/bucketdb/btree_bucket_database.cpp @@ -1,16 +1,16 @@ // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "btree_bucket_database.h" -#include <vespa/searchlib/btree/btreebuilder.h> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/datastore/array_store.hpp> +#include <vespa/vespalib/btree/btreebuilder.h> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/datastore/array_store.hpp> #include <iostream> /* diff --git a/storage/src/vespa/storage/bucketdb/btree_bucket_database.h b/storage/src/vespa/storage/bucketdb/btree_bucket_database.h index 91d3a1cde5b..d896f76db54 100644 --- a/storage/src/vespa/storage/bucketdb/btree_bucket_database.h +++ b/storage/src/vespa/storage/bucketdb/btree_bucket_database.h @@ -3,8 +3,8 @@ #pragma once #include "bucketdatabase.h" -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/datastore/array_store.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/datastore/array_store.h> namespace storage { diff --git a/vespalib/CMakeLists.txt b/vespalib/CMakeLists.txt index 8cd83866a8e..c1cb113ea40 100644 --- a/vespalib/CMakeLists.txt +++ b/vespalib/CMakeLists.txt @@ -21,8 +21,10 @@ vespa_define_module( src/tests/array src/tests/arrayqueue src/tests/arrayref + src/tests/assert src/tests/barrier src/tests/benchmark_timer + src/tests/btree src/tests/box src/tests/closure src/tests/component @@ -35,6 +37,11 @@ vespa_define_module( src/tests/data/output_writer src/tests/data/simple_buffer src/tests/data/smart_buffer + src/tests/datastore/array_store + src/tests/datastore/array_store_config + src/tests/datastore/buffer_type + src/tests/datastore/datastore + src/tests/datastore/unique_store src/tests/delegatelist src/tests/dotproduct src/tests/drop-file-from-cache @@ -127,9 +134,11 @@ vespa_define_module( LIBS src/vespa/vespalib + src/vespa/vespalib/btree src/vespa/vespalib/component src/vespa/vespalib/data src/vespa/vespalib/data/slime + src/vespa/vespalib/datastore src/vespa/vespalib/geo src/vespa/vespalib/hwaccelrated src/vespa/vespalib/io diff --git a/vespalib/src/tests/assert/.gitignore b/vespalib/src/tests/assert/.gitignore new file mode 100644 index 00000000000..605b8273f92 --- /dev/null +++ b/vespalib/src/tests/assert/.gitignore @@ -0,0 +1 @@ +vespalib_asserter_app diff --git a/vespalib/src/tests/assert/CMakeLists.txt b/vespalib/src/tests/assert/CMakeLists.txt new file mode 100644 index 00000000000..3c9780f1ec4 --- /dev/null +++ b/vespalib/src/tests/assert/CMakeLists.txt @@ -0,0 +1,16 @@ +# Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + +vespa_add_executable(vespalib_assert_test_app TEST + SOURCES + assert_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_assert_test_app COMMAND vespalib_assert_test_app) + +vespa_add_executable(vespalib_asserter_app TEST + SOURCES + asserter.cpp + DEPENDS + vespalib +) diff --git a/staging_vespalib/src/tests/assert/assert_test.cpp b/vespalib/src/tests/assert/assert_test.cpp index 454c0957974..454c0957974 100644 --- a/staging_vespalib/src/tests/assert/assert_test.cpp +++ b/vespalib/src/tests/assert/assert_test.cpp diff --git a/staging_vespalib/src/tests/assert/asserter.cpp b/vespalib/src/tests/assert/asserter.cpp index 640464889c0..640464889c0 100644 --- a/staging_vespalib/src/tests/assert/asserter.cpp +++ b/vespalib/src/tests/assert/asserter.cpp diff --git a/vespalib/src/tests/btree/.gitignore b/vespalib/src/tests/btree/.gitignore new file mode 100644 index 00000000000..4dc55d5704a --- /dev/null +++ b/vespalib/src/tests/btree/.gitignore @@ -0,0 +1,5 @@ +iteratespeed +vespalib_btree_test_app +vespalib_btreeaggregation_test_app +vespalib_frozenbtree_test_app +vespalib_iteratespeed_app diff --git a/vespalib/src/tests/btree/CMakeLists.txt b/vespalib/src/tests/btree/CMakeLists.txt new file mode 100644 index 00000000000..b6bdcb5160e --- /dev/null +++ b/vespalib/src/tests/btree/CMakeLists.txt @@ -0,0 +1,29 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_btree_test_app TEST + SOURCES + btree_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_btree_test_app COMMAND vespalib_btree_test_app) +vespa_add_executable(vespalib_frozenbtree_test_app TEST + SOURCES + frozenbtree_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_frozenbtree_test_app COMMAND vespalib_frozenbtree_test_app) +vespa_add_executable(vespalib_btreeaggregation_test_app TEST + SOURCES + btreeaggregation_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_btreeaggregation_test_app COMMAND vespalib_btreeaggregation_test_app) +vespa_add_executable(vespalib_iteratespeed_app + SOURCES + iteratespeed.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_iteratespeed_app COMMAND vespalib_iteratespeed_app BENCHMARK) diff --git a/searchlib/src/tests/btree/btree_test.cpp b/vespalib/src/tests/btree/btree_test.cpp index 32c3f952e47..4090283c10f 100644 --- a/searchlib/src/tests/btree/btree_test.cpp +++ b/vespalib/src/tests/btree/btree_test.cpp @@ -3,22 +3,22 @@ LOG_SETUP("btree_test"); #include <vespa/vespalib/testkit/testapp.h> #include <string> -#include <vespa/searchlib/btree/btreeroot.h> -#include <vespa/searchlib/btree/btreebuilder.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreestore.h> -#include <vespa/searchlib/util/rand48.h> - -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/test/btree/btree_printer.h> +#include <vespa/vespalib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreebuilder.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreestore.h> +#include <vespa/vespalib/util/rand48.h> + +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/test/btree/btree_printer.h> using vespalib::GenerationHandler; using search::datastore::EntryRef; diff --git a/searchlib/src/tests/btree/btreeaggregation_test.cpp b/vespalib/src/tests/btree/btreeaggregation_test.cpp index ef91c2c868a..0ce3d2c7d04 100644 --- a/searchlib/src/tests/btree/btreeaggregation_test.cpp +++ b/vespalib/src/tests/btree/btreeaggregation_test.cpp @@ -2,27 +2,27 @@ #include <vespa/log/log.h> LOG_SETUP("btreeaggregation_test"); #include <vespa/vespalib/testkit/testapp.h> -#include <string> -#include <set> +#include <vespa/vespalib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreebuilder.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreestore.h> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeaggregator.hpp> +#include <vespa/vespalib/test/btree/btree_printer.h> +#include <vespa/vespalib/util/rand48.h> + #include <iostream> -#include <vespa/searchlib/btree/btreeroot.h> -#include <vespa/searchlib/btree/btreebuilder.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreestore.h> -#include <vespa/searchlib/util/rand48.h> - -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> -#include <vespa/searchlib/btree/btreeaggregator.hpp> - -#include <vespa/searchlib/test/btree/btree_printer.h> +#include <map> +#include <set> +#include <string> using vespalib::GenerationHandler; using search::datastore::EntryRef; diff --git a/searchlib/src/tests/btree/frozenbtree_test.cpp b/vespalib/src/tests/btree/frozenbtree_test.cpp index 988239a5438..597c2ffdc90 100644 --- a/searchlib/src/tests/btree/frozenbtree_test.cpp +++ b/vespalib/src/tests/btree/frozenbtree_test.cpp @@ -3,11 +3,11 @@ #define DEBUG_FROZENBTREE #define LOG_FROZENBTREEXX #include <vespa/vespalib/testkit/testapp.h> -#include <vespa/searchlib/util/rand48.h> -#include <vespa/searchlib/btree/btreeroot.h> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/util/rand48.h> #include <map> #include <vespa/log/log.h> diff --git a/searchlib/src/tests/btree/iteratespeed.cpp b/vespalib/src/tests/btree/iteratespeed.cpp index 2f60b06d675..d1b9b3d7b1d 100644 --- a/searchlib/src/tests/btree/iteratespeed.cpp +++ b/vespalib/src/tests/btree/iteratespeed.cpp @@ -1,19 +1,19 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchlib/btree/btreeroot.h> -#include <vespa/searchlib/btree/btreebuilder.h> -#include <vespa/searchlib/btree/btreenodeallocator.h> -#include <vespa/searchlib/btree/btree.h> -#include <vespa/searchlib/btree/btreestore.h> -#include <vespa/searchlib/util/rand48.h> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/btree/btreenodestore.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreestore.hpp> +#include <vespa/vespalib/btree/btreeroot.h> +#include <vespa/vespalib/btree/btreebuilder.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btree.h> +#include <vespa/vespalib/btree/btreestore.h> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btreenodestore.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreestore.hpp> +#include <vespa/vespalib/util/rand48.h> #include <vespa/fastos/app.h> #include <vespa/fastos/timestamp.h> diff --git a/searchlib/src/tests/datastore/array_store/CMakeLists.txt b/vespalib/src/tests/datastore/array_store/CMakeLists.txt index c99759b7350..a6f0ef31b1a 100644 --- a/searchlib/src/tests/datastore/array_store/CMakeLists.txt +++ b/vespalib/src/tests/datastore/array_store/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_array_store_test_app TEST +vespa_add_executable(vespalib_array_store_test_app TEST SOURCES array_store_test.cpp DEPENDS - searchlib + vespalib ) -vespa_add_test(NAME searchlib_array_store_test_app COMMAND searchlib_array_store_test_app) +vespa_add_test(NAME vespalib_array_store_test_app COMMAND vespalib_array_store_test_app) diff --git a/searchlib/src/tests/datastore/array_store/array_store_test.cpp b/vespalib/src/tests/datastore/array_store/array_store_test.cpp index 0af9002ae75..1eb71d36fe7 100644 --- a/searchlib/src/tests/datastore/array_store/array_store_test.cpp +++ b/vespalib/src/tests/datastore/array_store/array_store_test.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 <vespa/searchlib/datastore/array_store.hpp> -#include <vespa/searchlib/test/datastore/memstats.h> +#include <vespa/vespalib/test/datastore/memstats.h> +#include <vespa/vespalib/datastore/array_store.hpp> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/util/traits.h> diff --git a/vespalib/src/tests/datastore/array_store_config/CMakeLists.txt b/vespalib/src/tests/datastore/array_store_config/CMakeLists.txt new file mode 100644 index 00000000000..a5638462748 --- /dev/null +++ b/vespalib/src/tests/datastore/array_store_config/CMakeLists.txt @@ -0,0 +1,8 @@ +# Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +vespa_add_executable(vespalib_array_store_config_test_app TEST + SOURCES + array_store_config_test.cpp + DEPENDS + vespalib +) +vespa_add_test(NAME vespalib_array_store_config_test_app COMMAND vespalib_array_store_config_test_app) diff --git a/searchlib/src/tests/datastore/array_store_config/array_store_config_test.cpp b/vespalib/src/tests/datastore/array_store_config/array_store_config_test.cpp index e0f93761b13..4779cf1aa70 100644 --- a/searchlib/src/tests/datastore/array_store_config/array_store_config_test.cpp +++ b/vespalib/src/tests/datastore/array_store_config/array_store_config_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/vespalib/testkit/testapp.h> -#include <vespa/searchlib/datastore/entryref.h> -#include <vespa/searchlib/datastore/array_store_config.h> +#include <vespa/vespalib/datastore/entryref.h> +#include <vespa/vespalib/datastore/array_store_config.h> using namespace search::datastore; using AllocSpec = ArrayStoreConfig::AllocSpec; diff --git a/searchlib/src/tests/datastore/buffer_type/CMakeLists.txt b/vespalib/src/tests/datastore/buffer_type/CMakeLists.txt index 3c3a6eb6f87..d3618c998e3 100644 --- a/searchlib/src/tests/datastore/buffer_type/CMakeLists.txt +++ b/vespalib/src/tests/datastore/buffer_type/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_buffer_type_test_app TEST +vespa_add_executable(vespalib_buffer_type_test_app TEST SOURCES buffer_type_test.cpp DEPENDS - searchlib + vespalib ) -vespa_add_test(NAME searchlib_buffer_type_test_app COMMAND searchlib_buffer_type_test_app) +vespa_add_test(NAME vespalib_buffer_type_test_app COMMAND vespalib_buffer_type_test_app) diff --git a/searchlib/src/tests/datastore/buffer_type/buffer_type_test.cpp b/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp index 2ea615bea08..6a51b9192ce 100644 --- a/searchlib/src/tests/datastore/buffer_type/buffer_type_test.cpp +++ b/vespalib/src/tests/datastore/buffer_type/buffer_type_test.cpp @@ -1,6 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/searchlib/datastore/buffer_type.h> +#include <vespa/vespalib/datastore/buffer_type.h> #include <vespa/vespalib/testkit/testapp.h> using namespace search::datastore; diff --git a/searchlib/src/tests/datastore/datastore/CMakeLists.txt b/vespalib/src/tests/datastore/datastore/CMakeLists.txt index 1bc6210a13f..eb3e0a4576a 100644 --- a/searchlib/src/tests/datastore/datastore/CMakeLists.txt +++ b/vespalib/src/tests/datastore/datastore/CMakeLists.txt @@ -1,9 +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_datastore_test_app TEST +vespa_add_executable(vespalib_datastore_test_app TEST SOURCES datastore_test.cpp DEPENDS - searchlib + vespalib gtest ) -vespa_add_test(NAME searchlib_datastore_test_app COMMAND searchlib_datastore_test_app) +vespa_add_test(NAME vespalib_datastore_test_app COMMAND vespalib_datastore_test_app) diff --git a/searchlib/src/tests/datastore/datastore/datastore_test.cpp b/vespalib/src/tests/datastore/datastore/datastore_test.cpp index 281e5d52365..0981280ac23 100644 --- a/searchlib/src/tests/datastore/datastore/datastore_test.cpp +++ b/vespalib/src/tests/datastore/datastore/datastore_test.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 <vespa/searchlib/datastore/datastore.h> -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.h> +#include <vespa/vespalib/datastore/datastore.hpp> #include <vespa/vespalib/gtest/gtest.h> #include <vespa/vespalib/test/insertion_operators.h> diff --git a/searchlib/src/tests/datastore/unique_store/CMakeLists.txt b/vespalib/src/tests/datastore/unique_store/CMakeLists.txt index 0db25d3129b..dd200018448 100644 --- a/searchlib/src/tests/datastore/unique_store/CMakeLists.txt +++ b/vespalib/src/tests/datastore/unique_store/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(searchlib_unique_store_test_app TEST +vespa_add_executable(vespalib_unique_store_test_app TEST SOURCES unique_store_test.cpp DEPENDS - searchlib + vespalib ) -vespa_add_test(NAME searchlib_unique_store_test_app COMMAND searchlib_unique_store_test_app) +vespa_add_test(NAME vespalib_unique_store_test_app COMMAND vespalib_unique_store_test_app) diff --git a/searchlib/src/tests/datastore/unique_store/unique_store_test.cpp b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp index d60144c18f1..ec3a3040167 100644 --- a/searchlib/src/tests/datastore/unique_store/unique_store_test.cpp +++ b/vespalib/src/tests/datastore/unique_store/unique_store_test.cpp @@ -1,11 +1,11 @@ // 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("unique_store_test"); +#include <vespa/vespalib/datastore/unique_store.hpp> #include <vespa/vespalib/testkit/testapp.h> +#include <vespa/vespalib/test/datastore/memstats.h> #include <vespa/vespalib/test/insertion_operators.h> #include <vespa/vespalib/util/traits.h> -#include <vespa/searchlib/datastore/unique_store.hpp> -#include <vespa/searchlib/test/datastore/memstats.h> #include <vector> using namespace search::datastore; diff --git a/vespalib/src/vespa/vespalib/CMakeLists.txt b/vespalib/src/vespa/vespalib/CMakeLists.txt index bab9fa79947..d13875a9383 100644 --- a/vespalib/src/vespa/vespalib/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/CMakeLists.txt @@ -1,9 +1,11 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_add_library(vespalib SOURCES + $<TARGET_OBJECTS:vespalib_vespalib_btree> $<TARGET_OBJECTS:vespalib_vespalib_component> $<TARGET_OBJECTS:vespalib_vespalib_data> $<TARGET_OBJECTS:vespalib_vespalib_data_slime> + $<TARGET_OBJECTS:vespalib_vespalib_datastore> $<TARGET_OBJECTS:vespalib_vespalib_geo> $<TARGET_OBJECTS:vespalib_vespalib_hwaccelrated> $<TARGET_OBJECTS:vespalib_vespalib_io> diff --git a/searchlib/src/vespa/searchlib/btree/CMakeLists.txt b/vespalib/src/vespa/vespalib/btree/CMakeLists.txt index d72f5c97dec..73cfebab786 100644 --- a/searchlib/src/vespa/searchlib/btree/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/btree/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(searchlib_btree OBJECT +vespa_add_library(vespalib_vespalib_btree OBJECT SOURCES btree_key_data.cpp btreeaggregator.cpp diff --git a/searchlib/src/vespa/searchlib/btree/OWNERS b/vespalib/src/vespa/vespalib/btree/OWNERS index b7b549c6058..b7b549c6058 100644 --- a/searchlib/src/vespa/searchlib/btree/OWNERS +++ b/vespalib/src/vespa/vespalib/btree/OWNERS diff --git a/searchlib/src/vespa/searchlib/btree/btree.h b/vespalib/src/vespa/vespalib/btree/btree.h index 5d20964e169..5d20964e169 100644 --- a/searchlib/src/vespa/searchlib/btree/btree.h +++ b/vespalib/src/vespa/vespalib/btree/btree.h diff --git a/searchlib/src/vespa/searchlib/btree/btree.hpp b/vespalib/src/vespa/vespalib/btree/btree.hpp index 928d8d6cfcd..928d8d6cfcd 100644 --- a/searchlib/src/vespa/searchlib/btree/btree.hpp +++ b/vespalib/src/vespa/vespalib/btree/btree.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btree_key_data.cpp b/vespalib/src/vespa/vespalib/btree/btree_key_data.cpp index f30855e0589..f30855e0589 100644 --- a/searchlib/src/vespa/searchlib/btree/btree_key_data.cpp +++ b/vespalib/src/vespa/vespalib/btree/btree_key_data.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btree_key_data.h b/vespalib/src/vespa/vespalib/btree/btree_key_data.h index 737651b755d..737651b755d 100644 --- a/searchlib/src/vespa/searchlib/btree/btree_key_data.h +++ b/vespalib/src/vespa/vespalib/btree/btree_key_data.h diff --git a/searchlib/src/vespa/searchlib/btree/btreeaggregator.cpp b/vespalib/src/vespa/vespalib/btree/btreeaggregator.cpp index 2eb627192dc..2eb627192dc 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeaggregator.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreeaggregator.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeaggregator.h b/vespalib/src/vespa/vespalib/btree/btreeaggregator.h index 38c6f579f53..38c6f579f53 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeaggregator.h +++ b/vespalib/src/vespa/vespalib/btree/btreeaggregator.h diff --git a/searchlib/src/vespa/searchlib/btree/btreeaggregator.hpp b/vespalib/src/vespa/vespalib/btree/btreeaggregator.hpp index e1318ab5a66..e1318ab5a66 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeaggregator.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreeaggregator.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreebuilder.cpp b/vespalib/src/vespa/vespalib/btree/btreebuilder.cpp index 133c5d245c9..133c5d245c9 100644 --- a/searchlib/src/vespa/searchlib/btree/btreebuilder.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreebuilder.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreebuilder.h b/vespalib/src/vespa/vespalib/btree/btreebuilder.h index 767f02d03ee..767f02d03ee 100644 --- a/searchlib/src/vespa/searchlib/btree/btreebuilder.h +++ b/vespalib/src/vespa/vespalib/btree/btreebuilder.h diff --git a/searchlib/src/vespa/searchlib/btree/btreebuilder.hpp b/vespalib/src/vespa/vespalib/btree/btreebuilder.hpp index fb912499c6c..fb912499c6c 100644 --- a/searchlib/src/vespa/searchlib/btree/btreebuilder.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreebuilder.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeinserter.cpp b/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp index f307c474f90..f307c474f90 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeinserter.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeinserter.h b/vespalib/src/vespa/vespalib/btree/btreeinserter.h index a3fa2916a88..a3fa2916a88 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeinserter.h +++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.h diff --git a/searchlib/src/vespa/searchlib/btree/btreeinserter.hpp b/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp index d1da94c1b17..d1da94c1b17 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeinserter.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeiterator.cpp b/vespalib/src/vespa/vespalib/btree/btreeiterator.cpp index 9444cee975d..9444cee975d 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeiterator.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeiterator.h b/vespalib/src/vespa/vespalib/btree/btreeiterator.h index de9637c00f1..de9637c00f1 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeiterator.h +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.h diff --git a/searchlib/src/vespa/searchlib/btree/btreeiterator.hpp b/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp index b26f249c51b..b26f249c51b 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeiterator.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreeiterator.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreenode.cpp b/vespalib/src/vespa/vespalib/btree/btreenode.cpp index b3d7b60adb6..b3d7b60adb6 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenode.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreenode.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreenode.h b/vespalib/src/vespa/vespalib/btree/btreenode.h index 0b1f1e8612a..3bcc0fd100f 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenode.h +++ b/vespalib/src/vespa/vespalib/btree/btreenode.h @@ -5,8 +5,8 @@ #include "noaggregated.h" #include "minmaxaggregated.h" #include "btree_key_data.h" -#include <vespa/searchlib/datastore/entryref.h> -#include <vespa/searchlib/datastore/handle.h> +#include <vespa/vespalib/datastore/entryref.h> +#include <vespa/vespalib/datastore/handle.h> #include <cassert> #include <utility> #include <cstddef> diff --git a/searchlib/src/vespa/searchlib/btree/btreenode.hpp b/vespalib/src/vespa/vespalib/btree/btreenode.hpp index 421e83a8440..421e83a8440 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenode.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreenode.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreenodeallocator.cpp b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.cpp index 1a05d68b04f..1a05d68b04f 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodeallocator.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreenodeallocator.h b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h index d2d2cf44a46..d2d2cf44a46 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodeallocator.h +++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.h diff --git a/searchlib/src/vespa/searchlib/btree/btreenodeallocator.hpp b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp index 197869a7c71..197869a7c71 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodeallocator.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreenodeallocator.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreenodestore.cpp b/vespalib/src/vespa/vespalib/btree/btreenodestore.cpp index bfb1e2fa6a1..1e69dacddce 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodestore.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.cpp @@ -4,7 +4,7 @@ #include "btreerootbase.h" #include "btreeroot.h" #include "btreenodeallocator.h" -#include <vespa/searchlib/datastore/datastore.h> +#include <vespa/vespalib/datastore/datastore.h> namespace search::btree { diff --git a/searchlib/src/vespa/searchlib/btree/btreenodestore.h b/vespalib/src/vespa/vespalib/btree/btreenodestore.h index d8eae945602..43522629dbb 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodestore.h +++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.h @@ -4,7 +4,7 @@ #include "btreenode.h" #include "btreetraits.h" -#include <vespa/searchlib/datastore/datastore.h> +#include <vespa/vespalib/datastore/datastore.h> namespace search::btree { diff --git a/searchlib/src/vespa/searchlib/btree/btreenodestore.hpp b/vespalib/src/vespa/vespalib/btree/btreenodestore.hpp index cf2889c42af..ebbb57baa16 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodestore.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreenodestore.hpp @@ -3,7 +3,7 @@ #pragma once #include "btreenodestore.h" -#include <vespa/searchlib/datastore/datastore.hpp> +#include <vespa/vespalib/datastore/datastore.hpp> namespace search::btree { diff --git a/searchlib/src/vespa/searchlib/btree/btreeremover.cpp b/vespalib/src/vespa/vespalib/btree/btreeremover.cpp index 2322eebf784..2322eebf784 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeremover.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreeremover.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeremover.h b/vespalib/src/vespa/vespalib/btree/btreeremover.h index 87355aa4ce7..87355aa4ce7 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeremover.h +++ b/vespalib/src/vespa/vespalib/btree/btreeremover.h diff --git a/searchlib/src/vespa/searchlib/btree/btreeremover.hpp b/vespalib/src/vespa/vespalib/btree/btreeremover.hpp index c304ea13016..c304ea13016 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeremover.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreeremover.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeroot.cpp b/vespalib/src/vespa/vespalib/btree/btreeroot.cpp index a576b6ce1e0..a576b6ce1e0 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeroot.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreeroot.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreeroot.h b/vespalib/src/vespa/vespalib/btree/btreeroot.h index b5759a6a341..b5759a6a341 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeroot.h +++ b/vespalib/src/vespa/vespalib/btree/btreeroot.h diff --git a/searchlib/src/vespa/searchlib/btree/btreeroot.hpp b/vespalib/src/vespa/vespalib/btree/btreeroot.hpp index 22703f2dfd2..22703f2dfd2 100644 --- a/searchlib/src/vespa/searchlib/btree/btreeroot.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreeroot.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreerootbase.cpp b/vespalib/src/vespa/vespalib/btree/btreerootbase.cpp index 12394761bf9..12394761bf9 100644 --- a/searchlib/src/vespa/searchlib/btree/btreerootbase.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreerootbase.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreerootbase.h b/vespalib/src/vespa/vespalib/btree/btreerootbase.h index ed4889214ca..ed4889214ca 100644 --- a/searchlib/src/vespa/searchlib/btree/btreerootbase.h +++ b/vespalib/src/vespa/vespalib/btree/btreerootbase.h diff --git a/searchlib/src/vespa/searchlib/btree/btreerootbase.hpp b/vespalib/src/vespa/vespalib/btree/btreerootbase.hpp index 0b4ef18aad9..0b4ef18aad9 100644 --- a/searchlib/src/vespa/searchlib/btree/btreerootbase.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreerootbase.hpp diff --git a/searchlib/src/vespa/searchlib/btree/btreestore.cpp b/vespalib/src/vespa/vespalib/btree/btreestore.cpp index bead11295b3..bead11295b3 100644 --- a/searchlib/src/vespa/searchlib/btree/btreestore.cpp +++ b/vespalib/src/vespa/vespalib/btree/btreestore.cpp diff --git a/searchlib/src/vespa/searchlib/btree/btreestore.h b/vespalib/src/vespa/vespalib/btree/btreestore.h index c2242bd6b63..426baf80fa0 100644 --- a/searchlib/src/vespa/searchlib/btree/btreestore.h +++ b/vespalib/src/vespa/vespalib/btree/btreestore.h @@ -7,8 +7,8 @@ #include "btreeroot.h" #include "noaggrcalc.h" #include "minmaxaggrcalc.h" -#include <vespa/searchlib/datastore/datastore.h> -#include <vespa/searchlib/datastore/handle.h> +#include <vespa/vespalib/datastore/datastore.h> +#include <vespa/vespalib/datastore/handle.h> namespace search::btree { diff --git a/searchlib/src/vespa/searchlib/btree/btreestore.hpp b/vespalib/src/vespa/vespalib/btree/btreestore.hpp index ae9a67b4e8b..614546903dc 100644 --- a/searchlib/src/vespa/searchlib/btree/btreestore.hpp +++ b/vespalib/src/vespa/vespalib/btree/btreestore.hpp @@ -5,8 +5,8 @@ #include "btreestore.h" #include "btreebuilder.h" #include "btreebuilder.hpp" -#include <vespa/searchlib/datastore/datastore.hpp> -#include <vespa/searchlib/bitcompression/compression.h> +#include <vespa/vespalib/datastore/datastore.hpp> +#include <vespa/vespalib/util/optimized.h> namespace search::btree { @@ -714,6 +714,17 @@ applyCluster(EntryRef &ref, return false; } +namespace { + +// Included here verbatim to avoid dependency on searchlib bitcompression +// sub-library just for this function. +// TODO should there be a special-casing for 0 here? Existing bitcompression code +// does not have this either, but msbIdx et al is not defined when no bits are set. +inline uint32_t asmlog2(uint64_t v) noexcept { + return vespalib::Optimized::msbIdx(v); +} + +} template <typename KeyT, typename DataT, typename AggrT, typename CompareT, typename TraitsT, typename AggrCalcT> @@ -731,8 +742,7 @@ applyTree(BTreeType *tree, size_t additionSize(ae - a); size_t removeSize(re - r); uint64_t buildCost = treeSize * 2 + additionSize; - typedef bitcompression::EncodeContext64BE EC; - uint64_t modifyCost = (EC::asmlog2(treeSize + additionSize) + 1) * + uint64_t modifyCost = (asmlog2(treeSize + additionSize) + 1) * (additionSize + removeSize); if (modifyCost < buildCost) applyModifyTree(tree, a, ae, r, re, comp); diff --git a/searchlib/src/vespa/searchlib/btree/btreetraits.h b/vespalib/src/vespa/vespalib/btree/btreetraits.h index efa7cb4de34..efa7cb4de34 100644 --- a/searchlib/src/vespa/searchlib/btree/btreetraits.h +++ b/vespalib/src/vespa/vespalib/btree/btreetraits.h diff --git a/searchlib/src/vespa/searchlib/btree/minmaxaggrcalc.h b/vespalib/src/vespa/vespalib/btree/minmaxaggrcalc.h index b33422ec3e3..b33422ec3e3 100644 --- a/searchlib/src/vespa/searchlib/btree/minmaxaggrcalc.h +++ b/vespalib/src/vespa/vespalib/btree/minmaxaggrcalc.h diff --git a/searchlib/src/vespa/searchlib/btree/minmaxaggregated.h b/vespalib/src/vespa/vespalib/btree/minmaxaggregated.h index add570a6e6b..add570a6e6b 100644 --- a/searchlib/src/vespa/searchlib/btree/minmaxaggregated.h +++ b/vespalib/src/vespa/vespalib/btree/minmaxaggregated.h diff --git a/searchlib/src/vespa/searchlib/btree/noaggrcalc.h b/vespalib/src/vespa/vespalib/btree/noaggrcalc.h index e77e8bc204a..e77e8bc204a 100644 --- a/searchlib/src/vespa/searchlib/btree/noaggrcalc.h +++ b/vespalib/src/vespa/vespalib/btree/noaggrcalc.h diff --git a/searchlib/src/vespa/searchlib/btree/noaggregated.h b/vespalib/src/vespa/vespalib/btree/noaggregated.h index e16465f5e0a..e16465f5e0a 100644 --- a/searchlib/src/vespa/searchlib/btree/noaggregated.h +++ b/vespalib/src/vespa/vespalib/btree/noaggregated.h diff --git a/searchlib/src/vespa/searchlib/datastore/CMakeLists.txt b/vespalib/src/vespa/vespalib/datastore/CMakeLists.txt index 5af7bd21d78..30c451bb191 100644 --- a/searchlib/src/vespa/searchlib/datastore/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/datastore/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(searchlib_datastore OBJECT +vespa_add_library(vespalib_vespalib_datastore OBJECT SOURCES array_store_config.cpp buffer_type.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/allocator.h b/vespalib/src/vespa/vespalib/datastore/allocator.h index 8a522266c1a..8a522266c1a 100644 --- a/searchlib/src/vespa/searchlib/datastore/allocator.h +++ b/vespalib/src/vespa/vespalib/datastore/allocator.h diff --git a/searchlib/src/vespa/searchlib/datastore/allocator.hpp b/vespalib/src/vespa/vespalib/datastore/allocator.hpp index fa22ba0c3ed..fa22ba0c3ed 100644 --- a/searchlib/src/vespa/searchlib/datastore/allocator.hpp +++ b/vespalib/src/vespa/vespalib/datastore/allocator.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/array_store.h b/vespalib/src/vespa/vespalib/datastore/array_store.h index d9d5afcbd43..d9d5afcbd43 100644 --- a/searchlib/src/vespa/searchlib/datastore/array_store.h +++ b/vespalib/src/vespa/vespalib/datastore/array_store.h diff --git a/searchlib/src/vespa/searchlib/datastore/array_store.hpp b/vespalib/src/vespa/vespalib/datastore/array_store.hpp index 524013652c5..524013652c5 100644 --- a/searchlib/src/vespa/searchlib/datastore/array_store.hpp +++ b/vespalib/src/vespa/vespalib/datastore/array_store.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/array_store_config.cpp b/vespalib/src/vespa/vespalib/datastore/array_store_config.cpp index 0581183f675..0581183f675 100644 --- a/searchlib/src/vespa/searchlib/datastore/array_store_config.cpp +++ b/vespalib/src/vespa/vespalib/datastore/array_store_config.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/array_store_config.h b/vespalib/src/vespa/vespalib/datastore/array_store_config.h index a39c4454308..a39c4454308 100644 --- a/searchlib/src/vespa/searchlib/datastore/array_store_config.h +++ b/vespalib/src/vespa/vespalib/datastore/array_store_config.h diff --git a/searchlib/src/vespa/searchlib/datastore/buffer_type.cpp b/vespalib/src/vespa/vespalib/datastore/buffer_type.cpp index 3955a6cb399..3955a6cb399 100644 --- a/searchlib/src/vespa/searchlib/datastore/buffer_type.cpp +++ b/vespalib/src/vespa/vespalib/datastore/buffer_type.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/buffer_type.h b/vespalib/src/vespa/vespalib/datastore/buffer_type.h index 116b45fe106..116b45fe106 100644 --- a/searchlib/src/vespa/searchlib/datastore/buffer_type.h +++ b/vespalib/src/vespa/vespalib/datastore/buffer_type.h diff --git a/searchlib/src/vespa/searchlib/datastore/bufferstate.cpp b/vespalib/src/vespa/vespalib/datastore/bufferstate.cpp index 638117c8c60..638117c8c60 100644 --- a/searchlib/src/vespa/searchlib/datastore/bufferstate.cpp +++ b/vespalib/src/vespa/vespalib/datastore/bufferstate.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/bufferstate.h b/vespalib/src/vespa/vespalib/datastore/bufferstate.h index 1cc26d8dd18..1cc26d8dd18 100644 --- a/searchlib/src/vespa/searchlib/datastore/bufferstate.h +++ b/vespalib/src/vespa/vespalib/datastore/bufferstate.h diff --git a/searchlib/src/vespa/searchlib/datastore/datastore.cpp b/vespalib/src/vespa/vespalib/datastore/datastore.cpp index 308dc750113..308dc750113 100644 --- a/searchlib/src/vespa/searchlib/datastore/datastore.cpp +++ b/vespalib/src/vespa/vespalib/datastore/datastore.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/datastore.h b/vespalib/src/vespa/vespalib/datastore/datastore.h index 6d7376f1b0c..6d7376f1b0c 100644 --- a/searchlib/src/vespa/searchlib/datastore/datastore.h +++ b/vespalib/src/vespa/vespalib/datastore/datastore.h diff --git a/searchlib/src/vespa/searchlib/datastore/datastore.hpp b/vespalib/src/vespa/vespalib/datastore/datastore.hpp index 797cd75cb08..797cd75cb08 100644 --- a/searchlib/src/vespa/searchlib/datastore/datastore.hpp +++ b/vespalib/src/vespa/vespalib/datastore/datastore.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/datastorebase.cpp b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp index 222e820546e..222e820546e 100644 --- a/searchlib/src/vespa/searchlib/datastore/datastorebase.cpp +++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/datastorebase.h b/vespalib/src/vespa/vespalib/datastore/datastorebase.h index 4886237194f..4886237194f 100644 --- a/searchlib/src/vespa/searchlib/datastore/datastorebase.h +++ b/vespalib/src/vespa/vespalib/datastore/datastorebase.h diff --git a/searchlib/src/vespa/searchlib/datastore/entryref.cpp b/vespalib/src/vespa/vespalib/datastore/entryref.cpp index 649bfa7e4e9..649bfa7e4e9 100644 --- a/searchlib/src/vespa/searchlib/datastore/entryref.cpp +++ b/vespalib/src/vespa/vespalib/datastore/entryref.cpp diff --git a/searchlib/src/vespa/searchlib/datastore/entryref.h b/vespalib/src/vespa/vespalib/datastore/entryref.h index a582d2020f9..a582d2020f9 100644 --- a/searchlib/src/vespa/searchlib/datastore/entryref.h +++ b/vespalib/src/vespa/vespalib/datastore/entryref.h diff --git a/searchlib/src/vespa/searchlib/datastore/entryref.hpp b/vespalib/src/vespa/vespalib/datastore/entryref.hpp index 6e8b94f8989..6e8b94f8989 100644 --- a/searchlib/src/vespa/searchlib/datastore/entryref.hpp +++ b/vespalib/src/vespa/vespalib/datastore/entryref.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/free_list_allocator.h b/vespalib/src/vespa/vespalib/datastore/free_list_allocator.h index a23cb71b90c..a23cb71b90c 100644 --- a/searchlib/src/vespa/searchlib/datastore/free_list_allocator.h +++ b/vespalib/src/vespa/vespalib/datastore/free_list_allocator.h diff --git a/searchlib/src/vespa/searchlib/datastore/free_list_allocator.hpp b/vespalib/src/vespa/vespalib/datastore/free_list_allocator.hpp index 402fbe26725..402fbe26725 100644 --- a/searchlib/src/vespa/searchlib/datastore/free_list_allocator.hpp +++ b/vespalib/src/vespa/vespalib/datastore/free_list_allocator.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/free_list_raw_allocator.h b/vespalib/src/vespa/vespalib/datastore/free_list_raw_allocator.h index 514eecc25a8..514eecc25a8 100644 --- a/searchlib/src/vespa/searchlib/datastore/free_list_raw_allocator.h +++ b/vespalib/src/vespa/vespalib/datastore/free_list_raw_allocator.h diff --git a/searchlib/src/vespa/searchlib/datastore/free_list_raw_allocator.hpp b/vespalib/src/vespa/vespalib/datastore/free_list_raw_allocator.hpp index 0e97d6a3c33..0e97d6a3c33 100644 --- a/searchlib/src/vespa/searchlib/datastore/free_list_raw_allocator.hpp +++ b/vespalib/src/vespa/vespalib/datastore/free_list_raw_allocator.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/handle.h b/vespalib/src/vespa/vespalib/datastore/handle.h index 49eb4843816..49eb4843816 100644 --- a/searchlib/src/vespa/searchlib/datastore/handle.h +++ b/vespalib/src/vespa/vespalib/datastore/handle.h diff --git a/searchlib/src/vespa/searchlib/datastore/i_compaction_context.h b/vespalib/src/vespa/vespalib/datastore/i_compaction_context.h index aa537968f1c..aa537968f1c 100644 --- a/searchlib/src/vespa/searchlib/datastore/i_compaction_context.h +++ b/vespalib/src/vespa/vespalib/datastore/i_compaction_context.h diff --git a/searchlib/src/vespa/searchlib/datastore/raw_allocator.h b/vespalib/src/vespa/vespalib/datastore/raw_allocator.h index b7c00f75580..b7c00f75580 100644 --- a/searchlib/src/vespa/searchlib/datastore/raw_allocator.h +++ b/vespalib/src/vespa/vespalib/datastore/raw_allocator.h diff --git a/searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp b/vespalib/src/vespa/vespalib/datastore/raw_allocator.hpp index 9b86305a634..9b86305a634 100644 --- a/searchlib/src/vespa/searchlib/datastore/raw_allocator.hpp +++ b/vespalib/src/vespa/vespalib/datastore/raw_allocator.hpp diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store.h b/vespalib/src/vespa/vespalib/datastore/unique_store.h index cc261acd53f..3da4ff941b5 100644 --- a/searchlib/src/vespa/searchlib/datastore/unique_store.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store.h @@ -8,7 +8,7 @@ #include "entryref.h" #include "i_compaction_context.h" #include <vespa/vespalib/util/array.h> -#include <vespa/searchlib/btree/btree.h> +#include <vespa/vespalib/btree/btree.h> namespace search::datastore { diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp index e86edb9d3d4..0f1f73f3205 100644 --- a/searchlib/src/vespa/searchlib/datastore/unique_store.hpp +++ b/vespalib/src/vespa/vespalib/datastore/unique_store.hpp @@ -4,13 +4,13 @@ #include "unique_store.h" #include "datastore.hpp" -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> -#include <vespa/searchlib/util/bufferwriter.h> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> +#include <vespa/vespalib/util/bufferwriter.h> #include "unique_store_builder.hpp" #include "unique_store_saver.hpp" #include <atomic> diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store_builder.h b/vespalib/src/vespa/vespalib/datastore/unique_store_builder.h index 0a3ec447e67..0a3ec447e67 100644 --- a/searchlib/src/vespa/searchlib/datastore/unique_store_builder.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_builder.h diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store_builder.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store_builder.hpp index 9445eb3a9f2..8b75b147655 100644 --- a/searchlib/src/vespa/searchlib/datastore/unique_store_builder.hpp +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_builder.hpp @@ -4,12 +4,12 @@ #include "unique_store_builder.h" #include "datastore.hpp" -#include <vespa/searchlib/btree/btree.hpp> -#include <vespa/searchlib/btree/btreebuilder.hpp> -#include <vespa/searchlib/btree/btreeroot.hpp> -#include <vespa/searchlib/btree/btreenodeallocator.hpp> -#include <vespa/searchlib/btree/btreeiterator.hpp> -#include <vespa/searchlib/btree/btreenode.hpp> +#include <vespa/vespalib/btree/btree.hpp> +#include <vespa/vespalib/btree/btreebuilder.hpp> +#include <vespa/vespalib/btree/btreeroot.hpp> +#include <vespa/vespalib/btree/btreenodeallocator.hpp> +#include <vespa/vespalib/btree/btreeiterator.hpp> +#include <vespa/vespalib/btree/btreenode.hpp> namespace search::datastore { diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store_saver.h b/vespalib/src/vespa/vespalib/datastore/unique_store_saver.h index 6fdcf2da83a..6fdcf2da83a 100644 --- a/searchlib/src/vespa/searchlib/datastore/unique_store_saver.h +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_saver.h diff --git a/searchlib/src/vespa/searchlib/datastore/unique_store_saver.hpp b/vespalib/src/vespa/vespalib/datastore/unique_store_saver.hpp index 3377b674930..3377b674930 100644 --- a/searchlib/src/vespa/searchlib/datastore/unique_store_saver.hpp +++ b/vespalib/src/vespa/vespalib/datastore/unique_store_saver.hpp diff --git a/staging_vespalib/src/vespa/vespalib/gtest/gtest.h b/vespalib/src/vespa/vespalib/gtest/gtest.h index 67d3d438a52..67d3d438a52 100644 --- a/staging_vespalib/src/vespa/vespalib/gtest/gtest.h +++ b/vespalib/src/vespa/vespalib/gtest/gtest.h diff --git a/searchlib/src/vespa/searchlib/test/btree/aggregated_printer.h b/vespalib/src/vespa/vespalib/test/btree/aggregated_printer.h index b84ab8285d0..18544ef9007 100644 --- a/searchlib/src/vespa/searchlib/test/btree/aggregated_printer.h +++ b/vespalib/src/vespa/vespalib/test/btree/aggregated_printer.h @@ -2,8 +2,8 @@ #pragma once -#include <vespa/searchlib/btree/noaggregated.h> -#include <vespa/searchlib/btree/minmaxaggregated.h> +#include <vespa/vespalib/btree/noaggregated.h> +#include <vespa/vespalib/btree/minmaxaggregated.h> namespace search::btree::test { diff --git a/searchlib/src/vespa/searchlib/test/btree/btree_printer.h b/vespalib/src/vespa/vespalib/test/btree/btree_printer.h index 3d3f8c35c16..b5d0e6b5ccb 100644 --- a/searchlib/src/vespa/searchlib/test/btree/btree_printer.h +++ b/vespalib/src/vespa/vespalib/test/btree/btree_printer.h @@ -4,7 +4,7 @@ #include "data_printer.h" #include "aggregated_printer.h" -#include <vespa/searchlib/btree/btreenodeallocator.h> +#include <vespa/vespalib/btree/btreenodeallocator.h> namespace search::btree::test { diff --git a/searchlib/src/vespa/searchlib/test/btree/data_printer.h b/vespalib/src/vespa/vespalib/test/btree/data_printer.h index 26b77da0db7..26b77da0db7 100644 --- a/searchlib/src/vespa/searchlib/test/btree/data_printer.h +++ b/vespalib/src/vespa/vespalib/test/btree/data_printer.h diff --git a/searchlib/src/vespa/searchlib/test/datastore/memstats.h b/vespalib/src/vespa/vespalib/test/datastore/memstats.h index 0a5373d0c78..3486f255358 100644 --- a/searchlib/src/vespa/searchlib/test/datastore/memstats.h +++ b/vespalib/src/vespa/vespalib/test/datastore/memstats.h @@ -3,6 +3,7 @@ #pragma once #include <vespa/vespalib/util/memoryusage.h> +#include <cassert> namespace search::datastore::test { diff --git a/vespalib/src/vespa/vespalib/util/CMakeLists.txt b/vespalib/src/vespa/vespalib/util/CMakeLists.txt index 00e232b77d4..6bbe61170fb 100644 --- a/vespalib/src/vespa/vespalib/util/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/util/CMakeLists.txt @@ -6,10 +6,12 @@ vespa_add_library(vespalib_vespalib_util OBJECT alloc.cpp approx.cpp array.cpp + assert.cpp backtrace.cpp barrier.cpp benchmark_timer.cpp blockingthreadstackexecutor.cpp + bufferwriter.cpp box.cpp classname.cpp closuretask.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/assert.cpp b/vespalib/src/vespa/vespalib/util/assert.cpp index 0482d873f7f..0482d873f7f 100644 --- a/staging_vespalib/src/vespa/vespalib/util/assert.cpp +++ b/vespalib/src/vespa/vespalib/util/assert.cpp diff --git a/staging_vespalib/src/vespa/vespalib/util/assert.h b/vespalib/src/vespa/vespalib/util/assert.h index 698fa6774c1..698fa6774c1 100644 --- a/staging_vespalib/src/vespa/vespalib/util/assert.h +++ b/vespalib/src/vespa/vespalib/util/assert.h diff --git a/searchlib/src/vespa/searchlib/util/bufferwriter.cpp b/vespalib/src/vespa/vespalib/util/bufferwriter.cpp index 6e57d6f58d4..6e57d6f58d4 100644 --- a/searchlib/src/vespa/searchlib/util/bufferwriter.cpp +++ b/vespalib/src/vespa/vespalib/util/bufferwriter.cpp diff --git a/searchlib/src/vespa/searchlib/util/bufferwriter.h b/vespalib/src/vespa/vespalib/util/bufferwriter.h index 3da6e3f8030..3da6e3f8030 100644 --- a/searchlib/src/vespa/searchlib/util/bufferwriter.h +++ b/vespalib/src/vespa/vespalib/util/bufferwriter.h diff --git a/staging_vespalib/src/vespa/vespalib/util/rand48.h b/vespalib/src/vespa/vespalib/util/rand48.h index 441f8e6e10f..441f8e6e10f 100644 --- a/staging_vespalib/src/vespa/vespalib/util/rand48.h +++ b/vespalib/src/vespa/vespalib/util/rand48.h |