Skip to content
This repository has been archived by the owner on May 9, 2024. It is now read-only.

Move TableFragmentsInfo and FragmentInfo code to proper lib. #554

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Move TableFragmentsInfo and FragmentInfo code to proper lib. #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions omniscidb/DataProvider/TableFragmentsInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,19 @@ class FragmentInfo {
chunkMetadataMap[col] = chunkMetadata;
}

const ChunkMetadataMap& getChunkMetadataMap() const;
const ChunkMetadataMap& getChunkMetadataMap() const { return chunkMetadataMap; }

const ChunkMetadataMap& getChunkMetadataMapPhysical() const { return chunkMetadataMap; }

ChunkMetadataMap getChunkMetadataMapPhysicalCopy() const;
ChunkMetadataMap getChunkMetadataMapPhysicalCopy() const {
ChunkMetadataMap metadata_map;
for (const auto& [column_id, chunk_metadata] : chunkMetadataMap) {
metadata_map[column_id] = std::make_shared<ChunkMetadata>(*chunk_metadata);
}
return metadata_map;
}

size_t getNumTuples() const;
size_t getNumTuples() const { return numTuples; }

size_t getPhysicalNumTuples() const { return numTuples; }

Expand All @@ -71,15 +77,22 @@ class TableFragmentsInfo {
public:
TableFragmentsInfo() : numTuples(0) {}

size_t getNumTuples() const;
size_t getNumTuples() const { return numTuples; }

size_t getNumTuplesUpperBound() const;
size_t getNumTuplesUpperBound() const { return numTuples; }

size_t getPhysicalNumTuples() const { return numTuples; }

void setPhysicalNumTuples(const size_t physNumTuples) { numTuples = physNumTuples; }

size_t getFragmentNumTuplesUpperBound() const;
size_t getFragmentNumTuplesUpperBound() const {
size_t fragment_num_tupples_upper_bound = 0;
for (const auto& fragment : fragments) {
fragment_num_tupples_upper_bound =
std::max(fragment.getNumTuples(), fragment_num_tupples_upper_bound);
}
return fragment_num_tupples_upper_bound;
}

std::vector<int> chunkKeyPrefix;
std::vector<FragmentInfo> fragments;
Expand Down
33 changes: 0 additions & 33 deletions omniscidb/QueryEngine/InputMetadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,36 +98,3 @@ std::vector<InputTableInfo> get_table_infos(const RelAlgExecutionUnit& ra_exe_un
collect_table_infos(table_infos, ra_exe_unit.input_descs, executor);
return table_infos;
}

const ChunkMetadataMap& FragmentInfo::getChunkMetadataMap() const {
return chunkMetadataMap;
}

ChunkMetadataMap FragmentInfo::getChunkMetadataMapPhysicalCopy() const {
ChunkMetadataMap metadata_map;
for (const auto& [column_id, chunk_metadata] : chunkMetadataMap) {
metadata_map[column_id] = std::make_shared<ChunkMetadata>(*chunk_metadata);
}
return metadata_map;
}

size_t FragmentInfo::getNumTuples() const {
return numTuples;
}

size_t TableFragmentsInfo::getNumTuples() const {
return numTuples;
}

size_t TableFragmentsInfo::getNumTuplesUpperBound() const {
return numTuples;
}

size_t TableFragmentsInfo::getFragmentNumTuplesUpperBound() const {
size_t fragment_num_tupples_upper_bound = 0;
for (const auto& fragment : fragments) {
fragment_num_tupples_upper_bound =
std::max(fragment.getNumTuples(), fragment_num_tupples_upper_bound);
}
return fragment_num_tupples_upper_bound;
}