diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-05-27 10:40:48 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2019-05-27 13:58:49 +0000 |
commit | 1b3e34605eba38778deaa09f81998c9b8c80acc7 (patch) | |
tree | 49d96ed7b1cdf57f58bd3cbe2383d55f1c320edf /searchlib/src/tests/predicate | |
parent | 92dca89a98d9912fdefc0150fa914b788acfa056 (diff) |
Move datastore and btree code from searchlib to vespalib
Namespace is still `search` and not `vespalib` due to the massive
amount of code that would need to be modified for such a change.
Other changes:
- Move `BufferWriter` from searchlib to vespalib
- Move assertion and rand48 utilities from staging_vespalib to vespalib
- Move gtest utility code from staging_vespalib to vespalib
Diffstat (limited to 'searchlib/src/tests/predicate')
5 files changed, 13 insertions, 13 deletions
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> |