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 /storage | |
| 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 'storage')
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/btree_bucket_database.cpp | 20 | ||||
| -rw-r--r-- | storage/src/vespa/storage/bucketdb/btree_bucket_database.h | 4 |
2 files changed, 12 insertions, 12 deletions
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 { |