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 /searchcore | |
| 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 'searchcore')
4 files changed, 10 insertions, 10 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 { |