diff options
| author | Geir Storli <geirst@yahooinc.com> | 2023-02-07 16:03:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-07 16:03:06 +0100 |
| commit | 260788dbcc76f4b7b0855bfa48e23495a1561e91 (patch) | |
| tree | 801c3b04edadaf93f3c05958031202f9adb39668 /searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h | |
| parent | c71bc7f0582f0c29476310dec2c1c12762bcbb8d (diff) | |
| parent | 1fb56a093caf4369189e0d00ff3e406d674ec420 (diff) | |
Merge pull request #25919 from vespa-engine/toregge/pass-optional-serial-num-to-prepare-reconfigv8.121.38
Pass optional serial num to prepare reconfig
Diffstat (limited to 'searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h')
| -rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h index cec2e8595cf..e4c140e43e6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_doc_subdb.h @@ -110,8 +110,8 @@ public: void setup(const DocumentSubDbInitializerResult &initResult) override; void initViews(const DocumentDBConfig &configSnapshot) override; - std::unique_ptr<const DocumentSubDBReconfig> - prepare_reconfig(const DocumentDBConfig& new_config_snapshot, const DocumentDBConfig& old_config_snapshot, const ReconfigParams& reconfig_params) override; + std::unique_ptr<DocumentSubDBReconfig> + prepare_reconfig(const DocumentDBConfig& new_config_snapshot, const DocumentDBConfig& old_config_snapshot, const ReconfigParams& reconfig_params, std::optional<SerialNum> serial_num) override; IReprocessingTask::List applyConfig(const DocumentDBConfig &newConfigSnapshot, const DocumentDBConfig &oldConfigSnapshot, SerialNum serialNum, const ReconfigParams ¶ms, IDocumentDBReferenceResolver &resolver, const DocumentSubDBReconfig& prepared_reconfig) override; |