Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ray6080 committed Aug 26, 2023
1 parent b1d46ea commit f253c4c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
23 changes: 13 additions & 10 deletions src/include/storage/copier/column_chunk.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,33 @@ namespace storage {
class NullColumnChunk;

struct BaseColumnChunkMetadata {
common::page_idx_t pageIdx = common::INVALID_PAGE_IDX;
common::page_idx_t numPages = 0;

BaseColumnChunkMetadata() = default;
BaseColumnChunkMetadata() : pageIdx{common::INVALID_PAGE_IDX}, numPages{0} {}
BaseColumnChunkMetadata(common::page_idx_t pageIdx, common::page_idx_t numPages)
: pageIdx(pageIdx), numPages(numPages) {}

virtual ~BaseColumnChunkMetadata() = default;

common::page_idx_t pageIdx;
common::page_idx_t numPages;
};

struct ColumnChunkMetadata : public BaseColumnChunkMetadata {
uint64_t numValues = UINT64_MAX;

ColumnChunkMetadata() = default;
ColumnChunkMetadata() : BaseColumnChunkMetadata(), numValues{UINT64_MAX} {}
ColumnChunkMetadata(
common::page_idx_t pageIdx, common::page_idx_t numPages, uint64_t numNodesInChunk)
: BaseColumnChunkMetadata{pageIdx, numPages}, numValues(numNodesInChunk) {}

uint64_t numValues;
};

struct OverflowColumnChunkMetadata : public BaseColumnChunkMetadata {
common::offset_t lastOffsetInPage = common::INVALID_OFFSET;

OverflowColumnChunkMetadata() = default;
OverflowColumnChunkMetadata()
: BaseColumnChunkMetadata(), lastOffsetInPage{common::INVALID_OFFSET} {}
OverflowColumnChunkMetadata(
common::page_idx_t pageIdx, common::page_idx_t numPages, common::offset_t lastOffsetInPage)
: BaseColumnChunkMetadata{pageIdx, numPages}, lastOffsetInPage(lastOffsetInPage) {}

common::offset_t lastOffsetInPage;
};

// Base data segment covers all fixed-sized data types.
Expand Down
2 changes: 0 additions & 2 deletions src/include/storage/copier/reader_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ struct ReaderFunctionData {
ReaderFunctionData(common::CSVReaderConfig csvReaderConfig, catalog::TableSchema* tableSchema)
: csvReaderConfig{csvReaderConfig}, tableSchema{tableSchema} {}

virtual ~ReaderFunctionData() = default;

common::CSVReaderConfig csvReaderConfig;
catalog::TableSchema* tableSchema;
};
Expand Down
1 change: 0 additions & 1 deletion src/storage/store/node_column.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ page_idx_t NodeColumn::append(
ColumnChunkMetadata metadata{startPageIdx, numPagesForChunk, columnChunk->getNumValues()};
metadataDA->resize(nodeGroupIdx + 1);
metadataDA->update(nodeGroupIdx, metadata);
assert(metadata.numPages != 0);
numPagesFlushed += numPagesForChunk;
startPageIdx += numPagesForChunk;
// Null column chunk.
Expand Down

0 comments on commit f253c4c

Please sign in to comment.