@@ -47,12 +47,10 @@ struct VersionedMessage {
4747 StringRef message;
4848 VectorRef<Tag> tags;
4949 Arena arena; // Keep a reference to the memory containing the message
50- Arena decryptArena; // Arena used for decrypt buffer.
5150
5251 VersionedMessage (LogMessageVersion v, StringRef m, const VectorRef<Tag>& t, const Arena& a)
5352 : version(v), message(m), tags(t), arena(a) {}
5453 Version getVersion () const { return version.version ; }
55- uint32_t getSubVersion () const { return version.sub ; }
5654 // Returns the estimated size of the message in bytes, assuming 6 tags.
5755 size_t getEstimatedSize () const { return message.size () + TagsAndMessage::getHeaderSize (6 ); }
5856
@@ -114,7 +112,6 @@ struct BackupData {
114112 LogEpoch oldestBackupEpoch = 0 ; // oldest epoch that still has data on tLogs for backup to pull
115113 Version minKnownCommittedVersion;
116114 Version savedVersion; // Largest version saved to blob storage
117- Reference<AsyncVar<ServerDBInfo> const > db;
118115 AsyncVar<Reference<LogSystemConsumer>> logSystem;
119116 Database cx;
120117 std::vector<VersionedMessage> messages;
@@ -268,7 +265,7 @@ struct BackupData {
268265 explicit BackupData (UID id, Reference<AsyncVar<ServerDBInfo> const > db, const InitializeBackupRequest& req)
269266 : myId(id), tag(req.tag), totalTags(req.totalTags), startVersion(req.startVersion), endVersion(req.endVersion),
270267 recruitedEpoch(req.recruitedEpoch), backupEpoch(req.backupEpoch), minKnownCommittedVersion(invalidVersion),
271- savedVersion(req.startVersion - 1 ), db(db), pulledVersion(0 ), paused(false ),
268+ savedVersion(req.startVersion - 1 ), pulledVersion(0 ), paused(false ),
272269 lock(new FlowLock(SERVER_KNOBS->BACKUP_WORKER_LOCK_BYTES)), cc(" BackupWorker" , myId.toString()) {
273270 cx = openDBOnServer (db, TaskPriority::DefaultEndpoint, LockAware::True);
274271
0 commit comments