Skip to content

Commit fb642f9

Browse files
toreggetoregge
committed
Remove shims.
1 parent 75e79ff commit fb642f9

11 files changed

Lines changed: 25 additions & 33 deletions

File tree

‎searchcore/src/vespa/searchcore/proton/attribute/flushableattribute.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <vespa/searchlib/attribute/attributememorysavetarget.h>
1212
#include <vespa/searchlib/attribute/attributesaver.h>
1313
#include <vespa/searchlib/attribute/attributevector.h>
14+
#include <vespa/searchlib/common/create_and_freeze_times.h>
1415
#include <vespa/searchlib/common/serialnumfileheadercontext.h>
1516
#include <vespa/searchlib/util/filekit.h>
1617
#include <vespa/vespalib/io/fileutil.h>
@@ -27,6 +28,7 @@ LOG_SETUP(".proton.attribute.flushableattribute");
2728

2829
using namespace search;
2930
using namespace vespalib;
31+
using search::common::CreateAndFreezeTimes;
3032
using search::common::FileHeaderContext;
3133
using search::common::SerialNumFileHeaderContext;
3234
using searchcorespi::IFlushTarget;
@@ -89,14 +91,14 @@ bool FlushableAttribute::Flusher::saveAttribute() {
8991
saveSuccess = _saver->save(saveTarget);
9092
if (saveSuccess) {
9193
_fattr._attr->set_size_on_disk(saveTarget.size_on_disk());
92-
_fattr._attr->set_last_flush_duration(FileHeaderContext::make_flush_duration(create_time));
94+
_fattr._attr->set_last_flush_duration(CreateAndFreezeTimes::make_flush_duration(create_time));
9395
}
9496
_saver.reset();
9597
} else {
9698
saveSuccess = _saveTarget.writeToFile(_fattr._tuneFileAttributes, fileHeaderContext);
9799
if (saveSuccess) {
98100
_fattr._attr->set_size_on_disk(_saveTarget.size_on_disk());
99-
_fattr._attr->set_last_flush_duration(FileHeaderContext::make_flush_duration(create_time));
101+
_fattr._attr->set_last_flush_duration(CreateAndFreezeTimes::make_flush_duration(create_time));
100102
}
101103
}
102104
}

‎searchcore/src/vespa/searchcore/proton/documentmetastore/documentmetastoreflushtarget.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <vespa/searchlib/attribute/attributefilesavetarget.h>
1212
#include <vespa/searchlib/attribute/attributememorysavetarget.h>
1313
#include <vespa/searchlib/attribute/attributesaver.h>
14+
#include <vespa/searchlib/common/create_and_freeze_times.h>
1415
#include <vespa/searchlib/common/serialnumfileheadercontext.h>
1516
#include <vespa/searchlib/util/filekit.h>
1617
#include <vespa/vespalib/io/fileutil.h>
@@ -24,6 +25,7 @@ LOG_SETUP(".proton.documentmetastore.documentmetastoreflushtarget");
2425

2526
using namespace search;
2627
using namespace vespalib;
28+
using search::common::CreateAndFreezeTimes;
2729
using search::common::FileHeaderContext;
2830
using search::common::SerialNumFileHeaderContext;
2931
using searchcorespi::FlushStats;
@@ -83,15 +85,15 @@ bool DocumentMetaStoreFlushTarget::Flusher::saveDocumentMetaStore() {
8385
saveSuccess = memorySaveTarget.writeToFile(_dmsft._tuneFileAttributes, fileHeaderContext);
8486
if (saveSuccess) {
8587
_dmsft._dms->set_size_on_disk(memorySaveTarget.size_on_disk());
86-
_dmsft._dms->set_last_flush_duration(FileHeaderContext::make_flush_duration(create_time));
88+
_dmsft._dms->set_last_flush_duration(CreateAndFreezeTimes::make_flush_duration(create_time));
8789
}
8890
}
8991
} else {
9092
search::AttributeFileSaveTarget saveTarget(_dmsft._tuneFileAttributes, fileHeaderContext);
9193
saveSuccess = _saver->save(saveTarget);
9294
if (saveSuccess) {
9395
_dmsft._dms->set_size_on_disk(saveTarget.size_on_disk());
94-
_dmsft._dms->set_last_flush_duration(FileHeaderContext::make_flush_duration(create_time));
96+
_dmsft._dms->set_last_flush_duration(CreateAndFreezeTimes::make_flush_duration(create_time));
9597
}
9698
_saver.reset();
9799
}

‎searchlib/src/vespa/searchlib/attribute/attribute_header.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "distance_metric_utils.h"
66

77
#include <vespa/searchcommon/attribute/iattributevector.h>
8-
#include <vespa/searchlib/common/fileheadercontext.h>
8+
#include <vespa/searchlib/common/create_and_freeze_times.h>
99
#include <vespa/vespalib/data/databuffer.h>
1010
#include <vespa/vespalib/data/fileheader.h>
1111

@@ -152,7 +152,7 @@ void AttributeHeader::internalExtractTags(const vespalib::GenericHeader& header)
152152
if (header.hasTag(versionTag)) {
153153
_version = header.getTag(versionTag).asInteger();
154154
}
155-
_flush_duration = common::FileHeaderContext::get_flush_duration(header);
155+
_flush_duration = common::CreateAndFreezeTimes(header).get_flush_duration();
156156
}
157157

158158
AttributeHeader AttributeHeader::extractTags(const vespalib::GenericHeader& header, const std::string& file_name) {

‎searchlib/src/vespa/searchlib/attribute/attributevector.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <vespa/fastlib/io/bufferedfile.h>
1919
#include <vespa/searchcommon/attribute/attribute_utils.h>
2020
#include <vespa/searchcommon/attribute/config.h>
21+
#include <vespa/searchlib/common/create_and_freeze_times.h>
2122
#include <vespa/searchlib/common/tunefileinfo.h>
2223
#include <vespa/searchlib/index/dummyfileheadercontext.h>
2324
#include <vespa/searchlib/query/query_term_decoder.h>
@@ -39,7 +40,7 @@ using vespalib::getLastErrorString;
3940
using document::AssignValueUpdate;
4041
using document::ValueUpdate;
4142
using search::attribute::SearchContextParams;
42-
using search::common::FileHeaderContext;
43+
using search::common::CreateAndFreezeTimes;
4344
using search::index::DummyFileHeaderContext;
4445
using search::queryeval::SearchIterator;
4546
using vespalib::Generation;
@@ -287,7 +288,7 @@ bool AttributeVector::save(IAttributeSaveTarget& saveTarget, std::string_view fi
287288
auto result = saver->save(saveTarget);
288289
if (result) {
289290
set_size_on_disk(saveTarget);
290-
set_last_flush_duration(FileHeaderContext::make_flush_duration(create_time));
291+
set_last_flush_duration(CreateAndFreezeTimes::make_flush_duration(create_time));
291292
}
292293
return result;
293294
}

‎searchlib/src/vespa/searchlib/attribute/readerbase.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "load_utils.h"
77

88
#include <vespa/fastlib/io/bufferedfile.h>
9-
#include <vespa/searchlib/common/fileheadercontext.h>
9+
#include <vespa/searchlib/common/create_and_freeze_times.h>
1010
#include <vespa/searchlib/util/disk_space_calculator.h>
1111
#include <vespa/searchlib/util/filesizecalculator.h>
1212
#include <vespa/vespalib/util/size_literals.h>
@@ -70,7 +70,7 @@ ReaderBase::ReaderBase(AttributeVector& attr)
7070
_enumerated = true;
7171
}
7272
_hasLoadData = hasData() && (!attr.needs_idx_file() || hasIdx()) && (!attr.hasWeightedSetType() || hasWeight());
73-
_flush_duration = common::FileHeaderContext::get_flush_duration(_datFile.header());
73+
_flush_duration = common::CreateAndFreezeTimes(_datFile.header()).get_flush_duration();
7474
}
7575

7676
ReaderBase::~ReaderBase() = default;

‎searchlib/src/vespa/searchlib/common/fileheadercontext.cpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,4 @@ void FileHeaderContext::setFreezeTime(GenericHeader& header) {
4040
}
4141
}
4242

43-
steady_clock::duration FileHeaderContext::get_flush_duration(const vespalib::GenericHeader& header) {
44-
return CreateAndFreezeTimes(header).get_flush_duration();
45-
}
46-
47-
steady_clock::duration FileHeaderContext::make_flush_duration(const steady_clock::time_point& create_time) {
48-
return CreateAndFreezeTimes::make_flush_duration(create_time);
49-
}
50-
5143
} // namespace search::common

‎searchlib/src/vespa/searchlib/common/fileheadercontext.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
22
#pragma once
33

4-
#include "create_and_freeze_times.h"
5-
64
#include <string>
75

86
namespace vespalib {
@@ -20,9 +18,6 @@ class FileHeaderContext {
2018

2119
static void addCreateAndFreezeTime(vespalib::GenericHeader& header);
2220
static void setFreezeTime(vespalib::GenericHeader& header);
23-
static std::chrono::steady_clock::duration get_flush_duration(const vespalib::GenericHeader& header);
24-
static std::chrono::steady_clock::duration
25-
make_flush_duration(const std::chrono::steady_clock::time_point& create_time);
2621
};
2722

2823
} // namespace search::common

‎searchlib/src/vespa/searchlib/tensor/hnsw_index.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <vespa/searchlib/attribute/address_space_components.h>
1515
#include <vespa/searchlib/attribute/address_space_usage.h>
16-
#include <vespa/searchlib/common/fileheadercontext.h>
16+
#include <vespa/searchlib/common/create_and_freeze_times.h>
1717
#include <vespa/searchlib/util/fileutil.h>
1818
#include <vespa/vespalib/util/deadline.h>
1919
#include <vespa/vespalib/util/memory_allocator.h>
@@ -29,7 +29,7 @@ LOG_SETUP(".searchlib.tensor.hnsw_index");
2929
namespace search::tensor {
3030

3131
using search::AddressSpaceComponents;
32-
using search::common::FileHeaderContext;
32+
using search::common::CreateAndFreezeTimes;
3333
using search::queryeval::GlobalFilter;
3434
using vespalib::Generation;
3535
using vespalib::GenerationGuard;
@@ -1026,7 +1026,7 @@ std::unique_ptr<NearestNeighborIndexLoader> HnswIndex<type>::make_loader(FastOS_
10261026
const vespalib::GenericHeader& header) {
10271027
assert(get_entry_nodeid() == 0); // cannot load after index has data
10281028
load_mips_max_distance(header, distance_function_factory());
1029-
_graph.set_last_flush_duration(FileHeaderContext::get_flush_duration(header));
1029+
_graph.set_last_flush_duration(CreateAndFreezeTimes(header).get_flush_duration());
10301030
using ReaderType = FileReader<uint32_t>;
10311031
using LoaderType = HnswIndexLoader<ReaderType, type>;
10321032
return std::make_unique<LoaderType>(_graph, _id_mapping, std::make_unique<ReaderType>(&file));

‎searchlib/src/vespa/searchlib/tensor/hnsw_index_saver.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
#include "hnsw_graph.h"
66

7-
#include <vespa/searchlib/common/fileheadercontext.h>
7+
#include <vespa/searchlib/common/create_and_freeze_times.h>
88
#include <vespa/searchlib/util/bufferwriter.h>
99

1010
#include <cassert>
1111
#include <limits>
1212

13-
using search::common::FileHeaderContext;
13+
using search::common::CreateAndFreezeTimes;
1414
using vespalib::GenerationGuard;
1515

1616
namespace search::tensor {
@@ -39,7 +39,7 @@ template <HnswIndexType type> HnswIndexSaver<type>::Metadata::~Metadata() = defa
3939

4040
template <HnswIndexType type> HnswIndexSaver<type>::~HnswIndexSaver() {
4141
_guard = GenerationGuard();
42-
_graph.set_last_flush_duration(FileHeaderContext::make_flush_duration(_index_flush_start_time));
42+
_graph.set_last_flush_duration(CreateAndFreezeTimes::make_flush_duration(_index_flush_start_time));
4343
}
4444

4545
template <HnswIndexType type>

‎searchlib/src/vespa/searchlib/util/file_with_header.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "filesizecalculator.h"
77

88
#include <vespa/fastos/file_interface.h>
9-
#include <vespa/searchlib/common/fileheadercontext.h>
9+
#include <vespa/searchlib/common/create_and_freeze_times.h>
1010
#include <vespa/searchlib/util/disk_space_calculator.h>
1111
#include <vespa/vespalib/util/size_literals.h>
1212

@@ -40,7 +40,7 @@ FileWithHeader::FileWithHeader(std::unique_ptr<FastOS_FileInterface> file_in)
4040
bool close_ok = _file->Close();
4141
assert(close_ok);
4242
}
43-
_flush_duration = common::FileHeaderContext::get_flush_duration(_header);
43+
_flush_duration = common::CreateAndFreezeTimes(_header).get_flush_duration();
4444
}
4545
}
4646

0 commit comments

Comments
 (0)