Merge commit 'f2c1cd6792b45f04968d3c3d335723430be2e6a9' into redwood-page-lifetimes
This commit is contained in:
commit
6b55d8ff01
|
@ -743,7 +743,10 @@ public:
|
|||
}
|
||||
|
||||
// Read nPages from pageOffset*sizeof(Page) offset in file self->files[file]
|
||||
ACTOR static Future<Standalone<StringRef>> read(RawDiskQueue_TwoFiles* self, int file, int pageOffset, int nPages) {
|
||||
ACTOR static UNCANCELLABLE Future<Standalone<StringRef>> read(RawDiskQueue_TwoFiles* self,
|
||||
int file,
|
||||
int pageOffset,
|
||||
int nPages) {
|
||||
state TrackMe trackMe(self);
|
||||
state const size_t bytesRequested = nPages * sizeof(Page);
|
||||
state Standalone<StringRef> result = makeAlignedString(sizeof(Page), bytesRequested);
|
||||
|
|
Loading…
Reference in New Issue