summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHåvard Pettersen <havardpe@oath.com>2021-01-06 14:49:48 +0000
committerHåvard Pettersen <havardpe@oath.com>2021-01-11 11:08:19 +0000
commit32292572be63bf1725d34e4c071cd6690ecd43e8 (patch)
tree2306a12514572cfa6323a92ad120d5d8d5c69b60 /document
parent381e20b7609eb6557168425089a6a5c948c50554 (diff)
add string_id and simplify multi-handle container
add more testing static instance instead of lazy singleton use logging for leak detection drop label_t type alias
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/update/tensor_partial_update.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/document/src/vespa/document/update/tensor_partial_update.cpp b/document/src/vespa/document/update/tensor_partial_update.cpp
index f763c92741c..83741a0517a 100644
--- a/document/src/vespa/document/update/tensor_partial_update.cpp
+++ b/document/src/vespa/document/update/tensor_partial_update.cpp
@@ -44,7 +44,7 @@ struct DenseCoords {
}
~DenseCoords();
void clear() { offset = 0; current = 0; }
- void convert_label(label_t label_id) {
+ void convert_label(string_id label_id) {
vespalib::string label = SharedStringRepo::Handle::string_from_id(label_id);
uint32_t coord = 0;
for (char c : label) {
@@ -73,9 +73,9 @@ struct DenseCoords {
DenseCoords::~DenseCoords() = default;
struct SparseCoords {
- std::vector<label_t> addr;
- std::vector<label_t *> next_result_refs;
- std::vector<const label_t *> lookup_refs;
+ std::vector<string_id> addr;
+ std::vector<string_id *> next_result_refs;
+ std::vector<const string_id *> lookup_refs;
std::vector<size_t> lookup_view_dims;
SparseCoords(size_t sz)
: addr(sz), next_result_refs(sz), lookup_refs(sz), lookup_view_dims(sz)
@@ -329,7 +329,7 @@ calc_mapped_dimension_indexes(const ValueType& input_type,
struct ModifierCoords {
- std::vector<const label_t *> lookup_refs;
+ std::vector<const string_id *> lookup_refs;
std::vector<size_t> lookup_view_dims;
ModifierCoords(const SparseCoords& input_coords,