summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-12-08 18:34:35 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2019-12-16 23:48:46 +0000
commitcea9cbdd71940cf7b40d6da6e93253c01f9c7564 (patch)
treec9454fcfed3c11baf7a1c16aceba8fecd801fdd3 /searchcore
parente11228ca3457aeeee7e9ac1ad4c78bf26e72f1b1 (diff)
Drop timestamp.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp8
-rw-r--r--searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h7
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp1
3 files changed, 5 insertions, 11 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp
index c5e6acd80ed..03c97ace048 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.cpp
@@ -15,7 +15,7 @@ WipeHistoryOperation::WipeHistoryOperation()
}
WipeHistoryOperation::WipeHistoryOperation(SerialNum serialNum,
- fastos::TimeStamp wipeTimeLimit)
+ int64_t wipeTimeLimit)
: FeedOperation(FeedOperation::WIPE_HISTORY),
_wipeTimeLimit(wipeTimeLimit)
{
@@ -26,14 +26,12 @@ void WipeHistoryOperation::serialize(vespalib::nbostream &str) const {
str << _wipeTimeLimit;
}
void WipeHistoryOperation::deserialize(vespalib::nbostream &str, const document::DocumentTypeRepo &) {
- fastos::TimeStamp::TimeT t;
- str >> t;
- _wipeTimeLimit = t;
+ str >> _wipeTimeLimit;
}
vespalib::string WipeHistoryOperation::toString() const {
return make_string("WipeHistory(wipeTimeLimit=%" PRIu64 ", serialNum=%" PRIu64 ")",
- _wipeTimeLimit.ns(), getSerialNum());
+ _wipeTimeLimit, getSerialNum());
}
} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h
index 0cf7256bf27..d036fee033a 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/wipehistoryoperation.h
@@ -2,20 +2,17 @@
#pragma once
#include "feedoperation.h"
-#include <vespa/fastos/timestamp.h>
namespace proton {
class WipeHistoryOperation : public FeedOperation {
- fastos::TimeStamp _wipeTimeLimit;
+ int64_t _wipeTimeLimit;
public:
WipeHistoryOperation();
- WipeHistoryOperation(SerialNum serialNum, fastos::TimeStamp wipeTimeLimit);
+ WipeHistoryOperation(SerialNum serialNum, int64_t wipeTimeLimit);
~WipeHistoryOperation() override {}
- fastos::TimeStamp getWipeTimeLimit() const { return _wipeTimeLimit; }
-
void serialize(vespalib::nbostream &str) const override;
void deserialize(vespalib::nbostream &str, const document::DocumentTypeRepo &) override;
vespalib::string toString() const override;
diff --git a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
index 92b59a678cc..f78f7703d21 100644
--- a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp
@@ -2,7 +2,6 @@
#include "replaypacketdispatcher.h"
#include <vespa/searchcore/proton/feedoperation/operations.h>
-#include <vespa/vespalib/util/exceptions.h>
#include <vespa/document/util/serializableexceptions.h>
using vespalib::make_string;