Skip to content

Commit 7c6bd1b

Browse files
authored
p1: use owned promise for disk scheduler (#610)
Signed-off-by: Alex Chi <[email protected]>
1 parent 558030f commit 7c6bd1b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/include/storage/disk/disk_scheduler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ struct DiskRequest {
3939
page_id_t page_id_;
4040

4141
/** Callback used to signal to the request issuer when the request has been completed. */
42-
std::promise<bool> &callback_;
42+
std::promise<bool> callback_;
4343
};
4444

4545
/**

test/storage/disk_scheduler_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ TEST(DiskSchedulerTest, DISABLED_ScheduleWriteReadPageTest) {
3838
auto promise2 = disk_scheduler->CreatePromise();
3939
auto future2 = promise2.get_future();
4040

41-
disk_scheduler->Schedule({/*is_write=*/true, reinterpret_cast<char *>(&data), /*page_id=*/0, promise1});
42-
disk_scheduler->Schedule({/*is_write=*/false, reinterpret_cast<char *>(&buf), /*page_id=*/0, promise2});
41+
disk_scheduler->Schedule({/*is_write=*/true, reinterpret_cast<char *>(&data), /*page_id=*/0, std::move(promise1)});
42+
disk_scheduler->Schedule({/*is_write=*/false, reinterpret_cast<char *>(&buf), /*page_id=*/0, std::move(promise2)});
4343

4444
ASSERT_TRUE(future1.get());
4545
ASSERT_TRUE(future2.get());

0 commit comments

Comments
 (0)