Skip to content

Commit a400c13

Browse files
committed
Address review comments
1 parent ca54dbd commit a400c13

File tree

8 files changed

+20
-14
lines changed

8 files changed

+20
-14
lines changed

src/include/storage/free_space_manager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/**
2+
* We would like to thank Mingkun Ni and Mayank Jasoria for doing the initial research and
3+
* prototyping for the FreeSpaceManager in their CS 848 course project:
4+
* https://github.com/ericpolo/kuzu_cs848
5+
*/
6+
17
#pragma once
28

39
#include <optional>

src/include/storage/page_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "common/types/types.h"
66
#include "storage/free_space_manager.h"
7-
#include "storage/page_chunk_entry.h"
7+
#include "storage/page_range.h"
88

99
namespace kuzu {
1010
namespace transaction {

src/include/storage/store/column_chunk_metadata.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22

33
#include "common/types/types.h"
44
#include "storage/compression/compression.h"
5-
#include "storage/page_chunk_entry.h"
5+
#include "storage/page_range.h"
66

77
namespace kuzu::storage {
88
struct ColumnChunkMetadata {
9-
PageRange pageChunk;
9+
PageRange pageRange;
1010
uint64_t numValues;
1111
CompressionMetadata compMeta;
1212

13-
common::page_idx_t getStartPageIdx() const { return pageChunk.startPageIdx; }
14-
common::page_idx_t getNumPages() const { return pageChunk.numPages; }
13+
common::page_idx_t getStartPageIdx() const { return pageRange.startPageIdx; }
14+
common::page_idx_t getNumPages() const { return pageRange.numPages; }
1515

1616
// Returns the number of pages used to store data
1717
// In the case of ALP compression, this does not include the number of pages used to store
@@ -23,11 +23,11 @@ struct ColumnChunkMetadata {
2323

2424
// TODO(Guodong): Delete copy constructor.
2525
ColumnChunkMetadata()
26-
: pageChunk(common::INVALID_PAGE_IDX, 0), numValues{0},
26+
: pageRange(common::INVALID_PAGE_IDX, 0), numValues{0},
2727
compMeta(StorageValue(), StorageValue(), CompressionType::CONSTANT) {}
2828
ColumnChunkMetadata(common::page_idx_t pageIdx, common::page_idx_t numPages, uint64_t numValues,
2929
const CompressionMetadata& compMeta)
30-
: pageChunk(pageIdx, numPages), numValues(numValues), compMeta(compMeta) {}
30+
: pageRange(pageIdx, numPages), numValues(numValues), compMeta(compMeta) {}
3131
};
3232

3333
class GetCompressionMetadata {

src/storage/free_space_manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "common/serializer/deserializer.h"
44
#include "common/serializer/serializer.h"
55
#include "common/utils.h"
6-
#include "storage/page_chunk_entry.h"
6+
#include "storage/page_range.h"
77

88
namespace kuzu::storage {
99
static FreeSpaceManager::sorted_free_list_t& getFreeList(

src/storage/store/column.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ offset_t Column::appendValues(ColumnChunkData& persistentChunk, ChunkState& stat
352352
const auto numNewPages =
353353
writeValues(state, metadata.numValues, data, nullChunkData, 0 /*dataOffset*/, numValues);
354354
KU_ASSERT(numNewPages == 0);
355-
metadata.pageChunk.numPages += numNewPages;
355+
metadata.pageRange.numPages += numNewPages;
356356

357357
auto [minWritten, maxWritten] = getMinMaxStorageValue(data, 0 /*offset*/, numValues,
358358
dataType.getPhysicalType(), nullChunkData);

src/storage/store/column_chunk_data.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace kuzu {
3535
namespace storage {
3636

3737
void ChunkState::reclaimAllocatedPages(FileHandle& dataFH) const {
38-
const auto& entry = metadata.pageChunk;
38+
const auto& entry = metadata.pageRange;
3939
if (entry.startPageIdx != INVALID_PAGE_IDX) {
4040
dataFH.getPageManager()->freePageRange(entry);
4141
}

src/storage/store/column_chunk_metadata.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ ColumnChunkMetadata booleanGetMetadata(std::span<const uint8_t> buffer, uint64_t
7373
}
7474

7575
void ColumnChunkMetadata::serialize(common::Serializer& serializer) const {
76-
serializer.write(pageChunk.startPageIdx);
77-
serializer.write(pageChunk.numPages);
76+
serializer.write(pageRange.startPageIdx);
77+
serializer.write(pageRange.numPages);
7878
serializer.write(numValues);
7979
compMeta.serialize(serializer);
8080
}
8181

8282
ColumnChunkMetadata ColumnChunkMetadata::deserialize(common::Deserializer& deserializer) {
8383
ColumnChunkMetadata ret;
84-
deserializer.deserializeValue(ret.pageChunk.startPageIdx);
85-
deserializer.deserializeValue(ret.pageChunk.numPages);
84+
deserializer.deserializeValue(ret.pageRange.startPageIdx);
85+
deserializer.deserializeValue(ret.pageRange.numPages);
8686
deserializer.deserializeValue(ret.numValues);
8787
ret.compMeta = decltype(ret.compMeta)::deserialize(deserializer);
8888

0 commit comments

Comments
 (0)