MDEV-36926 Support building against Asio 1.14.1 through 1.38.0#58
Open
mariadb-TeemuOllakka wants to merge 11 commits into
Open
MDEV-36926 Support building against Asio 1.14.1 through 1.38.0#58mariadb-TeemuOllakka wants to merge 11 commits into
mariadb-TeemuOllakka wants to merge 11 commits into
Conversation
Adjust page_size in top_level_seqno_lock_protects_ist_buffers to account for 4.ee per-page meta overhead (gcache::Page::meta_size()).
…-mysql-branch-parsing
Make the provider build across all current Asio releases and against any Asio in the supported range, not just the bundled copy. CMake (cmake/asio.cmake): * Add GALERA_CUSTOM_ASIO_PATH to build against an out-of-tree Asio. * Lower the minimum version to 1.14.1 to match the bundled copy and drop the upper bound, so newer Asio is compiled rather than rejected at configure time. Source: Asio 1.33.0 enables ASIO_NO_DEPRECATED by default and removes a batch of long-deprecated APIs. Fix the breakages, guarded by ASIO_VERSION < 103300 to stay compatible with older versions: * io_context replaces the removed io_service typedef (via a native_type in AsioIoService::Impl); post()/reset() -> asio::post()/restart(). * basic_waitable_timer::expires_from_now() -> expires_after(). * asio::ip::address::from_string() -> asio::ip::make_address(); include asio/version.hpp so the guard is evaluated correctly. * The removed resolver::query/resolver::iterator give way to the resolve(host, service[, flags]) overload; the resolve helpers now return the first resolved endpoint directly, simplifying callers. Replace the remaining boost::bind uses with lambdas: Boost 1.74.0 no longer injects boost::bind's placeholders into the global namespace, so the unqualified usage failed to compile (seen with Asio 1.30.2). Add scripts/test_asio_versions.sh: builds and runs the unit tests against the bundled copy and the latest patch of every released Asio major.minor from 1.14 to 1.38. The whole range passes.
Add REPORT_ASIO_VERSION() to cmake/asio.cmake, which locates the asio/version.hpp of the Asio actually picked (custom path, system, or bundled), decodes ASIO_VERSION and prints "Using Asio version <major>.<minor>.<patch>" so the configure output shows which Asio the build resolved to.
asio::io_context exists in all supported Asio versions (1.14.1+), so drop the ASIO_VERSION < 103300 guards that fell back to the deprecated asio::io_service typedef for the include and native_type.
mariadb-TeemuOllakka
force-pushed
the
mariadb-4.x-MDEV-36926
branch
from
85b716e to
f1fc66e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make the provider build across all current Asio releases and against
any Asio in the supported range, not just the bundled copy.
CMake (cmake/asio.cmake):
drop the upper bound, so newer Asio is compiled rather than rejected
at configure time.
Source: Asio 1.33.0 enables ASIO_NO_DEPRECATED by default and removes
a batch of long-deprecated APIs. Fix the breakages, guarded by
ASIO_VERSION < 103300 to stay compatible with older versions:
in AsioIoService::Impl); post()/reset() -> asio::post()/restart().
asio/version.hpp so the guard is evaluated correctly.
resolve(host, service[, flags]) overload; the resolve helpers now
return the first resolved endpoint directly, simplifying callers.
Replace the remaining boost::bind uses with lambdas: Boost 1.74.0 no
longer injects boost::bind's placeholders into the global namespace,
so the unqualified usage failed to compile (seen with Asio 1.30.2).
Add scripts/test_asio_versions.sh: builds and runs the unit tests
against the bundled copy and the latest patch of every released Asio
major.minor from 1.14 to 1.38. The whole range passes.