Skip to content

I do not want to think about this code #67312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexey-milovidov merged 2 commits into from
Jul 29, 2024
Merged

I do not want to think about this code #67312

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b8431
I do not want to think about this code
alexey-milovidov Jul 28, 2024
031c3aa
Merge branch 'master' into less-complex
alexey-milovidov Jul 29, 2024
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
20 changes: 10 additions & 10 deletions src/Storages/MergeTree/MergeTreeData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4405,25 +4405,25 @@ bool MergeTreeData::tryRemovePartImmediately(DataPartPtr && part)

size_t MergeTreeData::getTotalActiveSizeInBytes() const
{
return total_active_size_bytes.load(std::memory_order_acquire);
return total_active_size_bytes.load();
}


size_t MergeTreeData::getTotalActiveSizeInRows() const
{
return total_active_size_rows.load(std::memory_order_acquire);
return total_active_size_rows.load();
}


size_t MergeTreeData::getActivePartsCount() const
{
return total_active_size_parts.load(std::memory_order_acquire);
return total_active_size_parts.load();
}


size_t MergeTreeData::getOutdatedPartsCount() const
{
return total_outdated_parts_count.load(std::memory_order_relaxed);
return total_outdated_parts_count.load();
}

size_t MergeTreeData::getNumberOfOutdatedPartsWithExpiredRemovalTime() const
Expand Down Expand Up @@ -8184,16 +8184,16 @@ void MergeTreeData::removePartContributionToDataVolume(const DataPartPtr & part)

void MergeTreeData::increaseDataVolume(ssize_t bytes, ssize_t rows, ssize_t parts)
{
total_active_size_bytes.fetch_add(bytes, std::memory_order_acq_rel);
total_active_size_rows.fetch_add(rows, std::memory_order_acq_rel);
total_active_size_parts.fetch_add(parts, std::memory_order_acq_rel);
total_active_size_bytes.fetch_add(bytes);
total_active_size_rows.fetch_add(rows);
total_active_size_parts.fetch_add(parts);
}

void MergeTreeData::setDataVolume(size_t bytes, size_t rows, size_t parts)
{
total_active_size_bytes.store(bytes, std::memory_order_release);
total_active_size_rows.store(rows, std::memory_order_release);
total_active_size_parts.store(parts, std::memory_order_release);
total_active_size_bytes.store(bytes);
total_active_size_rows.store(rows);
total_active_size_parts.store(parts);
}

bool MergeTreeData::insertQueryIdOrThrow(const String & query_id, size_t max_queries) const
Expand Down