Skip to content
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

April 2024 warning police #4297

Merged
merged 18 commits into from
May 7, 2024
Merged

April 2024 warning police #4297

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
aad0d9a
Reorder Peer initializer expressions
graydon Apr 25, 2024
4c40904
use std::ignore to ignore redundant copies of asio error codes.
graydon Apr 25, 2024
9dc02de
Some IWYU include-gardening in overlay.
graydon Apr 25, 2024
c5cfd05
Add a missing `override`
graydon Apr 25, 2024
eb6a19b
Remove unused lambda capture clauses
graydon Apr 25, 2024
1d7e0b6
Remove dead variables
graydon Apr 25, 2024
649f601
Fix a stray assert -> releaseAssert.
graydon Apr 25, 2024
119d5e7
Reformat under clang-format-12
graydon Apr 26, 2024
1bb88b7
Fix `version` lambda capture in a way more MSVC-bug-friendly
graydon Apr 26, 2024
080ee6d
Some IWYU include-gardening in bucket.
graydon May 2, 2024
39e8014
Remove needless version and ConfigGen from test
graydon May 2, 2024
4b8e5e0
VC++ fix: add an explicit "path" for opening XDRStream
MonsieurNicolas May 2, 2024
7220042
std::optional ends up moving asio_context which is "noncopyable"
MonsieurNicolas May 2, 2024
543a01c
Work around MSVC compiler/STL bug preventing move-only lambdas in pac…
graydon May 3, 2024
76c4c32
Move template to header, MSVC dislikes explicit instantiations
graydon May 3, 2024
4eb852f
Add wsl to a bunch of MSVC build step commands
graydon May 3, 2024
45503d2
format
graydon May 3, 2024
efb9d1e
Break circular include that defeats template instantiation rules
graydon May 3, 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
30 changes: 20 additions & 10 deletions Builds/VisualStudio/stellar-core.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -1243,27 +1243,27 @@ exit /b 0
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">false</ExcludedFromBuild>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">running hash-xdrs.sh</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h</AdditionalInputs>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">None</OutputItemType>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">running hash-xdrs.sh</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h</AdditionalInputs>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">None</OutputItemType>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-curr &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">running hash-xdrs.sh</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h</AdditionalInputs>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">None</OutputItemType>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">sh ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">running hash-xdrs.sh</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h</AdditionalInputs>
<OutputItemType Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">None</OutputItemType>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">sh ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl bash ../../hash-xdrs.sh ../../src/protocol-next &gt; src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">running hash-xdrs.sh</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">src/$(Configuration)/generated/xdr/XDRFilesSha256.cpp</Outputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">src/$(Configuration)/generated/xdr/Stellar-overlay.h;src/$(Configuration)/generated/xdr/Stellar-transaction.h;src/$(Configuration)/generated/xdr/Stellar-ledger.h;src/$(Configuration)/generated/xdr/Stellar-ledger-entries.h;src/$(Configuration)/generated/xdr/Stellar-SCP.h;src/$(Configuration)/generated/xdr/Stellar-types.h;src/$(Configuration)/generated/xdr/Stellar-contract-config-setting.h</AdditionalInputs>
@@ -1550,8 +1550,8 @@ exit /b 0
</CustomBuild>
<CustomBuild Include="..\..\src\main\StellarCoreVersion.cpp.in">
<FileType>Document</FileType>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">Generating StellarCoreVersion.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">Generating StellarCoreVersion.cpp</Message>
<Outputs Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">../../src/main/StellarCoreVersion.cpp</Outputs>
@@ -1560,9 +1560,9 @@ exit /b 0
</AdditionalInputs>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">
</AdditionalInputs>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">sed.exe -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl sed -e "s/%%%%VERSION%%%%/msvc custom/" &lt; %(FullPath) &gt; %(RelativeDir)\StellarCoreVersion.cpp</Command>
<Message Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">Generating StellarCoreVersion.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">Generating StellarCoreVersion.cpp</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">Generating StellarCoreVersion.cpp</Message>
@@ -1614,13 +1614,23 @@ $(OutDir)\bin\cxxbridge.exe ..\..\src\rust\src\lib.rs --output src\$(Configurati
<Message>running bison for XDRQueryParser.yy</Message>
<Outputs>../../src/util/xdrquery/XDRQueryParser.h</Outputs>
<BuildInParallel>true</BuildInParallel>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl bison --defines=../../src/util/xdrquery/XDRQueryParser.h --output=../../src/util/xdrquery/XDRQueryParser.cpp ../../src/util/xdrquery/XDRQueryParser.yy</Command>
</CustomBuild>
<CustomBuild Include="..\..\src\util\xdrquery\XDRQueryScanner.ll">
<FileType>Document</FileType>
<Command>flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
<Message>running flex for XDRQueryScanner.ll</Message>
<Outputs>../../src/util/xdrquery/XDRQueryScanner.cpp</Outputs>
<BuildInParallel>true</BuildInParallel>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseCurrV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNextV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugCurrV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='DebugNoPostgres|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
<Command Condition="'$(Configuration)|$(Platform)'=='ReleaseNextV|x64'">wsl flex --outfile=../../src/util/xdrquery/XDRQueryScanner.cpp ../../src/util/xdrquery/XDRQueryScanner.ll</Command>
</CustomBuild>
<None Include="libmedida\libmedida.vcxproj" />
</ItemGroup>
8 changes: 1 addition & 7 deletions src/bucket/Bucket.cpp
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
// ASIO is somewhat particular about when it gets included -- it wants to be the
// first to include <windows.h> -- so we try to include it before everything
// else.
#include "util/asio.h"
#include "util/asio.h" // IWYU pragma: keep
#include "bucket/Bucket.h"
#include "bucket/BucketApplicator.h"
#include "bucket/BucketList.h"
@@ -16,25 +16,19 @@
#include "bucket/MergeKey.h"
#include "crypto/Hex.h"
#include "crypto/Random.h"
#include "crypto/SHA.h"
#include "database/Database.h"
#include "ledger/LedgerHashUtils.h"
#include "ledger/LedgerTxn.h"
#include "ledger/LedgerTypeUtils.h"
#include "main/Application.h"
#include "medida/timer.h"
#include "util/Fs.h"
#include "util/GlobalChecks.h"
#include "util/Logging.h"
#include "util/TmpDir.h"
#include "util/XDRStream.h"
#include "util/types.h"
#include "xdrpp/message.h"
#include <Tracy.hpp>
#include <future>

#include "medida/counter.h"
#include "medida/meter.h"

namespace stellar
{
12 changes: 7 additions & 5 deletions src/bucket/Bucket.h
View file
Original file line number Diff line number Diff line change
@@ -5,16 +5,18 @@
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "bucket/BucketIndex.h"
#include "crypto/Hex.h"
#include "overlay/StellarXDR.h"
#include "util/NonCopyable.h"
#include "util/ProtocolVersion.h"
#include "util/UnorderedMap.h"
#include "util/UnorderedSet.h"
#include "util/XDRStream.h"
#include "xdr/Stellar-ledger.h"
#include <list>
#include <optional>
#include <string>

namespace asio
{
class io_context;
}

namespace medida
{
class Counter;
2 changes: 1 addition & 1 deletion src/bucket/BucketApplicator.cpp
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
// under the Apache License, Version 2.0. See the COPYING file at the root
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "util/asio.h"
#include "util/asio.h" // IWYU pragma: keep
#include "bucket/BucketApplicator.h"
#include "bucket/Bucket.h"
#include "bucket/BucketList.h"
2 changes: 0 additions & 2 deletions src/bucket/BucketApplicator.h
View file
Original file line number Diff line number Diff line change
@@ -6,9 +6,7 @@

#include "bucket/Bucket.h"
#include "bucket/BucketInputIterator.h"
#include "ledger/LedgerHashUtils.h"
#include "util/Timer.h"
#include "util/XDRStream.h"
#include <memory>

namespace stellar
4 changes: 2 additions & 2 deletions src/bucket/BucketIndex.h
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
// under the Apache License, Version 2.0. See the COPYING file at the root
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "bucket/LedgerCmp.h"
#include "util/GlobalChecks.h"
#include "util/NonCopyable.h"
#include <atomic>
#include "util/XDROperators.h" // IWYU pragma: keep
#include "xdr/Stellar-ledger-entries.h"
#include <filesystem>
#include <memory>
#include <optional>
3 changes: 1 addition & 2 deletions src/bucket/BucketIndexImpl.cpp
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@
#include "bucket/BucketIndexImpl.h"
#include "bucket/Bucket.h"
#include "bucket/BucketManager.h"
#include "bucket/LedgerCmp.h"
#include "ledger/LedgerHashUtils.h"
#include "crypto/ShortHash.h"
#include "main/Config.h"
#include "util/Fs.h"
#include "util/LogSlowExecution.h"
1 change: 0 additions & 1 deletion src/bucket/BucketInputIterator.h
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
// under the Apache License, Version 2.0. See the COPYING file at the root
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "bucket/LedgerCmp.h"
#include "util/XDRStream.h"
#include "xdr/Stellar-ledger.h"

8 changes: 0 additions & 8 deletions src/bucket/BucketList.cpp
View file
Original file line number Diff line number Diff line change
@@ -7,24 +7,16 @@
#include "bucket/BucketInputIterator.h"
#include "bucket/BucketManager.h"
#include "bucket/BucketSnapshot.h"
#include "bucket/LedgerCmp.h"
#include "crypto/Hex.h"
#include "crypto/Random.h"
#include "crypto/SHA.h"
#include "ledger/LedgerHashUtils.h"
#include "ledger/LedgerManager.h"
#include "ledger/LedgerTxn.h"
#include "ledger/LedgerTypeUtils.h"
#include "main/Application.h"
#include "util/GlobalChecks.h"
#include "util/Logging.h"
#include "util/ProtocolVersion.h"
#include "util/UnorderedSet.h"
#include "util/XDRStream.h"
#include "util/types.h"

#include "medida/counter.h"
#include "medida/metrics_registry.h"

#include <Tracy.hpp>
#include <fmt/format.h>
6 changes: 0 additions & 6 deletions src/bucket/BucketList.h
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,6 @@

#include "bucket/Bucket.h"
#include "bucket/FutureBucket.h"
#include "bucket/LedgerCmp.h"
#include "overlay/StellarXDR.h"
#include "xdrpp/message.h"
#include <future>
#include <optional>
#include <set>

namespace medida
{
5 changes: 2 additions & 3 deletions src/bucket/BucketListSnapshot.cpp
View file
Original file line number Diff line number Diff line change
@@ -4,11 +4,10 @@

#include "bucket/BucketListSnapshot.h"
#include "bucket/BucketInputIterator.h"
#include "crypto/SecretKey.h"
#include "crypto/SecretKey.h" // IWYU pragma: keep
#include "ledger/LedgerTxn.h"

#include "medida/meter.h"
#include "medida/metrics_registry.h"
#include "medida/timer.h"

namespace stellar
{
2 changes: 1 addition & 1 deletion src/bucket/BucketListSnapshot.h
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ class SearchableBucketListSnapshot : public NonMovableOrCopyable

SearchableBucketListSnapshot(BucketSnapshotManager const& snapshotManager);

friend std::unique_ptr<SearchableBucketListSnapshot>
friend std::shared_ptr<SearchableBucketListSnapshot>
BucketSnapshotManager::getSearchableBucketListSnapshot() const;

public:
2 changes: 1 addition & 1 deletion src/bucket/BucketManager.h
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,8 @@
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "bucket/Bucket.h"
#include "overlay/StellarXDR.h"
#include "util/NonCopyable.h"
#include "util/types.h"
#include <future>
#include <map>
#include <memory>
4 changes: 2 additions & 2 deletions src/bucket/BucketManagerImpl.cpp
View file
Original file line number Diff line number Diff line change
@@ -14,19 +14,19 @@
#include "historywork/VerifyBucketWork.h"
#include "ledger/LedgerManager.h"
#include "ledger/LedgerTxn.h"
#include "ledger/LedgerTypeUtils.h"
#include "main/Application.h"
#include "main/Config.h"
#include "overlay/StellarXDR.h"
#include "util/Fs.h"
#include "util/GlobalChecks.h"
#include "util/LogSlowExecution.h"
#include "util/Logging.h"
#include "util/TmpDir.h"
#include "util/types.h"
#include "xdr/Stellar-ledger.h"
#include <filesystem>
#include <fmt/chrono.h>
#include <fmt/format.h>
#include <fstream>
#include <map>
#include <regex>
#include <set>
4 changes: 2 additions & 2 deletions src/bucket/BucketManagerImpl.h
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#include "bucket/BucketList.h"
#include "bucket/BucketManager.h"
#include "bucket/BucketMergeMap.h"
#include "overlay/StellarXDR.h"
#include "xdr/Stellar-ledger.h"

#include <map>
#include <memory>
@@ -109,7 +109,7 @@ class BucketManagerImpl : public BucketManager
std::string const& getTmpDir() override;
std::string const& getBucketDir() const override;
BucketList& getBucketList() override;
BucketSnapshotManager& getBucketSnapshotManager() const;
BucketSnapshotManager& getBucketSnapshotManager() const override;
medida::Timer& getMergeTimer() override;
MergeCounters readMergeCounters() override;
void incrMergeCounters(MergeCounters const&) override;
2 changes: 1 addition & 1 deletion src/bucket/BucketMergeMap.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "bucket/MergeKey.h"
#include "util/HashOfHash.h"
#include "util/HashOfHash.h" // IWYU pragma: keep
#include "util/UnorderedMap.h"
#include "util/UnorderedSet.h"
#include "xdr/Stellar-types.h"
1 change: 0 additions & 1 deletion src/bucket/BucketOutputIterator.cpp
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@
#include "bucket/Bucket.h"
#include "bucket/BucketIndex.h"
#include "bucket/BucketManager.h"
#include "crypto/Random.h"
#include "util/GlobalChecks.h"
#include <Tracy.hpp>
#include <filesystem>
3 changes: 1 addition & 2 deletions src/bucket/BucketSnapshot.cpp
View file
Original file line number Diff line number Diff line change
@@ -7,8 +7,7 @@
#include "bucket/BucketListSnapshot.h"
#include "ledger/LedgerTxn.h"
#include "ledger/LedgerTypeUtils.h"

#include "medida/counter.h"
#include "util/XDRStream.h"

namespace stellar
{
6 changes: 3 additions & 3 deletions src/bucket/BucketSnapshot.h
View file
Original file line number Diff line number Diff line change
@@ -4,10 +4,10 @@
// under the Apache License, Version 2.0. See the COPYING file at the root
// of this distribution or at http://www.apache.org/licenses/LICENSE-2.0

#include "bucket/LedgerCmp.h"
#include "util/NonCopyable.h"
#include "util/UnorderedMap.h"
#include "util/UnorderedSet.h"
#include "util/types.h"
#include <list>
#include <set>

#include <optional>

Loading