diff -pruN 1.30.4-1/.clang-format 2.0.2-1/.clang-format --- 1.30.4-1/.clang-format 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.clang-format 2025-06-19 15:42:22.000000000 +0000 @@ -53,6 +53,9 @@ AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: MultiLine AttributeMacros: - __capability + - BSON_GNUC_WARN_UNUSED_RESULT + - BSON_DEPRECATED + - BSON_DEPRECATED_FOR BinPackArguments: false BinPackParameters: false BitFieldColonSpacing: Both @@ -102,7 +105,12 @@ ForEachMacros: - foreach - Q_FOREACH - BOOST_FOREACH + - mlib_foreach_irange + - mlib_foreach_urange + - mlib_foreach + - mlib_foreach_arr IfMacros: + - mlib_assert_aborts - KJ_IF_MAYBE IncludeBlocks: Preserve IncludeCategories: diff -pruN 1.30.4-1/.evergreen/benchmark.yml 2.0.2-1/.evergreen/benchmark.yml --- 1.30.4-1/.evergreen/benchmark.yml 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/benchmark.yml 2025-06-19 15:42:22.000000000 +0000 @@ -35,7 +35,7 @@ variables: set -o errexit set -o verbose - cmake -DENABLE_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=mongoc -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF . && make -j8 && make install + cmake -DENABLE_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=mongoc . && make -j8 && make install git clone https://github.com/mongodb/mongo-c-driver-performance.git cd mongo-c-driver-performance cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=../mongoc . && make -j8 diff -pruN 1.30.4-1/.evergreen/config_generator/components/abi_compliance_check.py 2.0.2-1/.evergreen/config_generator/components/abi_compliance_check.py --- 1.30.4-1/.evergreen/config_generator/components/abi_compliance_check.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/abi_compliance_check.py 2025-06-19 15:42:22.000000000 +0000 @@ -30,8 +30,8 @@ class CheckABICompliance(Function): aws_secret='${aws_secret}', bucket='mciuploads', content_type='text/html', - display_name='ABI Report:', - local_files_include_filter='mongoc/abi-compliance/compat_reports/**/*.html', + display_name='ABI Compliance Check: ', + local_files_include_filter='abi-compliance/compat_reports/**/compat_report.html', permissions='public-read', remote_file='mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/', ), diff -pruN 1.30.4-1/.evergreen/config_generator/components/c_std_compile.py 2.0.2-1/.evergreen/config_generator/components/c_std_compile.py --- 1.30.4-1/.evergreen/config_generator/components/c_std_compile.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/c_std_compile.py 2025-06-19 15:42:22.000000000 +0000 @@ -6,7 +6,7 @@ from config_generator.components.funcs.f from config_generator.etc.distros import find_large_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.etc.function import Function from config_generator.etc.utils import bash_exec @@ -17,14 +17,31 @@ TAG = 'std-matrix' # pylint: disable=line-too-long # fmt: off MATRIX = [ - ('debian92', 'clang', None, [11, ]), - ('debian10', 'clang', None, [11, ]), - ('debian10', 'gcc', None, [11, 17]), - ('debian11', 'clang', None, [11, ]), - ('debian11', 'gcc', None, [11, 17]), - ('ubuntu2004', 'clang', None, [11, ]), - ('ubuntu2004', 'gcc', None, [11, ]), - ('windows-vsCurrent', 'vs2017x64', None, [11, 17]), + ('rhel80', 'clang', None, [99, 11, 17, ]), # Clang 7.0 + ('ubuntu2004', 'clang-10', None, [99, 11, 17, 23]), # Clang 10.0 (max: C2x) + ('rhel84', 'clang', None, [99, 11, 17, 23]), # Clang 11.0 (max: C2x) + ('ubuntu2204', 'clang-12', None, [99, 11, 17, 23]), # Clang 12.0 (max: C2x) + ('rhel90', 'clang', None, [99, 11, 17, 23]), # Clang 13.0 (max: C2x) + ('rhel91', 'clang', None, [99, 11, 17, 23]), # Clang 14.0 (max: C2x) + ('rhel92', 'clang', None, [99, 11, 17, 23]), # Clang 15.0 (max: C2x) + ('rhel93', 'clang', None, [99, 11, 17, 23]), # Clang 16.0 (max: C2x) + ('rhel94', 'clang', None, [99, 11, 17, 23]), # Clang 17.0 (max: C2x) + ('rhel95', 'clang', None, [99, 11, 17, 23]), # Clang 18.0 (max: C23) + + ('rhel76', 'gcc', None, [99, 11, ]), # GCC 4.8 (max: C11) + ('rhel80', 'gcc', None, [99, 11, 17, ]), # GCC 8.2 (max: C17) + ('debian10', 'gcc-8', None, [99, 11, 17, ]), # GCC 8.3 (max: C17) + ('rhel84', 'gcc', None, [99, 11, 17, ]), # GCC 8.4 (max: C17) + ('ubuntu2004', 'gcc-9', None, [99, 11, 17, 23]), # GCC 9.4 (max: C2x) + ('debian11', 'gcc-10', None, [99, 11, 17, 23]), # GCC 10.2 (max: C2x) + ('rhel90', 'gcc', None, [99, 11, 17, 23]), # GCC 11.2 (max: C2x) + ('rhel92', 'gcc', None, [99, 11, 17, 23]), # GCC 11.3 (max: C2x) + ('rhel94', 'gcc', None, [99, 11, 17, 23]), # GCC 11.4 (max: C2x) + ('rhel95', 'gcc', None, [99, 11, 17, 23]), # GCC 11.5 (max: C2x) + + ('windows-vsCurrent', 'vs2017x64', None, [99, 11, 17, 'latest']), # Max: C17, clatest (C2x) + ('windows-vsCurrent', 'vs2019x64', None, [99, 11, 17, 'latest']), # Max: C17, clatest (C2x) + ('windows-vsCurrent', 'vs2022x64', None, [99, 11, 17, 'latest']), # Max: C17, clatest (C2x) ] # fmt: on # pylint: enable=line-too-long @@ -54,18 +71,20 @@ def tasks(): res = [] for distro_name, compiler, arch, stds in MATRIX: - tags = [TAG, distro_name, compiler, 'compile'] + compiler_type = compiler.split('-')[0] + + tags = [TAG, distro_name, compiler_type, 'compile'] distro = find_large_distro(distro_name) compile_vars = None - compile_vars = {'CC': to_cc(compiler)} + compile_vars = compiler_to_vars(compiler) if arch: tags.append(arch) compile_vars.update({'MARCH': arch}) - distro_str = make_distro_str(distro_name, compiler, arch) + distro_str = make_distro_str(distro_name, compiler_type, arch) for std in stds: with_std = {'C_STD_VERSION': std} diff -pruN 1.30.4-1/.evergreen/config_generator/components/earthly.py 2.0.2-1/.evergreen/config_generator/components/earthly.py --- 1.30.4-1/.evergreen/config_generator/components/earthly.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/earthly.py 2025-06-19 15:42:22.000000000 +0000 @@ -27,7 +27,7 @@ EnvKey = Literal[ "alpine3.18", "alpine3.19", "archlinux", - "centos7" + "centos7", ] "Identifiers for environments. These correspond to special 'env.*' targets in the Earthfile." CompilerName = Literal["gcc", "clang"] @@ -36,13 +36,13 @@ CompilerName = Literal["gcc", "clang"] # Other options: SSPI (Windows only), AUTO (not reliably test-able without more environments) SASLOption = Literal["Cyrus", "off"] "Valid options for the SASL configuration parameter" -TLSOption = Literal["LibreSSL", "OpenSSL", "off"] +TLSOption = Literal["OpenSSL", "off"] "Options for the TLS backend configuration parameter (AKA 'ENABLE_SSL')" -CxxVersion = Literal["r3.8.0", "r3.9.0", "none"] +CxxVersion = Literal["none"] # TODO: Once CXX-3103 is released, add latest C++ release tag. "C++ driver refs that are under CI test" # A separator character, since we cannot use whitespace -_SEPARATOR = "\N{no-break space}\N{bullet}\N{no-break space}" +_SEPARATOR = "\N{NO-BREAK SPACE}\N{BULLET}\N{NO-BREAK SPACE}" def os_split(env: EnvKey) -> tuple[str, None | str]: @@ -59,9 +59,7 @@ def os_split(env: EnvKey) -> tuple[str, case "centos7": return "CentOS", "7.0" case _: - raise ValueError( - f"Failed to split OS env key {env=} into a name+version pair (unrecognized)" - ) + raise ValueError(f"Failed to split OS env key {env=} into a name+version pair (unrecognized)") class EarthlyVariant(NamedTuple): @@ -135,7 +133,7 @@ class Configuration(NamedTuple): @property def suffix(self) -> str: - return f"{_SEPARATOR}".join(f"{k}={v}" for k, v in self._asdict().items()) + return _SEPARATOR.join(f"{k}={v}" for k, v in self._asdict().items()) def task_filter(env: EarthlyVariant, conf: Configuration) -> bool: @@ -144,27 +142,10 @@ def task_filter(env: EarthlyVariant, con configuration values. """ match env, conf: - # We only need one task with "sasl=off" - case ["u22", "gcc"], ("off", "OpenSSL", "r3.8.0"): - return True - # The Ubuntu 18.04 GCC has a bug that fails to build the 3.8.0 C++ driver - case ["u18", "gcc"], [_, _, "r3.8.0"]: - return False - # Other sasl=off tasks we'll just ignore: - case _, ("off", _tls, _cxx): - return False - # Ubuntu and CentOS do not ship with a LibreSSL package: - case e, (_sasl, "LibreSSL", _cxx) if e.display_name.startswith("Ubuntu") or e.display_name.startswith("CentOS"): - return False - # u16 is not capable of building mongocxx - case e, (_, _, "none") if e.display_name.startswith("Ubuntu 16") or e.display_name.startswith("CentOS 7"): - return True - # Exclude u16 for all other configurations - case e, _ if e.display_name.startswith("Ubuntu 16") or e.display_name.startswith("CentOS 7"): - return False - # Exclude all other envs - case _, (_, _, "none"): - return False + # u16/centos7 are not capable of building mongocxx + case e, (_sasl, _tls, cxx) if re.match(r"^Ubuntu 16|^CentOS 7", e.display_name): + # Only build if C++ driver is test is disabled + return cxx == "none" # Anything else: Allow it to run: case _: return True @@ -230,11 +211,11 @@ def earthly_task( commands=[ # Ensure subsequent Docker commands are authenticated. subprocess_exec( - binary='bash', - command_type="setup", + binary="bash", + command_type=EvgCommandType.SETUP, args=[ "-c", - 'docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}"' + r'docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}"', ], ), # First, just build the "env-warmup" which will prepare the build environment. @@ -253,8 +234,8 @@ def earthly_task( # The "targets" arg is for +run to specify which targets to run args={"targets": " ".join(targets)} | earthly_args, ), - ], - tags=[f"earthly", "pr-merge-gate", *env_tags], + ], # type: ignore (The type annots on `commands` is wrong) + tags=["earthly", "pr-merge-gate", *env_tags], run_on=CONTAINER_RUN_DISTROS, ) diff -pruN 1.30.4-1/.evergreen/config_generator/components/funcs/fetch_build.py 2.0.2-1/.evergreen/config_generator/components/funcs/fetch_build.py --- 1.30.4-1/.evergreen/config_generator/components/funcs/fetch_build.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/funcs/fetch_build.py 2025-06-19 15:42:22.000000000 +0000 @@ -17,7 +17,7 @@ class FetchBuild(Function): aws_secret='${aws_secret}', bucket='mciuploads', local_file='build.tar.gz', - remote_file='mongo-c-driver/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz', + remote_file='${project}/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz', ), archive_targz_extract(path='build.tar.gz', destination='mongoc'), # Scripts may not be executable on Windows. diff -pruN 1.30.4-1/.evergreen/config_generator/components/funcs/upload_build.py 2.0.2-1/.evergreen/config_generator/components/funcs/upload_build.py --- 1.30.4-1/.evergreen/config_generator/components/funcs/upload_build.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/funcs/upload_build.py 2025-06-19 15:42:22.000000000 +0000 @@ -14,7 +14,7 @@ class UploadBuild(Function): s3_put( aws_key='${aws_key}', aws_secret='${aws_secret}', - remote_file='mongo-c-driver/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz', + remote_file='${project}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz', bucket='mciuploads', permissions='public-read', local_file='${build_id}.tar.gz', diff -pruN 1.30.4-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py 2.0.2-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py --- 1.30.4-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/funcs/upload_mo_artifacts.py 2025-06-19 15:42:22.000000000 +0000 @@ -30,7 +30,7 @@ class UploadMOArtifacts(Function): local_file='mongoc/mongodb-logs.tar.gz', optional=True, permissions='public-read', - remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz', + remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz', ), s3_put( aws_key='${aws_key}', @@ -41,7 +41,7 @@ class UploadMOArtifacts(Function): local_file='mongoc/MO/server.log', optional=True, permissions='public-read', - remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log', + remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log', ), bash_exec( working_dir='mongoc', @@ -83,7 +83,7 @@ class UploadMOArtifacts(Function): local_file='mongo-coredumps.tgz', optional=True, permissions='public-read', - remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log', + remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log', ), ] diff -pruN 1.30.4-1/.evergreen/config_generator/components/loadbalanced.py 2.0.2-1/.evergreen/config_generator/components/loadbalanced.py --- 1.30.4-1/.evergreen/config_generator/components/loadbalanced.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/loadbalanced.py 2025-06-19 15:42:22.000000000 +0000 @@ -83,7 +83,6 @@ def tasks(): env={ 'CC': _COMPILER, 'CFLAGS': '-fno-omit-frame-pointer', - 'EXTRA_CONFIGURE_FLAGS': '-DENABLE_EXTRA_ALIGNMENT=OFF', 'SSL': 'OPENSSL' }, working_dir='mongoc', diff -pruN 1.30.4-1/.evergreen/config_generator/components/make_docs.py 2.0.2-1/.evergreen/config_generator/components/make_docs.py --- 1.30.4-1/.evergreen/config_generator/components/make_docs.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/make_docs.py 2025-06-19 15:42:22.000000000 +0000 @@ -39,7 +39,7 @@ class UploadDocs(Function): "AWS_ACCESS_KEY_ID": "${aws_key}", "AWS_SECRET_ACCESS_KEY": "${aws_secret}", }, - script="aws s3 cp doc/html s3://mciuploads/mongo-c-driver/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1", + script="aws s3 cp doc/html s3://mciuploads/${project}/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1", ), s3_put( aws_key="${aws_key}", @@ -49,7 +49,7 @@ class UploadDocs(Function): display_name="libbson docs", local_file="mongoc/_build/for-docs/src/libbson/doc/html/index.html", permissions="public-read", - remote_file="mongo-c-driver/docs/libbson/${CURRENT_VERSION}/index.html", + remote_file="${project}/docs/libbson/${CURRENT_VERSION}/index.html", ), bash_exec( working_dir="mongoc/_build/for-docs/src/libmongoc", @@ -57,7 +57,7 @@ class UploadDocs(Function): "AWS_ACCESS_KEY_ID": "${aws_key}", "AWS_SECRET_ACCESS_KEY": "${aws_secret}", }, - script="aws s3 cp doc/html s3://mciuploads/mongo-c-driver/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1", + script="aws s3 cp doc/html s3://mciuploads/${project}/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1", ), s3_put( aws_key="${aws_key}", @@ -67,7 +67,7 @@ class UploadDocs(Function): display_name="libmongoc docs", local_file="mongoc/_build/for-docs/src/libmongoc/doc/html/index.html", permissions="public-read", - remote_file="mongo-c-driver/docs/libmongoc/${CURRENT_VERSION}/index.html", + remote_file="${project}/docs/libmongoc/${CURRENT_VERSION}/index.html", ), ] @@ -102,7 +102,7 @@ class UploadManPages(Function): display_name="libbson man pages", local_file="mongoc/bson-man-pages.html", permissions="public-read", - remote_file="mongo-c-driver/man-pages/libbson/${CURRENT_VERSION}/index.html", + remote_file="${project}/man-pages/libbson/${CURRENT_VERSION}/index.html", ), s3_put( aws_key="${aws_key}", @@ -112,7 +112,7 @@ class UploadManPages(Function): display_name="libmongoc man pages", local_file="mongoc/mongoc-man-pages.html", permissions="public-read", - remote_file="mongo-c-driver/man-pages/libmongoc/${CURRENT_VERSION}/index.html", + remote_file="${project}/man-pages/libmongoc/${CURRENT_VERSION}/index.html", ), ] diff -pruN 1.30.4-1/.evergreen/config_generator/components/mock_server.py 2.0.2-1/.evergreen/config_generator/components/mock_server.py --- 1.30.4-1/.evergreen/config_generator/components/mock_server.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/mock_server.py 2025-06-19 15:42:22.000000000 +0000 @@ -42,7 +42,6 @@ def variants(): 'CC': 'gcc', 'ASAN': 'on', 'CFLAGS': '-fno-omit-frame-pointer', - 'EXTRA_CONFIGURE_FLAGS': '-DENABLE_EXTRA_ALIGNMENT=OFF', 'SANITIZE': 'address,undefined', } ), diff -pruN 1.30.4-1/.evergreen/config_generator/components/openssl_static_compile.py 2.0.2-1/.evergreen/config_generator/components/openssl_static_compile.py --- 1.30.4-1/.evergreen/config_generator/components/openssl_static_compile.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/openssl_static_compile.py 2025-06-19 15:42:22.000000000 +0000 @@ -6,7 +6,7 @@ from config_generator.components.funcs.f from config_generator.etc.distros import find_large_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.etc.function import Function from config_generator.etc.utils import bash_exec @@ -55,7 +55,7 @@ def tasks(): distro = find_large_distro(distro_name) compile_vars = None - compile_vars = {'CC': to_cc(compiler)} + compile_vars = compiler_to_vars(compiler) if arch: tags.append(arch) @@ -72,7 +72,7 @@ def tasks(): tags=tags, commands=[ FindCMakeLatest.call(), - StaticOpenSSLCompile.call(vars=compile_vars), + StaticOpenSSLCompile.call(vars=compile_vars if compile_vars else None), ], ) ) diff -pruN 1.30.4-1/.evergreen/config_generator/components/sanitizers/asan.py 2.0.2-1/.evergreen/config_generator/components/sanitizers/asan.py --- 1.30.4-1/.evergreen/config_generator/components/sanitizers/asan.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/sanitizers/asan.py 2025-06-19 15:42:22.000000000 +0000 @@ -10,7 +10,6 @@ def variants(): 'ASAN': 'on', 'CFLAGS': '-fno-omit-frame-pointer', 'CHECK_LOG': 'ON', - 'EXTRA_CONFIGURE_FLAGS': '-DENABLE_EXTRA_ALIGNMENT=OFF', 'SANITIZE': 'address,undefined', } diff -pruN 1.30.4-1/.evergreen/config_generator/components/sanitizers/tsan.py 2.0.2-1/.evergreen/config_generator/components/sanitizers/tsan.py --- 1.30.4-1/.evergreen/config_generator/components/sanitizers/tsan.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/sanitizers/tsan.py 2025-06-19 15:42:22.000000000 +0000 @@ -9,7 +9,7 @@ def variants(): expansions = { 'CFLAGS': '-fno-omit-frame-pointer', 'CHECK_LOG': 'ON', - 'EXTRA_CONFIGURE_FLAGS': '-DENABLE_EXTRA_ALIGNMENT=OFF -DENABLE_SHM_COUNTERS=OFF', + 'EXTRA_CONFIGURE_FLAGS': '-DENABLE_SHM_COUNTERS=OFF', 'SANITIZE': 'thread', } diff -pruN 1.30.4-1/.evergreen/config_generator/components/sasl/openssl.py 2.0.2-1/.evergreen/config_generator/components/sasl/openssl.py --- 1.30.4-1/.evergreen/config_generator/components/sasl/openssl.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/sasl/openssl.py 2025-06-19 15:42:22.000000000 +0000 @@ -1,5 +1,3 @@ -from typing import List - from shrub.v3.evg_build_variant import BuildVariant from config_generator.etc.utils import TaskRef @@ -28,6 +26,7 @@ COMPILE_MATRIX = [ ('ubuntu2004-arm64', 'gcc', None, ['cyrus']), ('ubuntu2004', 'gcc', None, ['cyrus']), ('windows-vsCurrent', 'vs2017x64', None, ['cyrus']), + ('amazon2023-arm64-latest-large-m8g', 'gcc', None, ['cyrus']), ] TEST_MATRIX = [ @@ -40,6 +39,9 @@ TEST_MATRIX = [ # Test 4.2 with Debian 10 since 4.2 does not ship on Ubuntu 20.04+. ('debian10', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica'], ['4.2']), + + # Test with Graviton processor: + ('amazon2023-arm64-latest-large-m8g', 'gcc', None, 'cyrus', ['auth'], ['server', 'replica', 'sharded'], ['latest']), ] # fmt: on # pylint: enable=line-too-long diff -pruN 1.30.4-1/.evergreen/config_generator/components/sasl/winssl.py 2.0.2-1/.evergreen/config_generator/components/sasl/winssl.py --- 1.30.4-1/.evergreen/config_generator/components/sasl/winssl.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/sasl/winssl.py 2025-06-19 15:42:22.000000000 +0000 @@ -15,16 +15,15 @@ TAG = f'sasl-matrix-{SSL}' # pylint: disable=line-too-long # fmt: off COMPILE_MATRIX = [ - ('windows-vsCurrent', 'mingw', None, [ 'sspi']), - ('windows-vsCurrent', 'vs2017x64', None, ['off', 'cyrus', 'sspi']), - ('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']), + ('windows-vsCurrent', 'mingw', None, [ 'sspi']), + ('windows-vsCurrent', 'vs2017x64', None, ['off', 'sspi']), + ('windows-vsCurrent', 'vs2017x86', None, ['off', 'sspi']), ] TEST_MATRIX = [ - ('windows-vsCurrent', 'vs2017x64', None, 'cyrus', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), + ('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['4.0', '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest']), ('windows-vsCurrent', 'mingw', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']), - ('windows-vsCurrent', 'vs2017x64', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']), ('windows-vsCurrent', 'vs2017x86', None, 'sspi', ['auth'], ['server'], ['8.0', 'latest']), ] # fmt: on @@ -40,11 +39,6 @@ class SaslOffWinSSLCompile(WinSSLCompile commands = WinSSLCompileCommon.compile_commands(sasl='OFF') -class SaslCyrusWinSSLCompile(WinSSLCompileCommon): - name = 'sasl-cyrus-winssl-compile' - commands = WinSSLCompileCommon.compile_commands(sasl='CYRUS') - - class SaslSspiWinSSLCompile(WinSSLCompileCommon): name = 'sasl-sspi-winssl-compile' commands = WinSSLCompileCommon.compile_commands(sasl='SSPI') @@ -53,7 +47,6 @@ class SaslSspiWinSSLCompile(WinSSLCompil def functions(): return merge_defns( SaslOffWinSSLCompile.defn(), - SaslCyrusWinSSLCompile.defn(), SaslSspiWinSSLCompile.defn(), ) @@ -63,7 +56,6 @@ def tasks(): SASL_TO_FUNC = { 'off': SaslOffWinSSLCompile, - 'cyrus': SaslCyrusWinSSLCompile, 'sspi': SaslSspiWinSSLCompile, } diff -pruN 1.30.4-1/.evergreen/config_generator/components/sbom.py 2.0.2-1/.evergreen/config_generator/components/sbom.py --- 1.30.4-1/.evergreen/config_generator/components/sbom.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/sbom.py 2025-06-19 15:42:22.000000000 +0000 @@ -80,7 +80,7 @@ class SBOM(Function): display_name='Augmented SBOM', local_file='mongoc/augmented-sbom.json', permissions='public-read', - remote_file='mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/sbom/augmented-sbom.json', + remote_file='${project}/${build_variant}/${revision}/${version_id}/${build_id}/sbom/augmented-sbom.json', ), ] diff -pruN 1.30.4-1/.evergreen/config_generator/components/scan_build.py 2.0.2-1/.evergreen/config_generator/components/scan_build.py --- 1.30.4-1/.evergreen/config_generator/components/scan_build.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/components/scan_build.py 2025-06-19 15:42:22.000000000 +0000 @@ -7,7 +7,7 @@ from config_generator.components.funcs.f from config_generator.etc.distros import find_large_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.etc.function import Function from config_generator.etc.utils import bash_exec @@ -56,7 +56,7 @@ def tasks(): distro = find_large_distro(distro_name) compile_vars = None - compile_vars = {'CC': to_cc(compiler)} + compile_vars = compiler_to_vars(compiler) if arch: tags.append(arch) @@ -73,7 +73,7 @@ def tasks(): tags=tags, commands=[ FindCMakeLatest.call(), - ScanBuild.call(vars=compile_vars), + ScanBuild.call(vars=compile_vars if compile_vars else None), FunctionCall(func='upload scan artifacts'), ], ) diff -pruN 1.30.4-1/.evergreen/config_generator/etc/compile.py 2.0.2-1/.evergreen/config_generator/etc/compile.py --- 1.30.4-1/.evergreen/config_generator/etc/compile.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/etc/compile.py 2025-06-19 15:42:22.000000000 +0000 @@ -2,7 +2,7 @@ from shrub.v3.evg_task import EvgTask from config_generator.etc.distros import find_large_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.components.funcs.find_cmake_latest import FindCMakeLatest from config_generator.components.funcs.upload_build import UploadBuild @@ -20,7 +20,7 @@ def generate_compile_tasks(SSL, TAG, SAS distro = find_large_distro(distro_name) compile_vars = None - compile_vars = {'CC': to_cc(compiler)} + compile_vars = compiler_to_vars(compiler) if arch: tags.append(arch) @@ -38,7 +38,7 @@ def generate_compile_tasks(SSL, TAG, SAS commands = [] commands.append(FindCMakeLatest.call()) - commands.append(SASL_TO_FUNC[sasl].call(vars=compile_vars)) + commands.append(SASL_TO_FUNC[sasl].call(vars=compile_vars if compile_vars else None)) commands.append(UploadBuild.call()) res.append( diff -pruN 1.30.4-1/.evergreen/config_generator/etc/cse/test.py 2.0.2-1/.evergreen/config_generator/etc/cse/test.py --- 1.30.4-1/.evergreen/config_generator/etc/cse/test.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/etc/cse/test.py 2025-06-19 15:42:22.000000000 +0000 @@ -6,7 +6,7 @@ from shrub.v3.evg_task import EvgTask, E from config_generator.etc.distros import find_small_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration from config_generator.components.funcs.fetch_build import FetchBuild @@ -29,7 +29,7 @@ def generate_test_tasks(SSL, TAG, MATRIX test_distro = find_small_distro(distro_name) compile_vars = [] - compile_vars.append(KeyValueParam(key='CC', value=to_cc(compiler))) + compile_vars = [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()] if arch: tags.append(arch) diff -pruN 1.30.4-1/.evergreen/config_generator/etc/distros.py 2.0.2-1/.evergreen/config_generator/etc/distros.py --- 1.30.4-1/.evergreen/config_generator/etc/distros.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/etc/distros.py 2025-06-19 15:42:22.000000000 +0000 @@ -39,18 +39,18 @@ class Distro(BaseModel): def validate_os_ver(cls, value): return Version(value) -# See: https://evergreen.mongodb.com/distros -# pylint: disable=line-too-long -#fmt: off + +def ls_distro(name, **kwargs): + return [ + Distro(name=f'{name}-large', size='large', **kwargs), + Distro(name=f'{name}-small', size='small', **kwargs), + ] + + DEBIAN_DISTROS = [ - Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), # CDRIVER-5873 - Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'), # CDRIVER-5873 - Distro(name='debian10-large', os='debian', os_type='linux', os_ver='10', size='large'), # CDRIVER-5874 - Distro(name='debian10-small', os='debian', os_type='linux', os_ver='10', size='small'), # CDRIVER-5874 - Distro(name='debian11-large', os='debian', os_type='linux', os_ver='11', size='large'), - Distro(name='debian11-small', os='debian', os_type='linux', os_ver='11', size='small'), - Distro(name='debian92-large', os='debian', os_type='linux', os_ver='9.2', size='large'), - Distro(name='debian92-small', os='debian', os_type='linux', os_ver='9.2', size='small'), + *ls_distro(name='debian92', os='debian', os_type='linux', os_ver='9.2'), # CDRIVER-5873 + *ls_distro(name='debian10', os='debian', os_type='linux', os_ver='10'), # CDRIVER-5874 + *ls_distro(name='debian11', os='debian', os_type='linux', os_ver='11'), ] MACOS_DISTROS = [ @@ -63,70 +63,62 @@ MACOS_ARM64_DISTROS = [ ] RHEL_DISTROS = [ - Distro(name='rhel80-large', os='rhel', os_type='linux', os_ver='8.0', size='large'), - Distro(name='rhel80-small', os='rhel', os_type='linux', os_ver='8.0', size='small'), - Distro(name='rhel84-large', os='rhel', os_type='linux', os_ver='8.4', size='large'), - Distro(name='rhel84-small', os='rhel', os_type='linux', os_ver='8.4', size='small'), - Distro(name='rhel8.9-large', os='rhel', os_type='linux', os_ver='8.7', size='large'), - Distro(name='rhel8.9-small', os='rhel', os_type='linux', os_ver='8.7', size='small'), - Distro(name='rhel92-large', os='rhel', os_type='linux', os_ver='9.0', size='large'), - Distro(name='rhel92-small', os='rhel', os_type='linux', os_ver='9.0', size='small'), -] - -RHEL_ARM64_DISTROS = [ - Distro(name='rhel82-arm64-large', os='rhel', os_type='linux', os_ver='8.2', size='large', arch='arm64'), - Distro(name='rhel82-arm64-small', os='rhel', os_type='linux', os_ver='8.2', size='small', arch='arm64'), - Distro(name='rhel92-arm64-large', os='rhel', os_type='linux', os_ver='9.0', size='large', arch='arm64'), - Distro(name='rhel92-arm64-small', os='rhel', os_type='linux', os_ver='9.0', size='small', arch='arm64'), + *ls_distro(name='rhel76', os='rhel', os_type='linux', os_ver='7.6'), + *ls_distro(name='rhel80', os='rhel', os_type='linux', os_ver='8.0'), + *ls_distro(name='rhel84', os='rhel', os_type='linux', os_ver='8.4'), + *ls_distro(name='rhel90', os='rhel', os_type='linux', os_ver='9.0'), + *ls_distro(name='rhel91', os='rhel', os_type='linux', os_ver='9.1'), + *ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.2'), + *ls_distro(name='rhel93', os='rhel', os_type='linux', os_ver='9.3'), + *ls_distro(name='rhel94', os='rhel', os_type='linux', os_ver='9.4'), + *ls_distro(name='rhel95', os='rhel', os_type='linux', os_ver='9.5'), + *ls_distro(name='rhel8.9', os='rhel', os_type='linux', os_ver='8.7'), + *ls_distro(name='rhel92', os='rhel', os_type='linux', os_ver='9.0'), ] RHEL_POWER_DISTROS = [ - Distro(name='rhel8-power-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='power'), - Distro(name='rhel8-power-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='power'), - Distro(name='rhel9-power-large', os='rhel', os_type='linux', os_ver='9', size='large', arch='power'), - Distro(name='rhel9-power-small', os='rhel', os_type='linux', os_ver='9', size='small', arch='power'), + *ls_distro(name='rhel8-power', os='rhel', os_type='linux', os_ver='8', arch='power'), ] RHEL_ZSERIES_DISTROS = [ - Distro(name='rhel8-zseries-large', os='rhel', os_type='linux', os_ver='8', size='large', arch='zseries'), - Distro(name='rhel8-zseries-small', os='rhel', os_type='linux', os_ver='8', size='small', arch='zseries'), - Distro(name='rhel9-zseries-large', os='rhel', os_type='linux', os_ver='9', size='large', arch='zseries'), - Distro(name='rhel9-zseries-small', os='rhel', os_type='linux', os_ver='9', size='small', arch='zseries'), + *ls_distro(name='rhel8-zseries', os='rhel', os_type='linux', os_ver='8', arch='zseries'), ] UBUNTU_DISTROS = [ - Distro(name='ubuntu2004-large', os='ubuntu', os_type='linux', os_ver='20.04', size='large'), - Distro(name='ubuntu2004-small', os='ubuntu', os_type='linux', os_ver='20.04', size='small'), - Distro(name='ubuntu2204-large', os='ubuntu', os_type='linux', os_ver='22.04', size='large'), - Distro(name='ubuntu2204-small', os='ubuntu', os_type='linux', os_ver='22.04', size='small'), + *ls_distro(name='ubuntu2004', os='ubuntu', os_type='linux', os_ver='20.04'), + *ls_distro(name='ubuntu2204', os='ubuntu', os_type='linux', os_ver='22.04'), ] UBUNTU_ARM64_DISTROS = [ - Distro(name='ubuntu2004-arm64-large', os='ubuntu', os_type='linux', os_ver='20.04', size='large', arch='arm64'), - Distro(name='ubuntu2004-arm64-small', os='ubuntu', os_type='linux', os_ver='20.04', size='small', arch='arm64'), - Distro(name='ubuntu2204-arm64-large', os='ubuntu', os_type='linux', os_ver='22.04', size='large', arch='arm64'), - Distro(name='ubuntu2204-arm64-small', os='ubuntu', os_type='linux', os_ver='22.04', size='small', arch='arm64'), + *ls_distro(name='ubuntu2004-arm64', os='ubuntu', os_type='linux', os_ver='20.04', arch='arm64'), ] WINDOWS_DISTROS = [ - Distro(name='windows-vsCurrent-large', os='windows', os_type='windows', vs_ver='vsCurrent', size='large'), # Windows Server 2019 - Distro(name='windows-vsCurrent-small', os='windows', os_type='windows', vs_ver='vsCurrent', size='small'), # Windows Server 2019 + *ls_distro(name='windows-64-vs2017', os='windows', os_type='windows', vs_ver='2017'), + *ls_distro(name='windows-64-vs2019', os='windows', os_type='windows', vs_ver='2019'), + + *ls_distro(name='windows-vsCurrent', os='windows', os_type='windows', vs_ver='vsCurrent'), # Windows Server 2019 +] + +GRAVITON_DISTROS = [ + Distro(name='amazon2023-arm64-latest-large-m8g', os='amazon2023', os_type='linux', os_ver='2023', arch='arm64'), + Distro(name='amazon2-arm64-latest-large-m8g', os='amazon2', os_type='linux', os_ver='2', arch='arm64'), ] -#fmt: on -# pylint: enable=line-too-long +# See: https://evergreen.mongodb.com/distros # Ensure no-arch distros are ordered before arch-specific distros. -ALL_DISTROS = [] + \ - DEBIAN_DISTROS + \ - MACOS_DISTROS + \ - MACOS_ARM64_DISTROS + \ - RHEL_DISTROS + \ - RHEL_ARM64_DISTROS + \ - RHEL_POWER_DISTROS + \ - RHEL_ZSERIES_DISTROS + \ - UBUNTU_DISTROS + \ - UBUNTU_ARM64_DISTROS + \ - WINDOWS_DISTROS +ALL_DISTROS = [ + *DEBIAN_DISTROS, + *MACOS_DISTROS, + *MACOS_ARM64_DISTROS, + *RHEL_DISTROS, + *RHEL_POWER_DISTROS, + *RHEL_ZSERIES_DISTROS, + *UBUNTU_DISTROS, + *UBUNTU_ARM64_DISTROS, + *WINDOWS_DISTROS, + *GRAVITON_DISTROS +] def find_distro(name) -> Distro: @@ -180,12 +172,12 @@ def make_distro_str(distro_name, compile # ('windows-64-vs2017', 'vs2017x64', None) -> vs2017-x64 # ('windows-64-vs2017', 'mingw', None) -> vs2017-mingw distro_str = distro_name[len('windows-64-'):] + { - 'vs2013x64': '-x64', - 'vs2013x86': '-x86', - 'vs2015x64': '-x64', - 'vs2015x86': '-x86', 'vs2017x64': '-x64', 'vs2017x86': '-x86', + 'vs2019x64': '-x64', + 'vs2019x86': '-x86', + 'vs2022x64': '-x64', + 'vs2022x86': '-x86', }.get(compiler, f'-{compiler}') else: distro_str = distro_name @@ -200,10 +192,48 @@ def make_distro_str(distro_name, compile def to_cc(compiler): return { - 'vs2013x64': 'Visual Studio 12 2013 Win64', - 'vs2013x86': 'Visual Studio 12 2013', - 'vs2015x64': 'Visual Studio 14 2015 Win64', - 'vs2015x86': 'Visual Studio 14 2015', - 'vs2017x64': 'Visual Studio 15 2017 Win64', + 'vs2017x64': 'Visual Studio 15 2017', 'vs2017x86': 'Visual Studio 15 2017', + 'vs2019x64': 'Visual Studio 16 2019', + 'vs2019x86': 'Visual Studio 16 2019', + 'vs2022x64': 'Visual Studio 17 2022', + 'vs2022x86': 'Visual Studio 17 2022', + }.get(compiler, compiler) + + +def to_platform(compiler): + return { + 'vs2017x64': 'x64', + 'vs2017x86': 'Win32', + 'vs2019x64': 'x64', + 'vs2019x86': 'Win32', + 'vs2022x64': 'x64', + 'vs2022x86': 'Win32', }.get(compiler, compiler) + + +def compiler_to_vars(compiler): + match compiler, compiler.split('-'): + case _, ['gcc', *rest]: + return { + 'CC': '-'.join(['gcc'] + rest), + 'CXX': '-'.join(['g++'] + rest), + } + + case _, ['clang', *rest]: + return { + 'CC': '-'.join(['clang'] + rest), + 'CXX': '-'.join(['clang++'] + rest), + } + + case str(vs), _ if 'vs' in vs: + return { + 'CMAKE_GENERATOR': to_cc(vs), + 'CMAKE_GENERATOR_PLATFORM': to_platform(vs), + } + + case compiler, _: + return { + 'CC': compiler, + 'CXX': compiler, + } diff -pruN 1.30.4-1/.evergreen/config_generator/etc/sanitizers/test.py 2.0.2-1/.evergreen/config_generator/etc/sanitizers/test.py --- 1.30.4-1/.evergreen/config_generator/etc/sanitizers/test.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/etc/sanitizers/test.py 2025-06-19 15:42:22.000000000 +0000 @@ -6,7 +6,7 @@ from shrub.v3.evg_task import EvgTask, E from config_generator.etc.distros import find_small_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration from config_generator.components.funcs.fetch_build import FetchBuild @@ -37,7 +37,7 @@ def generate_test_tasks(SSL, TAG, MATRIX test_distro = find_small_distro(distro_name) compile_vars = [] - compile_vars.append(KeyValueParam(key='CC', value=to_cc(compiler))) + compile_vars = [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()] if arch: tags.append(arch) diff -pruN 1.30.4-1/.evergreen/config_generator/etc/sasl/test.py 2.0.2-1/.evergreen/config_generator/etc/sasl/test.py --- 1.30.4-1/.evergreen/config_generator/etc/sasl/test.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/config_generator/etc/sasl/test.py 2025-06-19 15:42:22.000000000 +0000 @@ -6,7 +6,7 @@ from shrub.v3.evg_task import EvgTask, E from config_generator.etc.distros import find_small_distro from config_generator.etc.distros import make_distro_str -from config_generator.etc.distros import to_cc +from config_generator.etc.distros import compiler_to_vars from config_generator.components.funcs.bootstrap_mongo_orchestration import BootstrapMongoOrchestration from config_generator.components.funcs.fetch_build import FetchBuild @@ -29,7 +29,7 @@ def generate_test_tasks(SSL, TAG, MATRIX test_distro = find_small_distro(distro_name) compile_vars = [] - compile_vars.append(KeyValueParam(key='CC', value=to_cc(compiler))) + compile_vars = [KeyValueParam(key=key, value=value) for key, value in compiler_to_vars(compiler).items()] if arch: tags.append(arch) diff -pruN 1.30.4-1/.evergreen/etc/spec.patch 2.0.2-1/.evergreen/etc/spec.patch --- 1.30.4-1/.evergreen/etc/spec.patch 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/etc/spec.patch 2025-06-19 15:42:22.000000000 +0000 @@ -1,11 +1,11 @@ --- mongo-c-driver.spec.orig 2025-02-28 17:04:19.401176260 -0500 -+++ mongo-c-driver.spec 2025-02-28 17:11:06.028378742 -0500 ++++ mongo-c-driver.spec 2025-02-28 17:05:52.190076172 -0500 @@ -10,7 +10,7 @@ %global gh_project mongo-c-driver %global libname libmongoc %global libver 1.0 -%global up_version 1.30.2 -+%global up_version 1.30.3 ++%global up_version 1.31.0 #global up_prever rc0 # disabled as require a MongoDB server %bcond_with tests diff -pruN 1.30.4-1/.evergreen/generated_configs/functions.yml 2.0.2-1/.evergreen/generated_configs/functions.yml --- 1.30.4-1/.evergreen/generated_configs/functions.yml 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/generated_configs/functions.yml 2025-06-19 15:42:22.000000000 +0000 @@ -55,12 +55,12 @@ functions: - command: s3.put type: system params: - display_name: "ABI Report:" + display_name: "ABI Compliance Check: " aws_key: ${aws_key} aws_secret: ${aws_secret} bucket: mciuploads content_type: text/html - local_files_include_filter: mongoc/abi-compliance/compat_reports/**/*.html + local_files_include_filter: abi-compliance/compat_reports/**/compat_report.html permissions: public-read remote_file: mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${task_id}/${execution}/abi-compliance-check/ - command: s3.put @@ -198,7 +198,7 @@ functions: aws_secret: ${aws_secret} bucket: mciuploads local_file: build.tar.gz - remote_file: mongo-c-driver/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz + remote_file: ${project}/${build_variant}/${revision}/${BUILD_NAME}/${build_id}.tar.gz - command: archive.targz_extract params: destination: mongoc @@ -453,19 +453,6 @@ functions: args: - -c - .evergreen/scripts/compile.sh - sasl-cyrus-winssl-compile: - - command: subprocess.exec - type: test - params: - binary: bash - working_dir: mongoc - add_expansions_to_env: true - env: - SASL: CYRUS - SSL: WINDOWS - args: - - -c - - .evergreen/scripts/compile.sh sasl-off-nossl-compile: - command: subprocess.exec type: test @@ -552,7 +539,7 @@ functions: content_type: application/json local_file: mongoc/augmented-sbom.json permissions: public-read - remote_file: mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/sbom/augmented-sbom.json + remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/sbom/augmented-sbom.json scan-build: - command: subprocess.exec type: test @@ -661,7 +648,7 @@ functions: content_type: ${content_type|application/x-gzip} local_file: ${build_id}.tar.gz permissions: public-read - remote_file: mongo-c-driver/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz + remote_file: ${project}/${build_variant}/${revision}/${task_name}/${build_id}.tar.gz upload-docs: - command: subprocess.exec params: @@ -672,7 +659,7 @@ functions: AWS_SECRET_ACCESS_KEY: ${aws_secret} args: - -c - - aws s3 cp doc/html s3://mciuploads/mongo-c-driver/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1 + - aws s3 cp doc/html s3://mciuploads/${project}/docs/libbson/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1 - command: s3.put params: display_name: libbson docs @@ -682,7 +669,7 @@ functions: content_type: text/html local_file: mongoc/_build/for-docs/src/libbson/doc/html/index.html permissions: public-read - remote_file: mongo-c-driver/docs/libbson/${CURRENT_VERSION}/index.html + remote_file: ${project}/docs/libbson/${CURRENT_VERSION}/index.html - command: subprocess.exec params: binary: bash @@ -692,7 +679,7 @@ functions: AWS_SECRET_ACCESS_KEY: ${aws_secret} args: - -c - - aws s3 cp doc/html s3://mciuploads/mongo-c-driver/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1 + - aws s3 cp doc/html s3://mciuploads/${project}/docs/libmongoc/${CURRENT_VERSION} --quiet --recursive --acl public-read --region us-east-1 - command: s3.put params: display_name: libmongoc docs @@ -702,7 +689,7 @@ functions: content_type: text/html local_file: mongoc/_build/for-docs/src/libmongoc/doc/html/index.html permissions: public-read - remote_file: mongo-c-driver/docs/libmongoc/${CURRENT_VERSION}/index.html + remote_file: ${project}/docs/libmongoc/${CURRENT_VERSION}/index.html upload-man-pages: - command: subprocess.exec params: @@ -730,7 +717,7 @@ functions: content_type: text/html local_file: mongoc/bson-man-pages.html permissions: public-read - remote_file: mongo-c-driver/man-pages/libbson/${CURRENT_VERSION}/index.html + remote_file: ${project}/man-pages/libbson/${CURRENT_VERSION}/index.html - command: s3.put params: display_name: libmongoc man pages @@ -740,7 +727,7 @@ functions: content_type: text/html local_file: mongoc/mongoc-man-pages.html permissions: public-read - remote_file: mongo-c-driver/man-pages/libmongoc/${CURRENT_VERSION}/index.html + remote_file: ${project}/man-pages/libmongoc/${CURRENT_VERSION}/index.html upload-mo-artifacts: - command: subprocess.exec params: @@ -767,7 +754,7 @@ functions: local_file: mongoc/mongodb-logs.tar.gz optional: true permissions: public-read - remote_file: mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz + remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-mongodb-logs.tar.gz - command: s3.put params: display_name: orchestration.log @@ -778,7 +765,7 @@ functions: local_file: mongoc/MO/server.log optional: true permissions: public-read - remote_file: mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log + remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/logs/${task_id}-${execution}-orchestration.log - command: subprocess.exec params: binary: bash @@ -821,7 +808,7 @@ functions: local_file: mongo-coredumps.tgz optional: true permissions: public-read - remote_file: mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log + remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/coredumps/${task_id}-${execution}-coredumps.log upload-test-results: - command: subprocess.exec params: diff -pruN 1.30.4-1/.evergreen/generated_configs/legacy-config.yml 2.0.2-1/.evergreen/generated_configs/legacy-config.yml --- 1.30.4-1/.evergreen/generated_configs/legacy-config.yml 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/generated_configs/legacy-config.yml 2025-06-19 15:42:22.000000000 +0000 @@ -27,12 +27,12 @@ functions: set -o errexit export AWS_ACCESS_KEY_ID=${aws_key} export AWS_SECRET_ACCESS_KEY=${aws_secret} - aws s3 cp coverage s3://mciuploads/mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/coverage/ --recursive --acl public-read --region us-east-1 + aws s3 cp coverage s3://mciuploads/${project}/${build_variant}/${revision}/${version_id}/${build_id}/coverage/ --recursive --acl public-read --region us-east-1 - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/coverage/index.html + remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/coverage/index.html bucket: mciuploads permissions: public-read local_file: mongoc/coverage/index.html @@ -60,12 +60,12 @@ functions: set -o errexit export AWS_ACCESS_KEY_ID=${aws_key} export AWS_SECRET_ACCESS_KEY=${aws_secret} - aws s3 cp scan s3://mciuploads/mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/scan/ --recursive --acl public-read --region us-east-1 + aws s3 cp scan s3://mciuploads/${project}/${build_variant}/${revision}/${version_id}/${build_id}/scan/ --recursive --acl public-read --region us-east-1 - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${build_variant}/${revision}/${version_id}/${build_id}/scan/index.html + remote_file: ${project}/${build_variant}/${revision}/${version_id}/${build_id}/scan/index.html bucket: mciuploads permissions: public-read local_file: mongoc/scan.html @@ -94,7 +94,6 @@ functions: # Compile a program that links dynamically or statically to libmongoc, # using variables from pkg-config or CMake's find_package command. export BUILD_SAMPLE_WITH_CMAKE=${BUILD_SAMPLE_WITH_CMAKE} - export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED} export ENABLE_SSL=${ENABLE_SSL} export ENABLE_SNAPPY=${ENABLE_SNAPPY} LINK_STATIC= .evergreen/scripts/link-sample-program.sh @@ -111,12 +110,10 @@ functions: set -o errexit # Compile a program that links dynamically or statically to libbson, # using variables from pkg-config or from CMake's find_package command. - BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh link sample program MSVC: - command: shell.exec type: test @@ -355,21 +352,6 @@ tasks: set -o errexit env SNAPPY="OFF" ZLIB="OFF" ZSTD="ON" .evergreen/scripts/compile.sh - func: upload-build -- name: debug-compile-no-align - tags: - - debug-compile - commands: - - func: find-cmake-latest - - command: shell.exec - type: test - params: - working_dir: mongoc - add_expansions_to_env: true - shell: bash - script: |- - set -o errexit - env EXTRA_CONFIGURE_FLAGS="-DENABLE_EXTRA_ALIGNMENT=OFF" SNAPPY="OFF" ZLIB="BUNDLED" ZSTD="OFF" .evergreen/scripts/compile.sh - - func: upload-build - name: debug-compile-nosasl-nossl tags: - debug-compile @@ -649,40 +631,6 @@ tasks: - func: link sample program vars: BUILD_SAMPLE_WITH_CMAKE: 1 -- name: link-with-cmake-deprecated - commands: - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: link sample program - vars: - BUILD_SAMPLE_WITH_CMAKE: 1 - BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1 -- name: link-with-cmake-ssl-deprecated - commands: - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: link sample program - vars: - BUILD_SAMPLE_WITH_CMAKE: 1 - BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1 - ENABLE_SSL: 1 -- name: link-with-cmake-snappy-deprecated - commands: - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: link sample program - vars: - BUILD_SAMPLE_WITH_CMAKE: 1 - BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1 - ENABLE_SNAPPY: 'ON' -- name: link-with-cmake-mac-deprecated - commands: - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: link sample program - vars: - BUILD_SAMPLE_WITH_CMAKE: 1 - BUILD_SAMPLE_WITH_CMAKE_DEPRECATED: 1 - name: link-with-cmake-windows commands: - func: fetch-det @@ -753,7 +701,7 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${branch_name}/mongo-c-driver-debian-packages-${CURRENT_VERSION}.tar.gz + remote_file: ${project}/${branch_name}/mongo-c-driver-debian-packages-${CURRENT_VERSION}.tar.gz bucket: mciuploads permissions: public-read local_file: deb.tar.gz @@ -762,7 +710,7 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-debian-packages.tar.gz + remote_file: ${project}/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-debian-packages.tar.gz bucket: mciuploads permissions: public-read local_file: deb.tar.gz @@ -771,7 +719,7 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${branch_name}/mongo-c-driver-debian-packages-i386-${CURRENT_VERSION}.tar.gz + remote_file: ${project}/${branch_name}/mongo-c-driver-debian-packages-i386-${CURRENT_VERSION}.tar.gz bucket: mciuploads permissions: public-read local_file: deb-i386.tar.gz @@ -780,7 +728,7 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-debian-packages-i386.tar.gz + remote_file: ${project}/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-debian-packages-i386.tar.gz bucket: mciuploads permissions: public-read local_file: deb-i386.tar.gz @@ -808,7 +756,7 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${branch_name}/mongo-c-driver-rpm-packages-${CURRENT_VERSION}.tar.gz + remote_file: ${project}/${branch_name}/mongo-c-driver-rpm-packages-${CURRENT_VERSION}.tar.gz bucket: mciuploads permissions: public-read local_file: rpm.tar.gz @@ -817,7 +765,7 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: mongo-c-driver/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-rpm-packages.tar.gz + remote_file: ${project}/${branch_name}/${revision}/${version_id}/${build_id}/${execution}/mongo-c-driver-rpm-packages.tar.gz bucket: mciuploads permissions: public-read local_file: rpm.tar.gz @@ -1307,7 +1255,7 @@ tasks: shell: bash script: |- set -o errexit - env SANITIZE=address SASL=AUTO SSL=OPENSSL EXTRA_CONFIGURE_FLAGS='-DENABLE_EXTRA_ALIGNMENT=OFF' .evergreen/scripts/compile.sh + env SANITIZE=address SASL=AUTO SSL=OPENSSL .evergreen/scripts/compile.sh - func: run auth tests vars: ASAN: 'on' @@ -1571,63 +1519,6 @@ tasks: env SASL=OFF SSL=OPENSSL .evergreen/scripts/compile.sh - func: run auth tests - func: upload-build -- name: build-and-run-authentication-tests-libressl-2.5 - commands: - - func: install ssl - vars: - SSL: libressl-2.5.2 - - func: find-cmake-latest - - command: shell.exec - type: test - params: - working_dir: mongoc - add_expansions_to_env: true - shell: bash - script: |- - set -o errexit - env SASL=OFF SSL=LIBRESSL .evergreen/scripts/compile.sh - - func: run auth tests - vars: - require_tls12: true - - func: upload-build -- name: build-and-run-authentication-tests-libressl-3.0-auto - commands: - - func: install ssl - vars: - SSL: libressl-3.0.2 - - func: find-cmake-latest - - command: shell.exec - type: test - params: - working_dir: mongoc - add_expansions_to_env: true - shell: bash - script: |- - set -o errexit - env SASL=OFF SSL=AUTO .evergreen/scripts/compile.sh - - func: run auth tests - vars: - require_tls12: true - - func: upload-build -- name: build-and-run-authentication-tests-libressl-3.0 - commands: - - func: install ssl - vars: - SSL: libressl-3.0.2 - - func: find-cmake-latest - - command: shell.exec - type: test - params: - working_dir: mongoc - add_expansions_to_env: true - shell: bash - script: |- - set -o errexit - env SASL=OFF SSL=LIBRESSL .evergreen/scripts/compile.sh - - func: run auth tests - vars: - require_tls12: true - - func: upload-build - name: test-latest-server-ipv6-client-ipv6-noauth-nosasl-nossl tags: - ipv4-ipv6 @@ -16343,11 +16234,8 @@ buildvariants: - debug-compile-no-counters - compile-tracing - link-with-cmake - - link-with-cmake-deprecated - link-with-cmake-ssl - - link-with-cmake-ssl-deprecated - link-with-cmake-snappy - - link-with-cmake-snappy-deprecated - name: link-with-cmake-mac distros: - macos-14-arm64 @@ -16399,16 +16287,13 @@ buildvariants: tags: - pr-merge-gate - name: openssl - display_name: OpenSSL / LibreSSL + display_name: OpenSSL run_on: archlinux-build tasks: - build-and-run-authentication-tests-openssl-1.0.1 - build-and-run-authentication-tests-openssl-1.0.2 - build-and-run-authentication-tests-openssl-1.1.0 - build-and-run-authentication-tests-openssl-1.0.1-fips - - build-and-run-authentication-tests-libressl-2.5 - - build-and-run-authentication-tests-libressl-3.0-auto - - build-and-run-authentication-tests-libressl-3.0 - name: clang37 display_name: clang 3.7 (Archlinux) expansions: @@ -16428,7 +16313,6 @@ buildvariants: tasks: - release-compile - debug-compile-nosasl-nossl - - debug-compile-no-align - .debug-compile !.sspi .nossl .nosasl - .latest .nossl .nosasl - name: gcc82rhel @@ -16472,7 +16356,6 @@ buildvariants: tasks: - release-compile - debug-compile-nosasl-nossl - - debug-compile-no-align - .latest .nossl .nosasl - name: gcc94 display_name: GCC 9.4 (Ubuntu 20.04) @@ -16484,7 +16367,6 @@ buildvariants: - debug-compile-nosrv - release-compile - debug-compile-nosasl-nossl - - debug-compile-no-align - debug-compile-sasl-openssl - debug-compile-nosasl-openssl - .authentication-tests .openssl @@ -16504,7 +16386,6 @@ buildvariants: - .compression !.snappy - release-compile - debug-compile-nosasl-nossl - - debug-compile-no-align - debug-compile-nosrv - debug-compile-sasl-darwinssl - debug-compile-nosasl-nossl @@ -16539,11 +16420,14 @@ buildvariants: CC: Visual Studio 15 2017 Win64 run_on: windows-vsCurrent-large tasks: + - release-compile - debug-compile-nosasl-nossl - debug-compile-nosasl-openssl - debug-compile-sspi-winssl + - debug-compile-nosrv - .latest .nossl - .nosasl .latest .nossl + - .compression !.snappy !.zstd !.latest - test-dns-winssl - test-dns-auth-winssl - debug-compile-aws @@ -16559,13 +16443,6 @@ buildvariants: tasks: - debug-compile-nosasl-nossl - .latest .nossl .nosasl .server -- name: mingw - display_name: MinGW-W64 - expansions: - CC: mingw - run_on: windows-vsCurrent-large - tasks: - - debug-compile-no-align - name: rhel8-power display_name: Power (ppc64le) (RHEL 8) expansions: @@ -16586,7 +16463,6 @@ buildvariants: run_on: ubuntu2004-arm64-large tasks: - .compression !.snappy !.zstd - - debug-compile-no-align - release-compile - debug-compile-nosasl-nossl - debug-compile-nosasl-openssl @@ -16602,7 +16478,6 @@ buildvariants: run_on: rhel8-zseries-large tasks: - release-compile - - debug-compile-no-align - debug-compile-nosasl-nossl - debug-compile-nosasl-openssl - debug-compile-sasl-openssl diff -pruN 1.30.4-1/.evergreen/generated_configs/tasks.yml 2.0.2-1/.evergreen/generated_configs/tasks.yml --- 1.30.4-1/.evergreen/generated_configs/tasks.yml 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/generated_configs/tasks.yml 2025-06-19 15:42:22.000000000 +0000 @@ -10,6 +10,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: asan-cse-sasl-cyrus-openssl-debian10-clang-test-4.2-server-auth run_on: debian10-small @@ -23,6 +24,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -45,6 +47,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -64,6 +67,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: asan-cse-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth run_on: ubuntu2004-small @@ -77,6 +81,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -99,6 +104,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -122,6 +128,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -144,6 +151,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -167,6 +175,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -189,6 +198,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -212,6 +222,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -234,6 +245,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -257,6 +269,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -279,6 +292,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -302,6 +316,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -324,6 +339,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -347,6 +363,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -369,6 +386,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -392,6 +410,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -414,6 +433,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -437,6 +457,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -459,6 +480,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -482,6 +504,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -504,6 +527,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -527,6 +551,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -549,6 +574,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -572,6 +598,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -594,6 +621,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -613,6 +641,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: asan-sasl-cyrus-openssl-debian10-clang-test-4.2-replica-auth run_on: debian10-small @@ -626,6 +655,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: replica_set } @@ -646,6 +676,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -666,6 +697,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: sharded_cluster } @@ -682,6 +714,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: asan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth run_on: ubuntu2004-small @@ -695,6 +728,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -715,6 +749,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -735,6 +770,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: sharded_cluster } @@ -755,6 +791,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -775,6 +812,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -795,6 +833,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -815,6 +854,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -835,6 +875,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -855,6 +896,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -875,6 +917,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -895,6 +938,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -915,6 +959,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -935,6 +980,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -955,6 +1001,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -975,6 +1022,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -995,6 +1043,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -1015,6 +1064,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -1035,6 +1085,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: sharded_cluster } @@ -1046,93 +1097,13 @@ tasks: - name: check-headers commands: - func: check-headers - - name: "check:sasl=Cyrus\_\u2022\_tls=LibreSSL\_\u2022\_test_mongocxx_ref=r3.8.0" - run_on: - - ubuntu2204-large - - debian10-large - - debian11-large - - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc] - commands: - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" - - command: subprocess.exec - type: setup - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +env-warmup - - --sasl=Cyrus - - --tls=LibreSSL - - --test_mongocxx_ref=r3.8.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - command: subprocess.exec - type: test - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +run - - --targets=test-example test-cxx-driver - - --sasl=Cyrus - - --tls=LibreSSL - - --test_mongocxx_ref=r3.8.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=Cyrus\_\u2022\_tls=LibreSSL\_\u2022\_test_mongocxx_ref=r3.9.0" - run_on: - - ubuntu2204-large - - debian10-large - - debian11-large - - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc] - commands: - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" - - command: subprocess.exec - type: setup - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +env-warmup - - --sasl=Cyrus - - --tls=LibreSSL - - --test_mongocxx_ref=r3.9.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - command: subprocess.exec - type: test - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +run - - --targets=test-example test-cxx-driver - - --sasl=Cyrus - - --tls=LibreSSL - - --test_mongocxx_ref=r3.9.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=none" run_on: - ubuntu2204-large - debian10-large - debian11-large - amazon2 - tags: [earthly, pr-merge-gate, centos7-clang, centos7-gcc, u16-clang, u16-gcc] + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: - command: subprocess.exec type: setup @@ -1166,93 +1137,13 @@ tasks: - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=r3.8.0" - run_on: - - ubuntu2204-large - - debian10-large - - debian11-large - - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u18-clang, u20-clang, u20-gcc, u22-clang, u22-gcc] - commands: - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" - - command: subprocess.exec - type: setup - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +env-warmup - - --sasl=Cyrus - - --tls=OpenSSL - - --test_mongocxx_ref=r3.8.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - command: subprocess.exec - type: test - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +run - - --targets=test-example test-cxx-driver - - --sasl=Cyrus - - --tls=OpenSSL - - --test_mongocxx_ref=r3.8.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=Cyrus\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=r3.9.0" - run_on: - - ubuntu2204-large - - debian10-large - - debian11-large - - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] - commands: - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" - - command: subprocess.exec - type: setup - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +env-warmup - - --sasl=Cyrus - - --tls=OpenSSL - - --test_mongocxx_ref=r3.9.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - command: subprocess.exec - type: test - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +run - - --targets=test-example test-cxx-driver - - --sasl=Cyrus - - --tls=OpenSSL - - --test_mongocxx_ref=r3.9.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=none" run_on: - ubuntu2204-large - debian10-large - debian11-large - amazon2 - tags: [earthly, pr-merge-gate, centos7-clang, centos7-gcc, u16-clang, u16-gcc] + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: - command: subprocess.exec type: setup @@ -1286,13 +1177,13 @@ tasks: - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=r3.8.0" + - name: "check:sasl=off\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=none" run_on: - ubuntu2204-large - debian10-large - debian11-large - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u18-clang, u20-clang, u20-gcc, u22-clang, u22-gcc] + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: - command: subprocess.exec type: setup @@ -1308,49 +1199,9 @@ tasks: working_dir: mongoc args: - +env-warmup - - --sasl=Cyrus - - --tls=off - - --test_mongocxx_ref=r3.8.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - command: subprocess.exec - type: test - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +run - - --targets=test-example test-cxx-driver - - --sasl=Cyrus - - --tls=off - - --test_mongocxx_ref=r3.8.0 - - --env=${MONGOC_EARTHLY_ENV} - - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=Cyrus\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=r3.9.0" - run_on: - - ubuntu2204-large - - debian10-large - - debian11-large - - amazon2 - tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] - commands: - - command: subprocess.exec - type: setup - params: - binary: bash - args: - - -c - - docker login -u "${artifactory_username}" --password-stdin artifactory.corp.mongodb.com <<<"${artifactory_password}" - - command: subprocess.exec - type: setup - params: - binary: ./tools/earthly.sh - working_dir: mongoc - args: - - +env-warmup - - --sasl=Cyrus - - --tls=off - - --test_mongocxx_ref=r3.9.0 + - --sasl=off + - --tls=OpenSSL + - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - command: subprocess.exec @@ -1360,19 +1211,19 @@ tasks: working_dir: mongoc args: - +run - - --targets=test-example test-cxx-driver - - --sasl=Cyrus - - --tls=off - - --test_mongocxx_ref=r3.9.0 + - --targets=test-example + - --sasl=off + - --tls=OpenSSL + - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - - name: "check:sasl=off\_\u2022\_tls=OpenSSL\_\u2022\_test_mongocxx_ref=r3.8.0" + - name: "check:sasl=off\_\u2022\_tls=off\_\u2022\_test_mongocxx_ref=none" run_on: - ubuntu2204-large - debian10-large - debian11-large - amazon2 - tags: [earthly, pr-merge-gate, u22-gcc] + tags: [earthly, pr-merge-gate, alpine3.16-clang, alpine3.16-gcc, alpine3.17-clang, alpine3.17-gcc, alpine3.18-clang, alpine3.18-gcc, alpine3.19-clang, alpine3.19-gcc, archlinux-clang, archlinux-gcc, centos7-clang, centos7-gcc, u16-clang, u16-gcc, u18-clang, u18-gcc, u20-clang, u20-gcc, u22-clang, u22-gcc] commands: - command: subprocess.exec type: setup @@ -1389,8 +1240,8 @@ tasks: args: - +env-warmup - --sasl=off - - --tls=OpenSSL - - --test_mongocxx_ref=r3.8.0 + - --tls=off + - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - command: subprocess.exec @@ -1400,10 +1251,10 @@ tasks: working_dir: mongoc args: - +run - - --targets=test-example test-cxx-driver + - --targets=test-example - --sasl=off - - --tls=OpenSSL - - --test_mongocxx_ref=r3.8.0 + - --tls=off + - --test_mongocxx_ref=none - --env=${MONGOC_EARTHLY_ENV} - --c_compiler=${MONGOC_EARTHLY_C_COMPILER} - name: clang-format @@ -1418,6 +1269,7 @@ tasks: - func: cse-sasl-cyrus-darwinssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-server-auth run_on: macos-11-arm64 @@ -1431,6 +1283,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -1447,6 +1300,7 @@ tasks: - func: cse-sasl-cyrus-darwinssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-server-auth run_on: macos-14-arm64 @@ -1460,6 +1314,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -1480,6 +1335,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -1500,6 +1356,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -1520,6 +1377,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -1540,6 +1398,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -1560,6 +1419,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -1580,6 +1440,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -1596,6 +1457,7 @@ tasks: - func: cse-sasl-cyrus-darwinssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-darwinssl-macos-14-clang-test-4.2-server-auth run_on: macos-14 @@ -1609,6 +1471,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -1629,6 +1492,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -1649,6 +1513,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -1665,6 +1530,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-openssl-debian10-gcc-compile run_on: debian10-large @@ -1674,6 +1540,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth run_on: debian10-small @@ -1687,6 +1554,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: replica_set } @@ -1707,6 +1575,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -1723,6 +1592,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-openssl-debian11-gcc-compile run_on: debian11-large @@ -1732,6 +1602,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-debian92-clang-compile run_on: debian92-large @@ -1741,6 +1612,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-openssl-debian92-gcc-compile run_on: debian92-large @@ -1750,6 +1622,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-compile run_on: rhel8-zseries-large @@ -1760,6 +1633,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth run_on: rhel8-zseries-small @@ -1774,6 +1648,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -1795,6 +1670,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -1816,6 +1692,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -1837,6 +1714,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -1858,6 +1736,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -1879,6 +1758,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -1900,6 +1780,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -1916,6 +1797,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile run_on: ubuntu2004-arm64-large @@ -1925,6 +1807,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-replica-auth run_on: ubuntu2004-arm64-small @@ -1938,6 +1821,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -1958,6 +1842,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -1978,6 +1863,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -1998,6 +1884,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -2018,6 +1905,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -2038,6 +1926,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -2058,6 +1947,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -2078,6 +1968,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -2098,6 +1989,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -2118,6 +2010,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -2138,6 +2031,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -2158,6 +2052,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -2174,6 +2069,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-compile run_on: ubuntu2004-large @@ -2183,6 +2079,7 @@ tasks: - func: cse-sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: cse-sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-replica-auth run_on: ubuntu2004-small @@ -2196,6 +2093,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -2216,6 +2114,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -2236,6 +2135,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -2256,6 +2156,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -2276,6 +2177,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -2296,6 +2198,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -2316,6 +2219,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -2336,6 +2240,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -2356,6 +2261,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -2376,6 +2282,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -2396,6 +2303,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -2416,6 +2324,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -2431,7 +2340,8 @@ tasks: - func: find-cmake-latest - func: cse-sasl-cyrus-openssl-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build - name: cse-sasl-cyrus-openssl-windows-2019-vs2017-x64-test-4.2-server-auth run_on: windows-vsCurrent-small @@ -2444,7 +2354,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -2464,7 +2375,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -2484,7 +2396,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -2504,7 +2417,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -2524,7 +2438,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -2544,7 +2459,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -2564,7 +2480,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -2584,7 +2501,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -2604,7 +2522,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -2624,7 +2543,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -2640,7 +2560,8 @@ tasks: - func: find-cmake-latest - func: cse-sasl-cyrus-winssl-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build - name: cse-sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.2-server-auth run_on: windows-vsCurrent-small @@ -2653,7 +2574,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -2673,7 +2595,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -2693,7 +2616,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -2713,7 +2637,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -2733,7 +2658,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -2753,7 +2679,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -2773,7 +2700,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -2793,7 +2721,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -2813,7 +2742,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -2833,7 +2763,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -2858,7 +2789,6 @@ tasks: env: CC: gcc CFLAGS: -fno-omit-frame-pointer - EXTRA_CONFIGURE_FLAGS: -DENABLE_EXTRA_ALIGNMENT=OFF SSL: OPENSSL args: - -c @@ -3161,6 +3091,7 @@ tasks: - func: openssl-static-compile vars: CC: gcc + CXX: g++ - name: openssl-static-compile-debian11-gcc run_on: debian11-large tags: [openssl-static-matrix, debian11, gcc] @@ -3169,6 +3100,7 @@ tasks: - func: openssl-static-compile vars: CC: gcc + CXX: g++ - name: openssl-static-compile-debian92-gcc run_on: debian92-large tags: [openssl-static-matrix, debian92, gcc] @@ -3177,6 +3109,7 @@ tasks: - func: openssl-static-compile vars: CC: gcc + CXX: g++ - name: openssl-static-compile-ubuntu2004-gcc run_on: ubuntu2004-large tags: [openssl-static-matrix, ubuntu2004, gcc] @@ -3185,6 +3118,7 @@ tasks: - func: openssl-static-compile vars: CC: gcc + CXX: g++ - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-compile run_on: macos-11-arm64 tags: [sasl-matrix-darwinssl, compile, macos-11-arm64, clang, sasl-cyrus] @@ -3193,6 +3127,7 @@ tasks: - func: sasl-cyrus-darwinssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: sasl-cyrus-darwinssl-macos-11-arm64-clang-test-6.0-server-auth run_on: macos-11-arm64 @@ -3206,6 +3141,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -3226,6 +3162,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -3242,6 +3179,7 @@ tasks: - func: sasl-cyrus-darwinssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: sasl-cyrus-darwinssl-macos-14-arm64-clang-test-6.0-server-auth run_on: macos-14-arm64 @@ -3255,6 +3193,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -3275,6 +3214,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -3295,6 +3235,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -3315,6 +3256,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -3331,6 +3273,7 @@ tasks: - func: sasl-cyrus-darwinssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: sasl-cyrus-darwinssl-macos-14-clang-test-4.0-server-auth run_on: macos-14 @@ -3344,6 +3287,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.0" } - { key: TOPOLOGY, value: server } @@ -3364,6 +3308,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -3384,6 +3329,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -3404,6 +3350,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -3412,6 +3359,79 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile + run_on: amazon2023-arm64-latest-large-m8g + tags: [sasl-matrix-openssl, compile, amazon2023-arm64-latest-large-m8g, gcc, sasl-cyrus] + commands: + - func: find-cmake-latest + - func: sasl-cyrus-openssl-compile + vars: + CC: gcc + CXX: g++ + - func: upload-build + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-replica-auth + run_on: amazon2023-arm64-latest-large-m8g + tags: [sasl-matrix-openssl, test, amazon2023-arm64-latest-large-m8g, gcc, sasl-cyrus, auth, replica, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: latest } + - { key: TOPOLOGY, value: replica_set } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-server-auth + run_on: amazon2023-arm64-latest-large-m8g + tags: [sasl-matrix-openssl, test, amazon2023-arm64-latest-large-m8g, gcc, sasl-cyrus, auth, server, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: latest } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-sharded-auth + run_on: amazon2023-arm64-latest-large-m8g + tags: [sasl-matrix-openssl, test, amazon2023-arm64-latest-large-m8g, gcc, sasl-cyrus, auth, sharded, latest, openssl] + depends_on: [{ name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile + - command: expansions.update + params: + updates: + - { key: CC, value: gcc } + - { key: CXX, value: g++ } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: latest } + - { key: TOPOLOGY, value: sharded_cluster } + - { key: SSL, value: openssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests - name: sasl-cyrus-openssl-debian10-gcc-compile run_on: debian10-large tags: [sasl-matrix-openssl, compile, debian10, gcc, sasl-cyrus] @@ -3420,6 +3440,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth run_on: debian10-small @@ -3433,6 +3454,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: replica_set } @@ -3453,6 +3475,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -3469,6 +3492,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-debian92-clang-compile run_on: debian92-large @@ -3478,6 +3502,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: sasl-cyrus-openssl-debian92-gcc-compile run_on: debian92-large @@ -3487,6 +3512,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-rhel8-power-gcc-compile run_on: rhel8-power-large @@ -3497,6 +3523,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.2-server-auth run_on: rhel8-power-small @@ -3511,6 +3538,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -3532,6 +3560,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -3553,6 +3582,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -3574,6 +3604,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -3595,6 +3626,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -3616,6 +3648,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -3637,6 +3670,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -3654,6 +3688,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-rhel8-zseries-gcc-test-5.0-server-auth run_on: rhel8-zseries-small @@ -3668,6 +3703,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -3689,6 +3725,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -3710,6 +3747,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -3731,6 +3769,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -3752,6 +3791,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -3768,6 +3808,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile run_on: ubuntu2004-arm64-large @@ -3777,6 +3818,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-test-4.4-server-auth run_on: ubuntu2004-arm64-small @@ -3790,6 +3832,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -3810,6 +3853,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -3830,6 +3874,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -3850,6 +3895,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -3870,6 +3916,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -3890,6 +3937,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -3906,6 +3954,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: sasl-cyrus-openssl-ubuntu2004-gcc-compile run_on: ubuntu2004-large @@ -3915,6 +3964,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-cyrus-openssl-ubuntu2004-gcc-test-4.4-server-auth run_on: ubuntu2004-small @@ -3928,6 +3978,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -3948,6 +3999,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -3968,6 +4020,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -3988,6 +4041,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -4008,6 +4062,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -4028,6 +4083,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4043,7 +4099,8 @@ tasks: - func: find-cmake-latest - func: sasl-cyrus-openssl-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-test-latest-server-auth run_on: windows-vsCurrent-small @@ -4056,7 +4113,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4065,175 +4123,6 @@ tasks: - func: bootstrap-mongo-orchestration - func: run-simple-http-server - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - run_on: windows-vsCurrent-large - tags: [sasl-matrix-winssl, compile, windows-vsCurrent, vs2017x64, sasl-cyrus] - commands: - - func: find-cmake-latest - - func: sasl-cyrus-winssl-compile - vars: - CC: Visual Studio 15 2017 Win64 - - func: upload-build - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.0-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.0", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.2-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.2", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.2" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-4.4-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "4.4", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "4.4" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-5.0-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "5.0", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "5.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-6.0-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "6.0", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "6.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-7.0-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "7.0", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "7.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-8.0-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, "8.0", winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: "8.0" } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - - name: sasl-cyrus-winssl-windows-2019-vs2017-x64-test-latest-server-auth - run_on: windows-vsCurrent-small - tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-cyrus, auth, server, latest, winssl] - depends_on: [{ name: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile }] - commands: - - func: fetch-build - vars: - BUILD_NAME: sasl-cyrus-winssl-windows-2019-vs2017-x64-compile - - command: expansions.update - params: - updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } - - { key: AUTH, value: auth } - - { key: MONGODB_VERSION, value: latest } - - { key: TOPOLOGY, value: server } - - { key: SSL, value: winssl } - - func: fetch-det - - func: bootstrap-mongo-orchestration - - func: run-simple-http-server - - func: run-tests - name: sasl-off-nossl-debian10-gcc-compile run_on: debian10-large tags: [sasl-matrix-nossl, compile, debian10, gcc, sasl-off] @@ -4242,6 +4131,7 @@ tasks: - func: sasl-off-nossl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-off-nossl-debian10-gcc-test-4.2-replica-noauth run_on: debian10-small @@ -4255,6 +4145,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: replica_set } @@ -4275,6 +4166,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -4295,6 +4187,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: sharded_cluster } @@ -4311,6 +4204,7 @@ tasks: - func: sasl-off-nossl-compile vars: CC: gcc + CXX: g++ - func: upload-build - name: sasl-off-nossl-ubuntu2004-gcc-test-4.4-replica-noauth run_on: ubuntu2004-small @@ -4324,6 +4218,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -4344,6 +4239,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -4364,6 +4260,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: sharded_cluster } @@ -4384,6 +4281,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -4404,6 +4302,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -4424,6 +4323,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -4444,6 +4344,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -4464,6 +4365,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -4484,6 +4386,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -4504,6 +4407,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -4524,6 +4428,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -4544,6 +4449,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -4564,6 +4470,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -4584,6 +4491,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -4604,6 +4512,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -4624,6 +4533,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -4644,6 +4554,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4664,6 +4575,7 @@ tasks: params: updates: - { key: CC, value: gcc } + - { key: CXX, value: g++ } - { key: AUTH, value: noauth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: sharded_cluster } @@ -4679,7 +4591,8 @@ tasks: - func: find-cmake-latest - func: sasl-off-nossl-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build - name: sasl-off-winssl-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large @@ -4688,7 +4601,8 @@ tasks: - func: find-cmake-latest - func: sasl-off-winssl-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build - name: sasl-off-winssl-windows-2019-vs2017-x86-compile run_on: windows-vsCurrent-large @@ -4697,7 +4611,8 @@ tasks: - func: find-cmake-latest - func: sasl-off-winssl-compile vars: - CC: Visual Studio 15 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: Win32 - func: upload-build - name: sasl-sspi-winssl-windows-2019-mingw-compile run_on: windows-vsCurrent-large @@ -4707,6 +4622,7 @@ tasks: - func: sasl-sspi-winssl-compile vars: CC: mingw + CXX: mingw - func: upload-build - name: sasl-sspi-winssl-windows-2019-mingw-test-8.0-server-auth run_on: windows-vsCurrent-small @@ -4720,6 +4636,7 @@ tasks: params: updates: - { key: CC, value: mingw } + - { key: CXX, value: mingw } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -4740,6 +4657,7 @@ tasks: params: updates: - { key: CC, value: mingw } + - { key: CXX, value: mingw } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4755,8 +4673,135 @@ tasks: - func: find-cmake-latest - func: sasl-sspi-winssl-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 - func: upload-build + - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.0-server-auth + run_on: windows-vsCurrent-small + tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.0", winssl] + depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: winssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.2-server-auth + run_on: windows-vsCurrent-small + tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.2", winssl] + depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.2" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: winssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-4.4-server-auth + run_on: windows-vsCurrent-small + tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "4.4", winssl] + depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "4.4" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: winssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-5.0-server-auth + run_on: windows-vsCurrent-small + tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "5.0", winssl] + depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "5.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: winssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-6.0-server-auth + run_on: windows-vsCurrent-small + tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "6.0", winssl] + depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "6.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: winssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests + - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-7.0-server-auth + run_on: windows-vsCurrent-small + tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "7.0", winssl] + depends_on: [{ name: sasl-sspi-winssl-windows-2019-vs2017-x64-compile }] + commands: + - func: fetch-build + vars: + BUILD_NAME: sasl-sspi-winssl-windows-2019-vs2017-x64-compile + - command: expansions.update + params: + updates: + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } + - { key: AUTH, value: auth } + - { key: MONGODB_VERSION, value: "7.0" } + - { key: TOPOLOGY, value: server } + - { key: SSL, value: winssl } + - func: fetch-det + - func: bootstrap-mongo-orchestration + - func: run-simple-http-server + - func: run-tests - name: sasl-sspi-winssl-windows-2019-vs2017-x64-test-8.0-server-auth run_on: windows-vsCurrent-small tags: [sasl-matrix-winssl, test, windows-vsCurrent, vs2017x64, sasl-sspi, auth, server, "8.0", winssl] @@ -4768,7 +4813,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -4788,7 +4834,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 Win64 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: x64 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4804,7 +4851,8 @@ tasks: - func: find-cmake-latest - func: sasl-sspi-winssl-compile vars: - CC: Visual Studio 15 2017 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: Win32 - func: upload-build - name: sasl-sspi-winssl-windows-2019-vs2017-x86-test-8.0-server-auth run_on: windows-vsCurrent-small @@ -4817,7 +4865,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: Win32 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -4837,7 +4886,8 @@ tasks: - command: expansions.update params: updates: - - { key: CC, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR, value: Visual Studio 15 2017 } + - { key: CMAKE_GENERATOR_PLATFORM, value: Win32 } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -4859,6 +4909,7 @@ tasks: - func: scan-build vars: CC: clang + CXX: clang++ - func: upload scan artifacts - name: scan-build-ubuntu2004-arm64-clang run_on: ubuntu2004-arm64-large @@ -4868,6 +4919,7 @@ tasks: - func: scan-build vars: CC: clang + CXX: clang++ - func: upload scan artifacts - name: scan-build-ubuntu2004-clang-i686 run_on: ubuntu2004-large @@ -4877,52 +4929,178 @@ tasks: - func: scan-build vars: CC: clang + CXX: clang++ MARCH: i686 - func: upload scan artifacts - - name: std-c11-debian10-clang-compile + - name: std-c11-debian10-gcc-compile run_on: debian10-large - tags: [std-matrix, debian10, clang, compile, std-c11] + tags: [std-matrix, debian10, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-8 + CXX: g++-8 + C_STD_VERSION: 11 + - name: std-c11-debian11-gcc-compile + run_on: debian11-large + tags: [std-matrix, debian11, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-10 + CXX: g++-10 + C_STD_VERSION: 11 + - name: std-c11-rhel76-gcc-compile + run_on: rhel76-large + tags: [std-matrix, rhel76, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 11 + - name: std-c11-rhel80-clang-compile + run_on: rhel80-large + tags: [std-matrix, rhel80, clang, compile, std-c11] commands: - func: find-cmake-latest - func: std-compile vars: CC: clang + CXX: clang++ C_STD_VERSION: 11 - - name: std-c11-debian10-gcc-compile - run_on: debian10-large - tags: [std-matrix, debian10, gcc, compile, std-c11] + - name: std-c11-rhel80-gcc-compile + run_on: rhel80-large + tags: [std-matrix, rhel80, gcc, compile, std-c11] commands: - func: find-cmake-latest - func: std-compile vars: CC: gcc + CXX: g++ C_STD_VERSION: 11 - - name: std-c11-debian11-clang-compile - run_on: debian11-large - tags: [std-matrix, debian11, clang, compile, std-c11] + - name: std-c11-rhel84-clang-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, clang, compile, std-c11] commands: - func: find-cmake-latest - func: std-compile vars: CC: clang + CXX: clang++ C_STD_VERSION: 11 - - name: std-c11-debian11-gcc-compile - run_on: debian11-large - tags: [std-matrix, debian11, gcc, compile, std-c11] + - name: std-c11-rhel84-gcc-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, gcc, compile, std-c11] commands: - func: find-cmake-latest - func: std-compile vars: CC: gcc + CXX: g++ C_STD_VERSION: 11 - - name: std-c11-debian92-clang-compile - run_on: debian92-large - tags: [std-matrix, debian92, clang, compile, std-c11] + - name: std-c11-rhel90-clang-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, clang, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 11 + - name: std-c11-rhel90-gcc-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 11 + - name: std-c11-rhel91-clang-compile + run_on: rhel91-large + tags: [std-matrix, rhel91, clang, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 11 + - name: std-c11-rhel92-clang-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, clang, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 11 + - name: std-c11-rhel92-gcc-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 11 + - name: std-c11-rhel93-clang-compile + run_on: rhel93-large + tags: [std-matrix, rhel93, clang, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 11 + - name: std-c11-rhel94-clang-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, clang, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 11 + - name: std-c11-rhel94-gcc-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 11 + - name: std-c11-rhel95-clang-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, clang, compile, std-c11] commands: - func: find-cmake-latest - func: std-compile vars: CC: clang + CXX: clang++ + C_STD_VERSION: 11 + - name: std-c11-rhel95-gcc-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, gcc, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ C_STD_VERSION: 11 - name: std-c11-ubuntu2004-clang-compile run_on: ubuntu2004-large @@ -4931,7 +5109,8 @@ tasks: - func: find-cmake-latest - func: std-compile vars: - CC: clang + CC: clang-10 + CXX: clang++-10 C_STD_VERSION: 11 - name: std-c11-ubuntu2004-gcc-compile run_on: ubuntu2004-large @@ -4940,7 +5119,18 @@ tasks: - func: find-cmake-latest - func: std-compile vars: - CC: gcc + CC: gcc-9 + CXX: g++-9 + C_STD_VERSION: 11 + - name: std-c11-ubuntu2204-clang-compile + run_on: ubuntu2204-large + tags: [std-matrix, ubuntu2204, clang, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-12 + CXX: clang++-12 C_STD_VERSION: 11 - name: std-c11-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large @@ -4949,7 +5139,28 @@ tasks: - func: find-cmake-latest - func: std-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 11 + - name: std-c11-windows-2019-vs2019-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 11 + - name: std-c11-windows-2019-vs2022-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-c11] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 17 2022 + CMAKE_GENERATOR_PLATFORM: x64 C_STD_VERSION: 11 - name: std-c17-debian10-gcc-compile run_on: debian10-large @@ -4958,7 +5169,8 @@ tasks: - func: find-cmake-latest - func: std-compile vars: - CC: gcc + CC: gcc-8 + CXX: g++-8 C_STD_VERSION: 17 - name: std-c17-debian11-gcc-compile run_on: debian11-large @@ -4967,7 +5179,178 @@ tasks: - func: find-cmake-latest - func: std-compile vars: + CC: gcc-10 + CXX: g++-10 + C_STD_VERSION: 17 + - name: std-c17-rhel80-clang-compile + run_on: rhel80-large + tags: [std-matrix, rhel80, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel80-gcc-compile + run_on: rhel80-large + tags: [std-matrix, rhel80, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 17 + - name: std-c17-rhel84-clang-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel84-gcc-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 17 + - name: std-c17-rhel90-clang-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel90-gcc-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: CC: gcc + CXX: g++ + C_STD_VERSION: 17 + - name: std-c17-rhel91-clang-compile + run_on: rhel91-large + tags: [std-matrix, rhel91, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel92-clang-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel92-gcc-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 17 + - name: std-c17-rhel93-clang-compile + run_on: rhel93-large + tags: [std-matrix, rhel93, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel94-clang-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel94-gcc-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 17 + - name: std-c17-rhel95-clang-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 17 + - name: std-c17-rhel95-gcc-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 17 + - name: std-c17-ubuntu2004-clang-compile + run_on: ubuntu2004-large + tags: [std-matrix, ubuntu2004, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-10 + CXX: clang++-10 + C_STD_VERSION: 17 + - name: std-c17-ubuntu2004-gcc-compile + run_on: ubuntu2004-large + tags: [std-matrix, ubuntu2004, gcc, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-9 + CXX: g++-9 + C_STD_VERSION: 17 + - name: std-c17-ubuntu2204-clang-compile + run_on: ubuntu2204-large + tags: [std-matrix, ubuntu2204, clang, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-12 + CXX: clang++-12 C_STD_VERSION: 17 - name: std-c17-windows-2019-vs2017-x64-compile run_on: windows-vsCurrent-large @@ -4976,8 +5359,439 @@ tasks: - func: find-cmake-latest - func: std-compile vars: - CC: Visual Studio 15 2017 Win64 + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 17 + - name: std-c17-windows-2019-vs2019-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 17 + - name: std-c17-windows-2019-vs2022-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-c17] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 17 2022 + CMAKE_GENERATOR_PLATFORM: x64 C_STD_VERSION: 17 + - name: std-c23-debian11-gcc-compile + run_on: debian11-large + tags: [std-matrix, debian11, gcc, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-10 + CXX: g++-10 + C_STD_VERSION: 23 + - name: std-c23-rhel84-clang-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel90-clang-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel90-gcc-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, gcc, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 23 + - name: std-c23-rhel91-clang-compile + run_on: rhel91-large + tags: [std-matrix, rhel91, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel92-clang-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel92-gcc-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, gcc, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 23 + - name: std-c23-rhel93-clang-compile + run_on: rhel93-large + tags: [std-matrix, rhel93, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel94-clang-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel94-gcc-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, gcc, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 23 + - name: std-c23-rhel95-clang-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 23 + - name: std-c23-rhel95-gcc-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, gcc, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 23 + - name: std-c23-ubuntu2004-clang-compile + run_on: ubuntu2004-large + tags: [std-matrix, ubuntu2004, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-10 + CXX: clang++-10 + C_STD_VERSION: 23 + - name: std-c23-ubuntu2004-gcc-compile + run_on: ubuntu2004-large + tags: [std-matrix, ubuntu2004, gcc, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-9 + CXX: g++-9 + C_STD_VERSION: 23 + - name: std-c23-ubuntu2204-clang-compile + run_on: ubuntu2204-large + tags: [std-matrix, ubuntu2204, clang, compile, std-c23] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-12 + CXX: clang++-12 + C_STD_VERSION: 23 + - name: std-c99-debian10-gcc-compile + run_on: debian10-large + tags: [std-matrix, debian10, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-8 + CXX: g++-8 + C_STD_VERSION: 99 + - name: std-c99-debian11-gcc-compile + run_on: debian11-large + tags: [std-matrix, debian11, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-10 + CXX: g++-10 + C_STD_VERSION: 99 + - name: std-c99-rhel76-gcc-compile + run_on: rhel76-large + tags: [std-matrix, rhel76, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-rhel80-clang-compile + run_on: rhel80-large + tags: [std-matrix, rhel80, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel80-gcc-compile + run_on: rhel80-large + tags: [std-matrix, rhel80, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-rhel84-clang-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel84-gcc-compile + run_on: rhel84-large + tags: [std-matrix, rhel84, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-rhel90-clang-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel90-gcc-compile + run_on: rhel90-large + tags: [std-matrix, rhel90, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-rhel91-clang-compile + run_on: rhel91-large + tags: [std-matrix, rhel91, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel92-clang-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel92-gcc-compile + run_on: rhel92-large + tags: [std-matrix, rhel92, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-rhel93-clang-compile + run_on: rhel93-large + tags: [std-matrix, rhel93, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel94-clang-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel94-gcc-compile + run_on: rhel94-large + tags: [std-matrix, rhel94, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-rhel95-clang-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang + CXX: clang++ + C_STD_VERSION: 99 + - name: std-c99-rhel95-gcc-compile + run_on: rhel95-large + tags: [std-matrix, rhel95, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc + CXX: g++ + C_STD_VERSION: 99 + - name: std-c99-ubuntu2004-clang-compile + run_on: ubuntu2004-large + tags: [std-matrix, ubuntu2004, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-10 + CXX: clang++-10 + C_STD_VERSION: 99 + - name: std-c99-ubuntu2004-gcc-compile + run_on: ubuntu2004-large + tags: [std-matrix, ubuntu2004, gcc, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: gcc-9 + CXX: g++-9 + C_STD_VERSION: 99 + - name: std-c99-ubuntu2204-clang-compile + run_on: ubuntu2204-large + tags: [std-matrix, ubuntu2204, clang, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CC: clang-12 + CXX: clang++-12 + C_STD_VERSION: 99 + - name: std-c99-windows-2019-vs2017-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 99 + - name: std-c99-windows-2019-vs2019-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 99 + - name: std-c99-windows-2019-vs2022-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-c99] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 17 2022 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: 99 + - name: std-clatest-windows-2019-vs2017-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2017x64, compile, std-clatest] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 15 2017 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: latest + - name: std-clatest-windows-2019-vs2019-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2019x64, compile, std-clatest] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 16 2019 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: latest + - name: std-clatest-windows-2019-vs2022-x64-compile + run_on: windows-vsCurrent-large + tags: [std-matrix, windows-vsCurrent, vs2022x64, compile, std-clatest] + commands: + - func: find-cmake-latest + - func: std-compile + vars: + CMAKE_GENERATOR: Visual Studio 17 2022 + CMAKE_GENERATOR_PLATFORM: x64 + C_STD_VERSION: latest - name: tsan-sasl-cyrus-openssl-debian10-clang-compile run_on: debian10-large tags: [sanitizers-matrix-tsan, compile, debian10, clang, tsan, sasl-cyrus] @@ -4986,6 +5800,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: tsan-sasl-cyrus-openssl-debian10-clang-test-4.2-replica-auth run_on: debian10-small @@ -4999,6 +5814,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: replica_set } @@ -5019,6 +5835,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: server } @@ -5039,6 +5856,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.2" } - { key: TOPOLOGY, value: sharded_cluster } @@ -5055,6 +5873,7 @@ tasks: - func: sasl-cyrus-openssl-compile vars: CC: clang + CXX: clang++ - func: upload-build - name: tsan-sasl-cyrus-openssl-ubuntu2004-clang-test-4.4-replica-auth run_on: ubuntu2004-small @@ -5068,6 +5887,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: replica_set } @@ -5088,6 +5908,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: server } @@ -5108,6 +5929,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "4.4" } - { key: TOPOLOGY, value: sharded_cluster } @@ -5128,6 +5950,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: replica_set } @@ -5148,6 +5971,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: server } @@ -5168,6 +5992,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "5.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -5188,6 +6013,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: replica_set } @@ -5208,6 +6034,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: server } @@ -5228,6 +6055,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "6.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -5248,6 +6076,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: replica_set } @@ -5268,6 +6097,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: server } @@ -5288,6 +6118,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "7.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -5308,6 +6139,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: replica_set } @@ -5328,6 +6160,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: server } @@ -5348,6 +6181,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: "8.0" } - { key: TOPOLOGY, value: sharded_cluster } @@ -5368,6 +6202,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: replica_set } @@ -5388,6 +6223,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: server } @@ -5408,6 +6244,7 @@ tasks: params: updates: - { key: CC, value: clang } + - { key: CXX, value: clang++ } - { key: AUTH, value: auth } - { key: MONGODB_VERSION, value: latest } - { key: TOPOLOGY, value: sharded_cluster } diff -pruN 1.30.4-1/.evergreen/generated_configs/variants.yml 2.0.2-1/.evergreen/generated_configs/variants.yml --- 1.30.4-1/.evergreen/generated_configs/variants.yml 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/generated_configs/variants.yml 2025-06-19 15:42:22.000000000 +0000 @@ -180,7 +180,6 @@ buildvariants: ASAN: "on" CC: gcc CFLAGS: -fno-omit-frame-pointer - EXTRA_CONFIGURE_FLAGS: -DENABLE_EXTRA_ALIGNMENT=OFF SANITIZE: address,undefined tasks: - name: mock-server-test @@ -194,7 +193,6 @@ buildvariants: ASAN: "on" CFLAGS: -fno-omit-frame-pointer CHECK_LOG: "ON" - EXTRA_CONFIGURE_FLAGS: -DENABLE_EXTRA_ALIGNMENT=OFF SANITIZE: address,undefined tasks: - name: .sanitizers-matrix-asan @@ -203,7 +201,7 @@ buildvariants: expansions: CFLAGS: -fno-omit-frame-pointer CHECK_LOG: "ON" - EXTRA_CONFIGURE_FLAGS: -DENABLE_EXTRA_ALIGNMENT=OFF -DENABLE_SHM_COUNTERS=OFF + EXTRA_CONFIGURE_FLAGS: -DENABLE_SHM_COUNTERS=OFF SANITIZE: thread tasks: - name: .sanitizers-matrix-tsan @@ -234,6 +232,7 @@ buildvariants: - name: sasl-cyrus-openssl-ubuntu2004-arm64-gcc-compile - name: sasl-cyrus-openssl-ubuntu2004-gcc-compile - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-compile + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-compile - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.2-server-auth batchtime: 1440 - name: sasl-cyrus-openssl-rhel8-power-gcc-test-4.4-server-auth @@ -273,6 +272,9 @@ buildvariants: - name: sasl-cyrus-openssl-windows-2019-vs2017-x64-test-latest-server-auth - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-server-auth - name: sasl-cyrus-openssl-debian10-gcc-test-4.2-replica-auth + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-server-auth + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-replica-auth + - name: sasl-cyrus-openssl-amazon2023-arm64-latest-large-m8g-gcc-test-latest-sharded-auth - name: sasl-matrix-winssl display_name: sasl-matrix-winssl expansions: {} diff -pruN 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_generator/functions.py 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_generator/functions.py --- 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_generator/functions.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_generator/functions.py 2025-06-19 15:42:22.000000000 +0000 @@ -31,7 +31,7 @@ def func(func_name: str, **kwargs: Value def s3_put(remote_file: str, project_path: bool = True, **kwargs: Value) -> ValueMapping: if project_path: - remote_file = "mongo-c-driver/" + remote_file + remote_file = "${project}/" + remote_file return ValueOrderedDict( [ diff -pruN 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py --- 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/functions.py 2025-06-19 15:42:22.000000000 +0000 @@ -30,7 +30,7 @@ all_functions = OD([ shell_mongoc(r''' export AWS_ACCESS_KEY_ID=${aws_key} export AWS_SECRET_ACCESS_KEY=${aws_secret} - aws s3 cp coverage s3://mciuploads/mongo-c-driver/%s/coverage/ --recursive --acl public-read --region us-east-1 + aws s3 cp coverage s3://mciuploads/${project}/%s/coverage/ --recursive --acl public-read --region us-east-1 ''' % (build_path,), test=False, silent=True), s3_put(build_path + '/coverage/index.html', aws_key='${aws_key}', aws_secret='${aws_secret}', @@ -49,7 +49,7 @@ all_functions = OD([ shell_mongoc(r''' export AWS_ACCESS_KEY_ID=${aws_key} export AWS_SECRET_ACCESS_KEY=${aws_secret} - aws s3 cp scan s3://mciuploads/mongo-c-driver/%s/scan/ --recursive --acl public-read --region us-east-1 + aws s3 cp scan s3://mciuploads/${project}/%s/scan/ --recursive --acl public-read --region us-east-1 ''' % (build_path,), test=False, silent=True), s3_put(build_path + '/scan/index.html', aws_key='${aws_key}', aws_secret='${aws_secret}', local_file='mongoc/scan.html', @@ -67,7 +67,6 @@ all_functions = OD([ # Compile a program that links dynamically or statically to libmongoc, # using variables from pkg-config or CMake's find_package command. export BUILD_SAMPLE_WITH_CMAKE=${BUILD_SAMPLE_WITH_CMAKE} - export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED} export ENABLE_SSL=${ENABLE_SSL} export ENABLE_SNAPPY=${ENABLE_SNAPPY} LINK_STATIC= .evergreen/scripts/link-sample-program.sh @@ -79,12 +78,10 @@ all_functions = OD([ shell_mongoc(r''' # Compile a program that links dynamically or statically to libbson, # using variables from pkg-config or from CMake's find_package command. - BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh - BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE= LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC= .evergreen/scripts/link-sample-program-bson.sh + BUILD_SAMPLE_WITH_CMAKE=1 LINK_STATIC=1 .evergreen/scripts/link-sample-program-bson.sh ''', include_expansions_in_env=['distro_id']), )), diff -pruN 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py --- 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py 2025-06-19 15:42:22.000000000 +0000 @@ -55,7 +55,7 @@ class CompileTask(NamedTask): CFLAGS: str | None = None, LDFLAGS: str | None = None, EXTRA_CONFIGURE_FLAGS: str | None = None, - SSL: Literal["WINDOWS", "DARWIN", "OPENSSL", "OPENSSL_STATIC", "LIBRESSL", "OFF", None] = None, + SSL: Literal["WINDOWS", "DARWIN", "OPENSSL", "OPENSSL_STATIC", "OFF", None] = None, ENABLE_SHM_COUNTERS: OptToggleStr = None, CHECK_LOG: OptToggleStr = None, TRACING: OptToggleStr = None, @@ -151,7 +151,6 @@ class CompileWithClientSideEncryptionAsa CFLAGS="-fno-omit-frame-pointer", COMPILE_LIBMONGOCRYPT="ON", CHECK_LOG="ON", - EXTRA_CONFIGURE_FLAGS="-DENABLE_EXTRA_ALIGNMENT=OFF", PATH="/usr/lib/llvm-3.8/bin:$PATH", ) cls_tags: ClassVar[Sequence[str]] = ["client-side-encryption"] @@ -187,12 +186,6 @@ all_tasks = [ CompileTask("debug-compile-compression-zlib", tags=["zlib", "compression"], compression="zlib"), CompileTask("debug-compile-compression-snappy", tags=["snappy", "compression"], compression="snappy"), CompileTask("debug-compile-compression-zstd", tags=["zstd", "compression"], compression="zstd"), - CompileTask( - "debug-compile-no-align", - tags=["debug-compile"], - compression="zlib", - EXTRA_CONFIGURE_FLAGS="-DENABLE_EXTRA_ALIGNMENT=OFF", - ), CompileTask("debug-compile-nosasl-nossl", tags=["debug-compile", "nosasl", "nossl"], SSL="OFF"), CompileTask("debug-compile-lto", CFLAGS="-flto"), CompileTask("debug-compile-lto-thin", CFLAGS="-flto=thin"), @@ -226,36 +219,6 @@ all_tasks = [ suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1, ENABLE_SNAPPY="ON")], ), LinkTask("link-with-cmake-mac", suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1)]), - LinkTask( - "link-with-cmake-deprecated", - suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1, BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1)], - ), - LinkTask( - "link-with-cmake-ssl-deprecated", - suffix_commands=[ - func( - "link sample program", - BUILD_SAMPLE_WITH_CMAKE=1, - BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1, - ENABLE_SSL=1, - ) - ], - ), - LinkTask( - "link-with-cmake-snappy-deprecated", - suffix_commands=[ - func( - "link sample program", - BUILD_SAMPLE_WITH_CMAKE=1, - BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1, - ENABLE_SNAPPY="ON", - ) - ], - ), - LinkTask( - "link-with-cmake-mac-deprecated", - suffix_commands=[func("link sample program", BUILD_SAMPLE_WITH_CMAKE=1, BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1)], - ), LinkTask("link-with-cmake-windows", suffix_commands=[func("link sample program MSVC")]), LinkTask( "link-with-cmake-windows-ssl", @@ -696,7 +659,7 @@ all_tasks = chain( func("find-cmake-latest"), shell_mongoc( """ - env SANITIZE=address SASL=AUTO SSL=OPENSSL EXTRA_CONFIGURE_FLAGS='-DENABLE_EXTRA_ALIGNMENT=OFF' .evergreen/scripts/compile.sh + env SANITIZE=address SASL=AUTO SSL=OPENSSL .evergreen/scripts/compile.sh """, add_expansions_to_env=True, ), @@ -771,8 +734,6 @@ class SSLTask(Task): if enable_ssl is not False: script += " SSL=" + enable_ssl - elif "libressl" in version: - script += " SSL=LIBRESSL" else: script += " SSL=OPENSSL" @@ -816,10 +777,7 @@ all_tasks = chain( "l", cflags="-Wno-redundant-decls", ), - SSLTask("openssl-1.1.0", "l"), - SSLTask("libressl-2.5", ".2", test_params=dict(require_tls12=True)), - SSLTask("libressl-3.0", ".2", enable_ssl="AUTO", test_params=dict(require_tls12=True)), - SSLTask("libressl-3.0", ".2", test_params=dict(require_tls12=True)), + SSLTask("openssl-1.1.0", "l") ], ) diff -pruN 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py --- 1.30.4-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/legacy_config_generator/evergreen_config_lib/variants.py 2025-06-19 15:42:22.000000000 +0000 @@ -48,11 +48,8 @@ all_variants = [ "debug-compile-no-counters", "compile-tracing", "link-with-cmake", - "link-with-cmake-deprecated", "link-with-cmake-ssl", - "link-with-cmake-ssl-deprecated", "link-with-cmake-snappy", - "link-with-cmake-snappy-deprecated", OD([("name", "link-with-cmake-mac"), ("distros", ["macos-14-arm64"])]), OD([("name", "link-with-cmake-mac-deprecated"), ("distros", ["macos-14-arm64"])]), OD([("name", "link-with-cmake-windows"), ("distros", ["windows-vsCurrent-large"])]), @@ -82,16 +79,13 @@ all_variants = [ ), Variant( "openssl", - "OpenSSL / LibreSSL", + "OpenSSL", "archlinux-build", [ "build-and-run-authentication-tests-openssl-1.0.1", "build-and-run-authentication-tests-openssl-1.0.2", "build-and-run-authentication-tests-openssl-1.1.0", - "build-and-run-authentication-tests-openssl-1.0.1-fips", - "build-and-run-authentication-tests-libressl-2.5", - "build-and-run-authentication-tests-libressl-3.0-auto", - "build-and-run-authentication-tests-libressl-3.0", + "build-and-run-authentication-tests-openssl-1.0.1-fips" ], {}, ), @@ -114,7 +108,6 @@ all_variants = [ [ "release-compile", "debug-compile-nosasl-nossl", - "debug-compile-no-align", ".debug-compile !.sspi .nossl .nosasl", ".latest .nossl .nosasl", ], @@ -154,7 +147,7 @@ all_variants = [ "gcc94-i686", "GCC 9.4 (i686) (Ubuntu 20.04)", "ubuntu2004-test", - ["release-compile", "debug-compile-nosasl-nossl", "debug-compile-no-align", ".latest .nossl .nosasl"], + ["release-compile", "debug-compile-nosasl-nossl", ".latest .nossl .nosasl"], {"CC": "gcc", "MARCH": "i686"}, ), Variant( @@ -166,7 +159,6 @@ all_variants = [ "debug-compile-nosrv", "release-compile", "debug-compile-nosasl-nossl", - "debug-compile-no-align", "debug-compile-sasl-openssl", "debug-compile-nosasl-openssl", ".authentication-tests .openssl", @@ -188,7 +180,6 @@ all_variants = [ ".compression !.snappy", "release-compile", "debug-compile-nosasl-nossl", - "debug-compile-no-align", "debug-compile-nosrv", "debug-compile-sasl-darwinssl", "debug-compile-nosasl-nossl", @@ -226,11 +217,14 @@ all_variants = [ "Windows (VS 2017)", "windows-vsCurrent-large", [ + "release-compile", "debug-compile-nosasl-nossl", "debug-compile-nosasl-openssl", "debug-compile-sspi-winssl", + "debug-compile-nosrv", ".latest .nossl", ".nosasl .latest .nossl", + ".compression !.snappy !.zstd !.latest", "test-dns-winssl", "test-dns-auth-winssl", "debug-compile-aws", @@ -250,7 +244,6 @@ all_variants = [ ["debug-compile-nosasl-nossl", ".latest .nossl .nosasl .server"], {"CC": "mingw"}, ), - Variant("mingw", "MinGW-W64", "windows-vsCurrent-large", ["debug-compile-no-align"], {"CC": "mingw"}), Variant( "rhel8-power", "Power (ppc64le) (RHEL 8)", @@ -272,7 +265,6 @@ all_variants = [ "ubuntu2004-arm64-large", [ ".compression !.snappy !.zstd", - "debug-compile-no-align", "release-compile", "debug-compile-nosasl-nossl", "debug-compile-nosasl-openssl", @@ -291,7 +283,6 @@ all_variants = [ [ "release-compile", # '.compression', --> TODO: waiting on ticket CDRIVER-3258 - "debug-compile-no-align", "debug-compile-nosasl-nossl", "debug-compile-nosasl-openssl", "debug-compile-sasl-openssl", diff -pruN 1.30.4-1/.evergreen/scripts/abi-compliance-check.sh 2.0.2-1/.evergreen/scripts/abi-compliance-check.sh --- 1.30.4-1/.evergreen/scripts/abi-compliance-check.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/abi-compliance-check.sh 2025-06-19 15:42:22.000000000 +0000 @@ -19,8 +19,11 @@ declare current base current="$(cat VERSION_CURRENT)-${today:?}+git${head_commit:?}" # e.g. 2.3.4-dev base=$(cat etc/prior_version.txt) # e.g. 1.2.3 +current_verdir="$(echo "${current:?}" | perl -lne 'm|^(\d+\.\d+\.\d+).*$|; print $1')" # Strip any suffixes. +base_verdir="${base:?}" + # Double-check we are testing against the same API major version. -if [[ "${base:?}" != 1.* ]]; then +if [[ "${base_verdir:?}" != 2.* ]]; then echo "API major version mismatch: base version is ${base:?} but current version is ${current:?}" >&2 exit 1 fi @@ -68,13 +71,13 @@ cat >|old.xml < - $(pwd)/base-install/include/libbson-1.0/ - $(pwd)/base-install/include/libmongoc-1.0/ + $(pwd)/base-install/include/bson-${base_verdir:?}/ + $(pwd)/base-install/include/mongoc-${base_verdir:?}/ - $(pwd)/base-install/include/libbson-1.0/bson/bson.h - $(pwd)/base-install/include/libmongoc-1.0/mongoc/mongoc.h + $(pwd)/base-install/include/bson-${base_verdir:?}/bson/bson.h + $(pwd)/base-install/include/mongoc-${base_verdir:?}/mongoc/mongoc.h DOC @@ -88,16 +91,17 @@ cat >|new.xml < - $(pwd)/current-install/include/libbson-1.0/ - $(pwd)/current-install/include/libmongoc-1.0/ + $(pwd)/current-install/include/bson-${current_verdir:?}/ + $(pwd)/current-install/include/mongoc-${current_verdir:?}/ - $(pwd)/current-install/include/libbson-1.0/bson/bson.h - $(pwd)/current-install/include/libmongoc-1.0/mongoc/mongoc.h + $(pwd)/current-install/include/bson-${current_verdir:?}/bson/bson.h + $(pwd)/current-install/include/mongoc-${current_verdir:?}/mongoc/mongoc.h DOC +# Allow task to upload the HTML report despite failed status. if ! abi-compliance-checker -lib mongo-c-driver -old old.xml -new new.xml; then find . -name log.txt -exec cat {} + >&2 || true declare status diff -pruN 1.30.4-1/.evergreen/scripts/build-and-test-with-toolchain.sh 2.0.2-1/.evergreen/scripts/build-and-test-with-toolchain.sh --- 1.30.4-1/.evergreen/scripts/build-and-test-with-toolchain.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/build-and-test-with-toolchain.sh 2025-06-19 15:42:22.000000000 +0000 @@ -35,8 +35,6 @@ toolchain_base_dir="$(readlink -f /opt/m declare toolchain_lib_dir="${toolchain_base_dir}/lib" declare -a ssl_vers=( - "libressl-2.5" - "libressl-3.0" "openssl-1.0.1" "openssl-1.0.1-fips" "openssl-1.0.2" @@ -60,11 +58,7 @@ for ssl_ver in "${ssl_vers[@]}"; do "${cmake_binary}" --version declare ssl - if [[ "${ssl_ver#*libressl}" != "${ssl_ver}" ]]; then - ssl="LIBRESSL" - else - ssl="OPENSSL" - fi + ssl="OPENSSL" declare output_file output_file="$(mktemp)" diff -pruN 1.30.4-1/.evergreen/scripts/check-installed-files-bson.bat 2.0.2-1/.evergreen/scripts/check-installed-files-bson.bat --- 1.30.4-1/.evergreen/scripts/check-installed-files-bson.bat 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/check-installed-files-bson.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -rem Validations shared by link-sample-program-msvc-bson.bat and -rem link-sample-program-mingw-bson.bat - -echo off - -rem Notice that the dll goes in "bin". -set DLL=%INSTALL_DIR%\bin\bson-1.0.dll -set LIB_DLL=%INSTALL_DIR%\bin\libbson-1.0.dll -set LIB_LIB=%INSTALL_DIR%\lib\libbson-1.0.lib -if "%MINGW%"=="1" ( - if not exist %LIB_DLL% ( - echo %LIB_DLL% is missing! - exit /B 1 - ) else ( - echo libbson-1.0.dll check ok - ) - if exist %DLL% ( - echo %DLL% is present and should not be! - exit /B 1 - ) -) else ( - if not exist %DLL% ( - echo %DLL% is missing! - exit /B 1 - ) else ( - echo bson-1.0.dll check ok - ) - if exist %LIB_LIB% ( - echo %LIB_LIB% is present and should not be! - exit /B 1 - ) else ( - echo libbson-1.0.lib check ok - ) -) -if not exist %INSTALL_DIR%\lib\pkgconfig\libbson-1.0.pc ( - echo libbson-1.0.pc missing! - exit /B 1 -) else ( - echo libbson-1.0.pc check ok -) -if not exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-1.0-config.cmake ( - echo bson-1.0-config.cmake missing! - exit /B 1 -) else ( - echo bson-1.0-config.cmake check ok -) -if not exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-1.0-config-version.cmake ( - echo bson-1.0-config-version.cmake missing! - exit /B 1 -) else ( - echo bson-1.0-config-version.cmake check ok -) -if not exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-targets.cmake ( - echo bson-targets.cmake missing! - exit /B 1 -) else ( - echo bson-targets.cmake check ok -) - -if "%LINK_STATIC%"=="1" ( - if not exist %INSTALL_DIR%\lib\pkgconfig\libbson-static-1.0.pc ( - echo libbson-static-1.0.pc missing! - exit /B 1 - ) else ( - echo libbson-static-1.0.pc check ok - ) -) else ( - if exist %INSTALL_DIR%\lib\pkgconfig\libbson-static-1.0.pc ( - echo libbson-static-1.0.pc should not have been installed! - exit /B 1 - ) else ( - echo libbson-static-1.0.pc missing, as expected - ) -) - -echo on diff -pruN 1.30.4-1/.evergreen/scripts/check-installed-files.bat 2.0.2-1/.evergreen/scripts/check-installed-files.bat --- 1.30.4-1/.evergreen/scripts/check-installed-files.bat 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/check-installed-files.bat 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -rem Validations shared by link-sample-program-msvc.bat and -rem link-sample-program-mingw.bat - -echo off - -rem Notice that the dll goes in "bin". -set DLL=%INSTALL_DIR%\bin\mongoc-1.0.dll -set LIB_DLL=%INSTALL_DIR%\bin\libmongoc-1.0.dll -set LIB_LIB=%INSTALL_DIR%\lib\libmongoc-1.0.lib -if "%MINGW%"=="1" ( - if not exist %LIB_DLL% ( - echo %LIB_DLL% is missing! - exit /B 1 - ) else ( - echo libmongoc-1.0.dll check ok - ) - if exist %DLL% ( - echo %DLL% is present and should not be! - exit /B 1 - ) -) else ( - if not exist %DLL% ( - echo %DLL% is missing! - exit /B 1 - ) else ( - echo mongoc-1.0.dll check ok - ) - if exist %LIB_LIB% ( - echo %LIB_LIB% is present and should not be! - exit /B 1 - ) else ( - echo libmongoc-1.0.lib check ok - ) -) -if not exist %INSTALL_DIR%\lib\pkgconfig\libmongoc-1.0.pc ( - echo libmongoc-1.0.pc missing! - exit /B 1 -) else ( - echo libmongoc-1.0.pc check ok -) -if not exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-1.0-config.cmake ( - echo mongoc-1.0-config.cmake missing! - exit /B 1 -) else ( - echo mongoc-1.0-config.cmake check ok -) -if not exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-1.0-config-version.cmake ( - echo mongoc-1.0-config-version.cmake missing! - exit /B 1 -) else ( - echo mongoc-1.0-config-version.cmake check ok -) -if not exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-targets.cmake ( - echo mongoc-targets.cmake missing! - exit /B 1 -) else ( - echo mongoc-targets.cmake check ok -) -if not exist %INSTALL_DIR%\lib\pkgconfig\libmongoc-static-1.0.pc ( - echo libmongoc-static-1.0.pc missing! - exit /B 1 -) else ( - echo libmongoc-static-1.0.pc check ok -) - -echo on diff -pruN 1.30.4-1/.evergreen/scripts/check-preludes.py 2.0.2-1/.evergreen/scripts/check-preludes.py --- 1.30.4-1/.evergreen/scripts/check-preludes.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/check-preludes.py 2025-06-19 15:42:22.000000000 +0000 @@ -35,7 +35,7 @@ checks = [ MONGOC_PREFIX / "mongoc-prelude.h", MONGOC_PREFIX / "mongoc.h", ], - "include": '#include ', + "include": "#include ", }, { "name": "libbson", @@ -50,7 +50,7 @@ checks = [ "name": "common", "headers": list(COMMON_PREFIX.glob("*.h")), "exclusions": [COMMON_PREFIX / "common-prelude.h"], - "include": '#include ', + "include": "#include ", }, ] @@ -59,7 +59,7 @@ for check in checks: print(f"Checking headers for {NAME}") assert len(check["headers"]) > 0 for header in check["headers"]: - if header in check["exclusions"]: + if header in check["exclusions"] or header.name.endswith("-private.h"): continue lines = Path(header).read_text(encoding="utf-8").splitlines() if check["include"] not in lines: diff -pruN 1.30.4-1/.evergreen/scripts/compile-libmongocrypt.sh 2.0.2-1/.evergreen/scripts/compile-libmongocrypt.sh --- 1.30.4-1/.evergreen/scripts/compile-libmongocrypt.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/compile-libmongocrypt.sh 2025-06-19 15:42:22.000000000 +0000 @@ -10,16 +10,26 @@ compile_libmongocrypt() { # `.evergreen/scripts/kms-divergence-check.sh` to ensure that there is no # divergence in the copied files. - git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.12.0 || return + # Clone libmongocrypt and check-out 1.13.0. + git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.13.0 || return declare -a crypt_cmake_flags=( "-DMONGOCRYPT_MONGOC_DIR=${mongoc_dir}" "-DBUILD_TESTING=OFF" "-DENABLE_ONLINE_TESTS=OFF" "-DENABLE_MONGOC=OFF" - "-DBUILD_VERSION=1.12.0" + "-DBUILD_VERSION=1.13.0" ) + . "$(dirname "${BASH_SOURCE[0]}")/find-ccache.sh" + find_ccache_and_export_vars "$(pwd)/libmongocrypt" || true + if command -v "${CMAKE_C_COMPILER_LAUNCHER:-}" && [[ "${OSTYPE:?}" == cygwin ]]; then + crypt_cmake_flags+=( + "-DCMAKE_POLICY_DEFAULT_CMP0141=NEW" + "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=Embedded" + ) + fi + env \ DEBUG="0" \ CMAKE_EXE="${cmake_binary}" \ diff -pruN 1.30.4-1/.evergreen/scripts/compile-openssl-static.sh 2.0.2-1/.evergreen/scripts/compile-openssl-static.sh --- 1.30.4-1/.evergreen/scripts/compile-openssl-static.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/compile-openssl-static.sh 2025-06-19 15:42:22.000000000 +0000 @@ -8,6 +8,8 @@ set -o pipefail . "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" paths check_var_opt CC +check_var_opt CMAKE_GENERATOR +check_var_opt CMAKE_GENERATOR_PLATFORM check_var_opt MARCH declare script_dir @@ -39,7 +41,6 @@ configure_flags_append_if_not_null() { } configure_flags_append "-DCMAKE_SKIP_RPATH=TRUE" # Avoid hardcoding absolute paths to dependency libraries. -configure_flags_append "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" configure_flags_append "-DENABLE_MAINTAINER_FLAGS=ON" configure_flags_append "-DENABLE_SSL=OPENSSL" configure_flags_append "-DOPENSSL_USE_STATIC_LIBS=ON" @@ -77,15 +78,6 @@ if [[ "${OSTYPE}" == darwin* ]]; then CFLAGS+=" -Wno-unknown-pragmas" fi -case "${CC}" in -clang) - CXX=clang++ - ;; -gcc) - CXX=g++ - ;; -esac - if [[ "${OSTYPE}" == darwin* && "${HOSTTYPE}" == "arm64" ]]; then configure_flags_append "-DCMAKE_OSX_ARCHITECTURES=arm64" fi diff -pruN 1.30.4-1/.evergreen/scripts/compile-scan-build.sh 2.0.2-1/.evergreen/scripts/compile-scan-build.sh --- 1.30.4-1/.evergreen/scripts/compile-scan-build.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/compile-scan-build.sh 2025-06-19 15:42:22.000000000 +0000 @@ -32,7 +32,6 @@ configure_flags_append_if_not_null() { configure_flags_append "-DCMAKE_PREFIX_PATH=${cmake_prefix_path}" configure_flags_append "-DCMAKE_SKIP_RPATH=TRUE" # Avoid hardcoding absolute paths to dependency libraries. -configure_flags_append "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" configure_flags_append "-DENABLE_CLIENT_SIDE_ENCRYPTION=ON" configure_flags_append "-DENABLE_DEBUG_ASSERTIONS=ON" configure_flags_append "-DENABLE_MAINTAINER_FLAGS=ON" diff -pruN 1.30.4-1/.evergreen/scripts/compile-std.sh 2.0.2-1/.evergreen/scripts/compile-std.sh --- 1.30.4-1/.evergreen/scripts/compile-std.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/compile-std.sh 2025-06-19 15:42:22.000000000 +0000 @@ -7,10 +7,13 @@ set -o pipefail . "$(dirname "${BASH_SOURCE[0]}")/env-var-utils.sh" . "$(dirname "${BASH_SOURCE[0]}")/use-tools.sh" paths -check_var_req CC +check_var_opt CC +check_var_opt CMAKE_GENERATOR +check_var_opt CMAKE_GENERATOR_PLATFORM -check_var_opt C_STD_VERSION +check_var_req C_STD_VERSION check_var_opt CFLAGS +check_var_opt CXXFLAGS check_var_opt MARCH declare script_dir @@ -37,18 +40,26 @@ configure_flags_append_if_not_null() { configure_flags_append "-DCMAKE_PREFIX_PATH=${install_dir}" configure_flags_append "-DCMAKE_SKIP_RPATH=TRUE" # Avoid hardcoding absolute paths to dependency libraries. -configure_flags_append "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" configure_flags_append "-DENABLE_CLIENT_SIDE_ENCRYPTION=ON" configure_flags_append "-DENABLE_DEBUG_ASSERTIONS=ON" configure_flags_append "-DENABLE_MAINTAINER_FLAGS=ON" -configure_flags_append_if_not_null C_STD_VERSION "-DCMAKE_C_STANDARD=${C_STD_VERSION}" +if [[ "${C_STD_VERSION}" == "latest" ]]; then + [[ "${CMAKE_GENERATOR:-}" =~ "Visual Studio" ]] || { + echo "C_STD_VERSION=latest to enable /std:clatest is only supported with Visual Studio generators" 1>&2 + exit 1 + } + + configure_flags_append "-DCMAKE_C_FLAGS=/std:clatest" +else + configure_flags_append_if_not_null C_STD_VERSION "-DCMAKE_C_STANDARD=${C_STD_VERSION}" +fi if [[ "${OSTYPE}" == darwin* && "${HOSTTYPE}" == "arm64" ]]; then configure_flags_append "-DCMAKE_OSX_ARCHITECTURES=arm64" fi -if [[ "${CC}" =~ ^"Visual Studio " ]]; then +if [[ "${CMAKE_GENERATOR:-}" =~ "Visual Studio" ]]; then # Avoid C standard conformance issues with Windows 10 SDK headers. # See: https://developercommunity.visualstudio.com/t/stdc17-generates-warning-compiling-windowsh/1249671#T-N1257345 configure_flags_append "-DCMAKE_SYSTEM_VERSION=10.0.20348.0" @@ -56,53 +67,22 @@ fi declare -a flags -if [[ ! "${CC}" =~ ^"Visual Studio " ]]; then - case "${MARCH}" in - i686) - flags+=("-m32" "-march=i386") - ;; - esac - - case "${HOSTTYPE}" in - s390x) - flags+=("-march=z196" "-mtune=zEC12") - ;; - x86_64) - flags+=("-m64" "-march=x86-64") - ;; - powerpc64le) - flags+=("-mcpu=power8" "-mtune=power8" "-mcmodel=medium") - ;; - esac -fi - -if [[ "${CC}" =~ ^"Visual Studio " ]]; then +if [[ "${CMAKE_GENERATOR:-}" =~ "Visual Studio" ]]; then # Even with -DCMAKE_SYSTEM_VERSION=10.0.20348.0, winbase.h emits conformance warnings. flags+=('/wd5105') fi +if [[ "${OSTYPE}" == darwin* ]]; then + flags+=('-Wno-unknown-pragmas') +fi + # CMake and compiler environment variables. -export CC -export CXX export CFLAGS export CXXFLAGS CFLAGS+=" ${flags+${flags[*]}}" CXXFLAGS+=" ${flags+${flags[*]}}" -if [[ "${OSTYPE}" == darwin* ]]; then - CFLAGS+=" -Wno-unknown-pragmas" -fi - -case "${CC}" in -clang) - CXX=clang++ - ;; -gcc) - CXX=g++ - ;; -esac - # Ensure find-cmake-latest.sh is sourced *before* add-build-dirs-to-paths.sh # to avoid interfering with potential CMake build configuration. # shellcheck source=.evergreen/scripts/find-cmake-latest.sh @@ -110,6 +90,9 @@ esac declare cmake_binary cmake_binary="$(find_cmake_latest)" +declare build_dir +build_dir="cmake-build" + # shellcheck source=.evergreen/scripts/add-build-dirs-to-paths.sh . "${script_dir}/add-build-dirs-to-paths.sh" @@ -123,6 +106,16 @@ if [[ "${OSTYPE}" == darwin* ]]; then } fi +export CMAKE_BUILD_PARALLEL_LEVEL +CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" + +if [[ "${CMAKE_GENERATOR:-}" =~ "Visual Studio" ]]; then + # MSBuild needs additional assistance. + # https://devblogs.microsoft.com/cppblog/improved-parallelism-in-msbuild/ + export UseMultiToolTask=1 + export EnforceProcessCountAcrossBuilds=1 +fi + echo "Installing libmongocrypt..." # shellcheck source=.evergreen/scripts/compile-libmongocrypt.sh "${script_dir}/compile-libmongocrypt.sh" "${cmake_binary}" "${mongoc_dir}" "${install_dir}" &>output.txt || { @@ -131,12 +124,26 @@ echo "Installing libmongocrypt..." } echo "Installing libmongocrypt... done." -echo "CFLAGS: ${CFLAGS}" -echo "configure_flags: ${configure_flags[*]}" - # Use ccache if able. . "${script_dir:?}/find-ccache.sh" find_ccache_and_export_vars "$(pwd)" || true +if command -v "${CMAKE_C_COMPILER_LAUNCHER:-}" && [[ "${OSTYPE:?}" == cygwin ]]; then + configure_flags_append "-DCMAKE_POLICY_DEFAULT_CMP0141=NEW" + configure_flags_append "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=$<$:Embedded>" +fi + +echo "CFLAGS: ${CFLAGS}" +echo "configure_flags: ${configure_flags[*]}" + +if [[ "${CMAKE_GENERATOR:-}" =~ "Visual Studio" ]]; then + all_target="ALL_BUILD" +else + all_target="all" +fi -"${cmake_binary}" "${configure_flags[@]}" . -"${cmake_binary}" --build . +"${cmake_binary}" -S . -B "${build_dir:?}" "${configure_flags[@]}" +"${cmake_binary}" --build "${build_dir:?}" --config Debug \ + --target mongo_c_driver_tests \ + --target mongo_c_driver_examples \ + --target public-header-warnings \ + --target "${all_target:?}" diff -pruN 1.30.4-1/.evergreen/scripts/compile-unix.sh 2.0.2-1/.evergreen/scripts/compile-unix.sh --- 1.30.4-1/.evergreen/scripts/compile-unix.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/compile-unix.sh 2025-06-19 15:42:22.000000000 +0000 @@ -10,6 +10,8 @@ set -o pipefail check_var_opt BYPASS_FIND_CMAKE "OFF" check_var_opt C_STD_VERSION # CMake default: 99. check_var_opt CC +check_var_opt CMAKE_GENERATOR +check_var_opt CMAKE_GENERATOR_PLATFORM check_var_opt CFLAGS check_var_opt CHECK_LOG "OFF" check_var_opt COMPILE_LIBMONGOCRYPT "OFF" @@ -66,7 +68,6 @@ configure_flags_append_if_not_null() { configure_flags_append "-DCMAKE_INSTALL_PREFIX=${install_dir}" configure_flags_append "-DCMAKE_PREFIX_PATH=${cmake_prefix_path}" configure_flags_append "-DCMAKE_SKIP_RPATH=TRUE" # Avoid hardcoding absolute paths to dependency libraries. -configure_flags_append "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" configure_flags_append "-DENABLE_HTML_DOCS=OFF" configure_flags_append "-DENABLE_MAINTAINER_FLAGS=ON" configure_flags_append "-DENABLE_MAN_PAGES=OFF" @@ -119,8 +120,6 @@ powerpc64le) esac # CMake and compiler environment variables. -export CC -export CXX export CFLAGS export CXXFLAGS @@ -135,15 +134,6 @@ if [[ "${OSTYPE}" == darwin* && "${HOSTT configure_flags_append "-DCMAKE_OSX_ARCHITECTURES=arm64" fi -case "${CC}" in -clang) - CXX=clang++ - ;; -gcc) - CXX=g++ - ;; -esac - declare cmake_binary if [[ "${BYPASS_FIND_CMAKE}" == "OFF" ]]; then # Ensure find-cmake-latest.sh is sourced *before* add-build-dirs-to-paths.sh @@ -220,4 +210,4 @@ build_dir="cmake-build" if [[ "$EXTRA_CONFIGURE_FLAGS" != *"ENABLE_MONGOC=OFF"* ]]; then # Check public headers for extra warnings. "${cmake_binary}" --build "${build_dir:?}" --target public-header-warnings -fi \ No newline at end of file +fi diff -pruN 1.30.4-1/.evergreen/scripts/compile-windows.sh 2.0.2-1/.evergreen/scripts/compile-windows.sh --- 1.30.4-1/.evergreen/scripts/compile-windows.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/compile-windows.sh 2025-06-19 15:42:22.000000000 +0000 @@ -11,7 +11,9 @@ set -o igncr # Ignore CR in this script check_var_opt BYPASS_FIND_CMAKE "OFF" check_var_opt C_STD_VERSION # CMake default: 99. -check_var_opt CC "Visual Studio 15 2017 Win64" +check_var_opt CC +check_var_opt CMAKE_GENERATOR +check_var_opt CMAKE_GENERATOR_PLATFORM check_var_opt COMPILE_LIBMONGOCRYPT "OFF" check_var_opt EXTRA_CONFIGURE_FLAGS check_var_opt RELEASE "OFF" @@ -134,7 +136,15 @@ if [ "${COMPILE_LIBMONGOCRYPT}" = "ON" ] configure_flags_append "-DENABLE_CLIENT_SIDE_ENCRYPTION=ON" fi -"${cmake_binary:?}" -S . -B "${build_dir:?}" -G "$CC" "${configure_flags[@]}" "${extra_configure_flags[@]}" +# Use ccache if able. +. "${script_dir:?}/find-ccache.sh" +find_ccache_and_export_vars "$(pwd)" || true +if command -v "${CMAKE_C_COMPILER_LAUNCHER:-}" && [[ "${OSTYPE:?}" == cygwin ]]; then + configure_flags_append "-DCMAKE_POLICY_DEFAULT_CMP0141=NEW" + configure_flags_append "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=$<$:Embedded>" +fi + +"${cmake_binary:?}" -S . -B "${build_dir:?}" "${configure_flags[@]}" "${extra_configure_flags[@]}" "${cmake_binary:?}" --build "${build_dir:?}" --config "${build_config:?}" "${cmake_binary:?}" --install "${build_dir:?}" --config "${build_config:?}" @@ -147,4 +157,4 @@ fi if [[ "$EXTRA_CONFIGURE_FLAGS" != *"ENABLE_MONGOC=OFF"* ]]; then # Check public headers for extra warnings. "${cmake_binary:?}" --build "${build_dir:?}" --config "${build_config:?}" --target public-header-warnings -fi \ No newline at end of file +fi diff -pruN 1.30.4-1/.evergreen/scripts/install-ssl.sh 2.0.2-1/.evergreen/scripts/install-ssl.sh --- 1.30.4-1/.evergreen/scripts/install-ssl.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/install-ssl.sh 2025-06-19 15:42:22.000000000 +0000 @@ -81,18 +81,6 @@ install_openssl_fips() { install_openssl } -install_libressl() { - curl --retry 5 -o ssl.tar.gz "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${SSL}.tar.gz" - tar zxf ssl.tar.gz - pushd "${SSL}" - ( - set -o xtrace - ./configure --prefix="${install_dir}" - make -s -j "${njobs}" install - ) >/dev/null - popd # "${SSL}" -} - case "${SSL}" in openssl-*-fips) export LC_ALL @@ -106,7 +94,4 @@ openssl-*) install_openssl ;; -libressl-*) - install_libressl - ;; esac diff -pruN 1.30.4-1/.evergreen/scripts/install-uninstall-check-windows.cmd 2.0.2-1/.evergreen/scripts/install-uninstall-check-windows.cmd --- 1.30.4-1/.evergreen/scripts/install-uninstall-check-windows.cmd 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/install-uninstall-check-windows.cmd 2025-06-19 15:42:22.000000000 +0000 @@ -15,6 +15,9 @@ set CMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_ rem Ensure Cygwin executables like sh.exe are not in PATH set PATH=C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin;C:\mongoc;src\libbson;src\libmongoc +set version=1.31.0 +set major=1 + if "%BSON_ONLY%"=="1" ( set BUILD_DIR=%CD%\build-dir-bson set INSTALL_DIR=%CD%\install-dir-bson @@ -120,29 +123,11 @@ echo.%CC%| findstr /I "gcc">Nul && ( ) ) -if exist %INSTALL_DIR%\lib\pkgconfig\libbson-1.0.pc ( - echo libbson-1.0.pc found! - exit /B 1 -) else ( - echo libbson-1.0.pc check ok -) -if exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-1.0-config.cmake ( - echo bson-1.0-config.cmake found! - exit /B 1 -) else ( - echo bson-1.0-config.cmake check ok -) -if exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-1.0-config-version.cmake ( - echo bson-1.0-config-version.cmake found! +if exist %INSTALL_DIR%\lib\pkgconfig\bson%major%.pc ( + echo bson%major%.pc found! exit /B 1 ) else ( - echo bson-1.0-config-version.cmake check ok -) -if exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-targets.cmake ( - echo bson-targets.cmake found! - exit /B 1 -) else ( - echo bson-targets.cmake check ok + echo bson%major%.pc check ok ) if not exist %INSTALL_DIR%\lib\canary.txt ( echo canary.txt not found! @@ -157,11 +142,11 @@ if not exist %INSTALL_DIR%\lib ( echo %INSTALL_DIR%\lib check ok ) if "%BSON_ONLY%" NEQ "1" ( - if exist %INSTALL_DIR%\lib\pkgconfig\libmongoc-1.0.pc ( - echo libmongoc-1.0.pc found! + if exist %INSTALL_DIR%\lib\pkgconfig\mongoc%major%.pc ( + echo mongoc%major%.pc found! exit /B 1 ) else ( - echo libmongoc-1.0.pc check ok + echo mongoc%major%.pc check ok ) if exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-1.0-config.cmake ( echo mongoc-1.0-config.cmake found! @@ -182,23 +167,17 @@ if "%BSON_ONLY%" NEQ "1" ( echo mongoc-targets.cmake check ok ) ) -if exist %INSTALL_DIR%\include\libbson-1.0\bson\bson.h ( +if exist %INSTALL_DIR%\include\bson-%version%\bson\bson.h ( echo bson\bson.h found! exit /B 1 ) else ( echo bson\bson.h check ok ) -if exist %INSTALL_DIR%\include\libbson-1.0\bson.h ( - echo bson.h found! - exit /B 1 -) else ( - echo bson.h check ok -) -if exist %INSTALL_DIR%\include\libbson-1.0 ( - echo $INSTALL_DIR\include\libbson-1.0 found! +if exist %INSTALL_DIR%\include\bson-%version% ( + echo $INSTALL_DIR\include\bson-%version% found! exit /B 1 ) else ( - echo $INSTALL_DIR\include\libbson-1.0 check ok + echo $INSTALL_DIR\include\bson-%version% check ok ) if "%BSON_ONLY%" NEQ "1" ( if exist %INSTALL_DIR%\include\libmongoc-1.0\mongoc\mongoc.h ( diff -pruN 1.30.4-1/.evergreen/scripts/install-uninstall-check.sh 2.0.2-1/.evergreen/scripts/install-uninstall-check.sh --- 1.30.4-1/.evergreen/scripts/install-uninstall-check.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/install-uninstall-check.sh 2025-06-19 15:42:22.000000000 +0000 @@ -13,6 +13,13 @@ CMAKE=$(find_cmake_latest) . $DIR/check-symlink.sh SRCROOT=$(pwd) +# The major version of the project. Appears in certain install filenames. +_full_version=$(cat "$DIR/../../VERSION_CURRENT") +version="${_full_version%-*}" # 1.2.3-dev → 1.2.3 +major="${version%%.*}" # 1.2.3 → 1 +echo "major version: $major" +echo " full version: $version" + # Use ccache if able. . $DIR/find-ccache.sh find_ccache_and_export_vars "$(pwd)" || true @@ -20,7 +27,7 @@ find_ccache_and_export_vars "$(pwd)" || SCRATCH_DIR=$(pwd)/.scratch rm -rf "$SCRATCH_DIR" mkdir -p "$SCRATCH_DIR" -cp -vr -- "$SRCROOT"/* "$SCRATCH_DIR" +cp -r -- "$SRCROOT"/* "$SCRATCH_DIR" if [ "$BSON_ONLY" ]; then BUILD_DIR=$SCRATCH_DIR/build-dir-bson @@ -58,8 +65,8 @@ if [[ -f $DIR/find-ccache.sh ]]; then find_ccache_and_export_vars "$SCRATCH_DIR" || true fi -$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION "$SCRATCH_DIR" -$CMAKE --build . +$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DBUILD_TESTING=OFF -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION "$SCRATCH_DIR" +$CMAKE --build . --parallel if [ "$DESTDIR" ]; then DESTDIR=$DESTDIR $CMAKE --build . --target install else @@ -93,29 +100,23 @@ $CMAKE --build . --target uninstall set +o xtrace -if test -f $INSTALL_DIR/lib/pkgconfig/libbson-1.0.pc; then - echo "libbson-1.0.pc found!" - exit 1 -else - echo "libbson-1.0.pc check ok" -fi -if test -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-1.0-config.cmake; then - echo "bson-1.0-config.cmake found!" +if test -f $INSTALL_DIR/lib/pkgconfig/bson$major.pc; then + echo "bson$major.pc found!" exit 1 else - echo "bson-1.0-config.cmake check ok" + echo "bson$major.pc check ok" fi -if test -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-1.0-config-version.cmake; then - echo "bson-1.0-config-version.cmake found!" +if test -f $INSTALL_DIR/lib/cmake/bson-$version/bsonConfig.cmake; then + echo "bsonConfig.cmake found!" exit 1 else - echo "bson-1.0-config-version.cmake check ok" + echo "bsonConfig.cmake check ok" fi -if test -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-targets.cmake; then - echo "bson-targets.cmake found!" +if test -f $INSTALL_DIR/lib/cmake/bson-$version/bsonConfigVersion.cmake; then + echo "bsonConfigVersion.cmake found!" exit 1 else - echo "bson-targets.cmake check ok" + echo "bsonConfigVersion.cmake check ok" fi if test ! -f $INSTALL_DIR/lib/canary.txt; then echo "canary.txt not found!" @@ -130,11 +131,11 @@ else echo "$INSTALL_DIR/lib check ok" fi if [ -z "$BSON_ONLY" ]; then - if test -f $INSTALL_DIR/lib/pkgconfig/libmongoc-1.0.pc; then - echo "libmongoc-1.0.pc found!" + if test -f $INSTALL_DIR/lib/pkgconfig/mongoc$major.pc; then + echo "mongoc$major.pc found!" exit 1 else - echo "libmongoc-1.0.pc check ok" + echo "mongoc$major.pc check ok" fi if test -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake; then echo "mongoc-1.0-config.cmake found!" @@ -155,23 +156,17 @@ if [ -z "$BSON_ONLY" ]; then echo "mongoc-targets.cmake check ok" fi fi -if test -f $INSTALL_DIR/include/libbson-1.0/bson/bson.h; then +if test -f $INSTALL_DIR/include/bson-$version/bson/bson.h; then echo "bson/bson.h found!" exit 1 else echo "bson/bson.h check ok" fi -if test -f $INSTALL_DIR/include/libbson-1.0/bson.h; then - echo "bson.h found!" +if test -d $INSTALL_DIR/include/bson-$version; then + echo "$INSTALL_DIR/include/bson-$version found!" exit 1 else - echo "bson.h check ok" -fi -if test -d $INSTALL_DIR/include/libbson-1.0; then - echo "$INSTALL_DIR/include/libbson-1.0 found!" - exit 1 -else - echo "$INSTALL_DIR/include/libbson-1.0 check ok" + echo "$INSTALL_DIR/include/bson-$version check ok" fi if [ -z "$BSON_ONLY" ]; then if test -f $INSTALL_DIR/include/libmongoc-1.0/mongoc/mongoc.h; then @@ -180,12 +175,6 @@ if [ -z "$BSON_ONLY" ]; then else echo "mongoc/mongoc.h check ok" fi - if test -f $INSTALL_DIR/include/libmongoc-1.0/mongoc.h; then - echo "mongoc.h found!" - exit 1 - else - echo "mongoc.h check ok" - fi if test -d $INSTALL_DIR/include/libmongoc-1.0; then echo "$INSTALL_DIR/include/libmongoc-1.0 found!" exit 1 diff -pruN 1.30.4-1/.evergreen/scripts/link-sample-program-bson.sh 2.0.2-1/.evergreen/scripts/link-sample-program-bson.sh --- 1.30.4-1/.evergreen/scripts/link-sample-program-bson.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/link-sample-program-bson.sh 2025-06-19 15:42:22.000000000 +0000 @@ -4,27 +4,29 @@ set -o errexit # Exit the script with e # Supported/used environment variables: # LINK_STATIC Whether to statically link to libbson # BUILD_SAMPLE_WITH_CMAKE Link program w/ CMake. Default: use pkg-config. -# BUILD_SAMPLE_WITH_CMAKE_DEPRECATED If BUILD_SAMPLE_WITH_CMAKE is set, then use deprecated CMake scripts instead. -echo "LINK_STATIC=$LINK_STATIC BUILD_SAMPLE_WITH_CMAKE=$BUILD_SAMPLE_WITH_CMAKE BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=$BUILD_SAMPLE_WITH_CMAKE_DEPRECATED" +echo "LINK_STATIC=$LINK_STATIC BUILD_SAMPLE_WITH_CMAKE=$BUILD_SAMPLE_WITH_CMAKE" DIR=$(dirname $0) . $DIR/find-cmake-latest.sh CMAKE=$(find_cmake_latest) . $DIR/check-symlink.sh +# The major version of the project. Appears in certain install filenames. +_full_version=$(cat "$DIR/../../VERSION_CURRENT") +version="${_full_version%-*}" # 1.2.3-dev → 1.2.3 +major="${version%%.*}" # 1.2.3 → 1 +echo "major version: $major" +echo " full version: $version" + # Get the kernel name, lowercased OS=$(uname -s | tr '[:upper:]' '[:lower:]') echo "OS: $OS" if [ "$OS" = "darwin" ]; then - SO=dylib - LIB_SO=libbson-1.0.0.dylib LDD="otool -L" else - SO=so - LIB_SO=libbson-1.0.so.0.0.0 LDD=ldd fi @@ -52,29 +54,13 @@ fi if [ "$LINK_STATIC" ]; then # Our CMake system builds shared and static by default. - $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF "$SCRATCH_DIR" + $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DBUILD_TESTING=OFF -DENABLE_TESTS=OFF -DENABLE_MONGOC=OFF "$SCRATCH_DIR" $CMAKE --build . --parallel $CMAKE --build . --parallel --target install else - $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_STATIC=OFF "$SCRATCH_DIR" + $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DBUILD_TESTING=OFF -DENABLE_TESTS=OFF -DENABLE_MONGOC=OFF -DENABLE_STATIC=OFF "$SCRATCH_DIR" $CMAKE --build . --parallel $CMAKE --build . --parallel --target install - - set +o xtrace - - if test -f $INSTALL_DIR/lib/libbson-static-1.0.a; then - echo "libbson-static-1.0.a shouldn't have been installed" - exit 1 - fi - if test -f $INSTALL_DIR/lib/libbson-1.0.a; then - echo "libbson-1.0.a shouldn't have been installed" - exit 1 - fi - if test -f $INSTALL_DIR/lib/pkgconfig/libbson-static-1.0.pc; then - echo "libbson-static-1.0.pc shouldn't have been installed" - exit 1 - fi - fi # Revert ccache options, they no longer apply. @@ -82,83 +68,10 @@ unset CCACHE_BASEDIR CCACHE_NOHASHDIR ls -l $INSTALL_DIR/lib -set +o xtrace - -# Check on Linux that libbson is installed into lib/ like: -# libbson-1.0.so -> libbson-1.0.so.0 -# libbson-1.0.so.0 -> libbson-1.0.so.0.0.0 -# libbson-1.0.so.0.0.0 -if [ "$OS" != "darwin" ]; then - # From check-symlink.sh - check_symlink libbson-1.0.so libbson-1.0.so.0 - check_symlink libbson-1.0.so.0 libbson-1.0.so.0.0.0 - SONAME=$(objdump -p $INSTALL_DIR/lib/$LIB_SO|grep SONAME|awk '{print $2}') - EXPECTED_SONAME="libbson-1.0.so.0" - if [ "$SONAME" != "$EXPECTED_SONAME" ]; then - echo "SONAME should be $EXPECTED_SONAME, not $SONAME" - exit 1 - else - echo "library name check ok, SONAME=$SONAME" - fi -else - # Just test that the shared lib was installed. - if test ! -f $INSTALL_DIR/lib/$LIB_SO; then - echo "$LIB_SO missing!" - exit 1 - else - echo "$LIB_SO check ok" - fi -fi - -if test ! -f $INSTALL_DIR/lib/pkgconfig/libbson-1.0.pc; then - echo "libbson-1.0.pc missing!" - exit 1 -else - echo "libbson-1.0.pc check ok" -fi -if test ! -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-1.0-config.cmake; then - echo "bson-1.0-config.cmake missing!" - exit 1 -else - echo "bson-1.0-config.cmake check ok" -fi -if test ! -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-1.0-config-version.cmake; then - echo "bson-1.0-config-version.cmake missing!" - exit 1 -else - echo "bson-1.0-config-version.cmake check ok" -fi -if test ! -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-targets.cmake; then - echo "bson-targets.cmake missing!" - exit 1 -else - echo "bson-targets.cmake check ok" -fi - -if [ "$LINK_STATIC" ]; then - if test ! -f $INSTALL_DIR/lib/libbson-static-1.0.a; then - echo "libbson-static-1.0.a missing!" - exit 1 - else - echo "libbson-static-1.0.a check ok" - fi - if test ! -f $INSTALL_DIR/lib/pkgconfig/libbson-static-1.0.pc; then - echo "libbson-static-1.0.pc missing!" - exit 1 - else - echo "libbson-static-1.0.pc check ok" - fi -fi - cd $SRCROOT if [ "$BUILD_SAMPLE_WITH_CMAKE" ]; then - # Test our CMake package config file with CMake's find_package command. - if [ "$BUILD_SAMPLE_WITH_CMAKE_DEPRECATED" ]; then - EXAMPLE_DIR=$SRCROOT/src/libbson/examples/cmake-deprecated/find_package - else - EXAMPLE_DIR=$SRCROOT/src/libbson/examples/cmake/find_package - fi + EXAMPLE_DIR=$SRCROOT/src/libbson/examples/cmake/find_package if [ "$LINK_STATIC" ]; then EXAMPLE_DIR="${EXAMPLE_DIR}_static" @@ -174,12 +87,12 @@ else if [ "$LINK_STATIC" ]; then echo "pkg-config output:" - echo $(pkg-config --libs --cflags libbson-static-1.0) - ./compile-with-pkg-config-static.sh + echo $(pkg-config --libs --cflags bson$major-static) + env major=$major ./compile-with-pkg-config-static.sh else echo "pkg-config output:" - echo $(pkg-config --libs --cflags libbson-1.0) - ./compile-with-pkg-config.sh + echo $(pkg-config --libs --cflags bson$major) + env major=$major ./compile-with-pkg-config.sh fi fi diff -pruN 1.30.4-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd 2.0.2-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd --- 1.30.4-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/link-sample-program-mingw-bson.cmd 2025-06-19 15:42:22.000000000 +0000 @@ -19,6 +19,9 @@ mkdir %INSTALL_DIR% set PATH=%PATH%;%INSTALL_DIR%\bin +set major=1 +set version=1.31.0 + cd %BUILD_DIR% robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL @@ -34,22 +37,6 @@ if errorlevel 1 ( exit /B 1 ) -set MINGW=1 -call ..\.evergreen\scripts\check-installed-files-bson.bat -if errorlevel 1 ( - exit /B 1 -) -set MINGW= - -if not exist %INSTALL_DIR%\lib\libbson-static-1.0.a ( - echo libbson-static-1.0.a missing! - exit /B 1 -) else ( - echo libbson-static-1.0.a check ok -) - -cd %SRCROOT% - rem Test our pkg-config file set EXAMPLE_DIR=%SRCROOT%\src\libbson\examples\ cd %EXAMPLE_DIR% @@ -60,7 +47,7 @@ exit /B 0 set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig rem http://stackoverflow.com/questions/2323292 -for /f %%i in ('pkg-config --libs --cflags libbson-1.0') do set PKG_CONFIG_OUT=%%i +for /f %%i in ('pkg-config --libs --cflags bson%major%') do set PKG_CONFIG_OUT=%%i echo PKG_CONFIG_OUT is %PKG_CONFIG_OUT% diff -pruN 1.30.4-1/.evergreen/scripts/link-sample-program-mingw.cmd 2.0.2-1/.evergreen/scripts/link-sample-program-mingw.cmd --- 1.30.4-1/.evergreen/scripts/link-sample-program-mingw.cmd 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/link-sample-program-mingw.cmd 2025-06-19 15:42:22.000000000 +0000 @@ -20,6 +20,8 @@ mkdir %INSTALL_DIR% set PATH=%PATH%;%INSTALL_DIR%\bin +set major=1 + cd %BUILD_DIR% robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL @@ -35,22 +37,6 @@ if errorlevel 1 ( exit /B 1 ) -set MINGW=1 -call ..\.evergreen\scripts\check-installed-files.bat -if errorlevel 1 ( - exit /B 1 -) -set MINGW= - -if not exist %INSTALL_DIR%\lib\libmongoc-static-1.0.a ( - echo libmongoc-static-1.0.a missing! - exit /B 1 -) else ( - echo libmongoc-static-1.0.a check ok -) - -cd %SRCROOT% - rem Test our pkg-config file set EXAMPLE_DIR=%SRCROOT%\src\libmongoc\examples\ cd %EXAMPLE_DIR% @@ -61,7 +47,7 @@ exit /B 0 set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig rem http://stackoverflow.com/questions/2323292 -for /f %%i in ('pkg-config --libs --cflags libmongoc-1.0') do set PKG_CONFIG_OUT=%%i +for /f %%i in ('pkg-config --libs --cflags mongoc%major%') do set PKG_CONFIG_OUT=%%i echo PKG_CONFIG_OUT is %PKG_CONFIG_OUT% diff -pruN 1.30.4-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd 2.0.2-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd --- 1.30.4-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/link-sample-program-msvc-bson.cmd 2025-06-19 15:42:22.000000000 +0000 @@ -26,19 +26,14 @@ cd %BUILD_DIR% robocopy "%SRCROOT%" "%BUILD_DIR%" /E /XD ".git" "%BUILD_DIR%" "_build" "cmake-build" /NP /NFL /NDL if "%LINK_STATIC%"=="1" ( - %CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF . ) else ( - %CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_STATIC=OFF . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_TESTS=OFF -DENABLE_STATIC=OFF . ) %CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m %CMAKE% --build . --target INSTALL --config "Debug" -- /m -call ..\.evergreen\scripts\check-installed-files-bson.bat -if errorlevel 1 ( - exit /B %errorlevel% -) - rem Test our CMake package config file with CMake's find_package command. set EXAMPLE_DIR=%SRCROOT%\src\libbson\examples\cmake\find_package @@ -47,7 +42,7 @@ if "%LINK_STATIC%"=="1" ( ) cd %EXAMPLE_DIR% -%CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . +%CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . %CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m rem Yes, they should've named it "dependencies". diff -pruN 1.30.4-1/.evergreen/scripts/link-sample-program-msvc.cmd 2.0.2-1/.evergreen/scripts/link-sample-program-msvc.cmd --- 1.30.4-1/.evergreen/scripts/link-sample-program-msvc.cmd 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/link-sample-program-msvc.cmd 2025-06-19 15:42:22.000000000 +0000 @@ -33,7 +33,7 @@ if "%ENABLE_SNAPPY%"=="1" ( curl -sS --retry 5 -LO https://github.com/google/snappy/archive/1.1.7.tar.gz %TAR% xzf 1.1.7.tar.gz cd snappy-1.1.7 - %CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% . %CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m %CMAKE% --build . --target INSTALL --config "Debug" -- /m set SNAPPY_OPTION=-DENABLE_SNAPPY=ON @@ -44,37 +44,14 @@ if "%ENABLE_SNAPPY%"=="1" ( cd %BUILD_DIR% rem Build libmongoc if "%ENABLE_SSL%"=="1" ( - %CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=WINDOWS %ENABLE_SNAPPY_OPTION% . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=WINDOWS %ENABLE_SNAPPY_OPTION% . ) else ( - %CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% . + %CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake -DCMAKE_INSTALL_PREFIX=%INSTALL_DIR% -DENABLE_SSL=OFF %ENABLE_SNAPPY_OPTION% . ) %CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m %CMAKE% --build . --target INSTALL --config "Debug" -- /m -call ..\.evergreen\scripts\check-installed-files.bat -if errorlevel 1 ( - exit /B %errorlevel% -) - -rem Shim library around the DLL. -set SHIM=%INSTALL_DIR%\lib\mongoc-1.0.lib -if not exist %SHIM% ( - echo %SHIM% is missing! - exit /B 1 -) else ( - echo %SHIM% check ok -) - -if not exist %INSTALL_DIR%\lib\mongoc-static-1.0.lib ( - echo mongoc-static-1.0.lib missing! - exit /B 1 -) else ( - echo mongoc-static-1.0.lib check ok -) - -cd %SRCROOT% - rem Test our CMake package config file with CMake's find_package command. set EXAMPLE_DIR=%SRCROOT%\src\libmongoc\examples\cmake\find_package @@ -90,7 +67,7 @@ if "%ENABLE_SSL%"=="1" ( set MONGODB_EXAMPLE_URI="mongodb://localhost/?ssl=true&sslclientcertificatekeyfile=client.pem&sslcertificateauthorityfile=ca.pem&sslallowinvalidhostnames=true" ) -%CMAKE% -G "Visual Studio 15 2017 Win64" -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . +%CMAKE% -G "Visual Studio 15 2017" -A x64 -DCMAKE_PREFIX_PATH=%INSTALL_DIR%\lib\cmake . %CMAKE% --build . --target ALL_BUILD --config "Debug" -- /m rem Yes, they should've named it "dependencies". diff -pruN 1.30.4-1/.evergreen/scripts/link-sample-program.sh 2.0.2-1/.evergreen/scripts/link-sample-program.sh --- 1.30.4-1/.evergreen/scripts/link-sample-program.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/link-sample-program.sh 2025-06-19 15:42:22.000000000 +0000 @@ -4,30 +4,32 @@ set -o errexit # Exit the script with e # Supported/used environment variables: # LINK_STATIC Whether to statically link to libmongoc # BUILD_SAMPLE_WITH_CMAKE Link program w/ CMake. Default: use pkg-config. -# BUILD_SAMPLE_WITH_CMAKE_DEPRECATED If BUILD_SAMPLE_WITH_CMAKE is set, then use deprecated CMake scripts instead. # ENABLE_SSL Set -DENABLE_SSL # ENABLE_SNAPPY Set -DENABLE_SNAPPY # CMAKE Path to cmake executable. -echo "LINK_STATIC=$LINK_STATIC BUILD_SAMPLE_WITH_CMAKE=$BUILD_SAMPLE_WITH_CMAKE BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=$BUILD_SAMPLE_WITH_CMAKE_DEPRECATED" +echo "LINK_STATIC=$LINK_STATIC BUILD_SAMPLE_WITH_CMAKE=$BUILD_SAMPLE_WITH_CMAKE" DIR=$(dirname $0) . $DIR/find-cmake-latest.sh CMAKE=$(find_cmake_latest) . $DIR/check-symlink.sh +# The major version of the project. Appears in certain install filenames. +_full_version=$(cat "$DIR/../../VERSION_CURRENT") +version="${_full_version%-*}" # 1.2.3-dev → 1.2.3 +major="${version%%.*}" # 1.2.3 → 1 +echo "major version: $major" +echo " full version: $version" + # Get the kernel name, lowercased OS=$(uname -s | tr '[:upper:]' '[:lower:]') echo "OS: $OS" if [ "$OS" = "darwin" ]; then - SO=dylib - LIB_SO=libmongoc-1.0.0.dylib LDD="otool -L" else - SO=so - LIB_SO=libmongoc-1.0.so.0 LDD=ldd fi @@ -76,9 +78,13 @@ ZSTD="AUTO" if [[ -f $DIR/find-ccache.sh ]]; then . $DIR/find-ccache.sh find_ccache_and_export_vars "$SCRATCH_DIR" || true + if command -v "${CMAKE_C_COMPILER_LAUNCHER:-}" && [[ "${OSTYPE:?}" == cygwin ]]; then + configure_flags_append "-DCMAKE_POLICY_DEFAULT_CMP0141=NEW" + configure_flags_append "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=$<$:Embedded>" + fi fi -$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_ZSTD=$ZSTD "$SCRATCH_DIR" +$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake -DBUILD_TESTING=OFF $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_ZSTD=$ZSTD "$SCRATCH_DIR" $CMAKE --build . --parallel $CMAKE --build . --parallel --target install @@ -87,100 +93,17 @@ unset CCACHE_BASEDIR CCACHE_NOHASHDIR ls -l $INSTALL_DIR/lib -set +o xtrace - -# Check on Linux that libmongoc is installed into lib/ like: -# libmongoc-1.0.so -> libmongoc-1.0.so.0 -# libmongoc-1.0.so.0 -> libmongoc-1.0.so.0.0.0 -# libmongoc-1.0.so.0.0.0 -if [ "$OS" != "darwin" ]; then - # From check-symlink.sh - check_symlink libmongoc-1.0.so libmongoc-1.0.so.0 - check_symlink libmongoc-1.0.so.0 libmongoc-1.0.so.0.0.0 - SONAME=$(objdump -p $INSTALL_DIR/lib/$LIB_SO|grep SONAME|awk '{print $2}') - EXPECTED_SONAME="libmongoc-1.0.so.0" - if [ "$SONAME" != "$EXPECTED_SONAME" ]; then - echo "SONAME should be $EXPECTED_SONAME, not $SONAME" - exit 1 - else - echo "library name check ok, SONAME=$SONAME" - fi -else - # Just test that the shared lib was installed. - if test ! -f $INSTALL_DIR/lib/$LIB_SO; then - echo "$LIB_SO missing!" - exit 1 - else - echo "$LIB_SO check ok" - fi -fi - - -if test ! -f $INSTALL_DIR/lib/pkgconfig/libmongoc-1.0.pc; then - echo "libmongoc-1.0.pc missing!" - exit 1 -else - echo "libmongoc-1.0.pc check ok" -fi -if test ! -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake; then - echo "mongoc-1.0-config.cmake missing!" - exit 1 -else - echo "mongoc-1.0-config.cmake check ok" -fi -if test ! -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-1.0-config-version.cmake; then - echo "mongoc-1.0-config-version.cmake missing!" - exit 1 -else - echo "mongoc-1.0-config-version.cmake check ok" -fi -if test ! -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-targets.cmake; then - echo "mongoc-targets.cmake missing!" - exit 1 -else - echo "mongoc-targets.cmake check ok" -fi - - -if [ "$LINK_STATIC" ]; then - if test ! -f $INSTALL_DIR/lib/libmongoc-static-1.0.a; then - echo "libmongoc-static-1.0.a missing!" - exit 1 - else - echo "libmongoc-static-1.0.a check ok" - fi - if test ! -f $INSTALL_DIR/lib/pkgconfig/libmongoc-static-1.0.pc; then - echo "libmongoc-static-1.0.pc missing!" - exit 1 - else - echo "libmongoc-static-1.0.pc check ok" - fi -else - if test -f $INSTALL_DIR/lib/libmongoc-static-1.0.a; then - echo "libmongoc-static-1.0.a shouldn't have been installed" - exit 1 - fi - if test -f $INSTALL_DIR/lib/libmongoc-1.0.a; then - echo "libmongoc-1.0.a shouldn't have been installed" - exit 1 - fi - if test -f $INSTALL_DIR/lib/pkgconfig/libmongoc-static-1.0.pc; then - echo "libmongoc-static-1.0.pc shouldn't have been installed" - exit 1 - fi -fi - -if [ "$OS" = "darwin" && "${HOSTTYPE:?}" != "arm64" ]; then - if test -f $INSTALL_DIR/bin/mongoc-stat; then - echo "mongoc-stat shouldn't have been installed" +if [ "$OS" = "darwin" ] && [ "${HOSTTYPE:?}" != "arm64" ]; then + if test -f $INSTALL_DIR/bin/mongoc$major-stat; then + echo "mongoc$major-stat shouldn't have been installed" exit 1 fi else - if test ! -f $INSTALL_DIR/bin/mongoc-stat; then - echo "mongoc-stat missing!" + if test ! -f $INSTALL_DIR/bin/mongoc$major-stat; then + echo "mongoc$major-stat missing!" exit 1 else - echo "mongoc-stat check ok" + echo "mongoc$major-stat check ok" fi fi @@ -206,12 +129,12 @@ else if [ "$LINK_STATIC" ]; then echo "pkg-config output:" - echo $(pkg-config --libs --cflags libmongoc-static-1.0) - ./compile-with-pkg-config-static.sh + echo $(pkg-config --libs --cflags mongoc$major-static) + env major=$major ./compile-with-pkg-config-static.sh else echo "pkg-config output:" - echo $(pkg-config --libs --cflags libmongoc-1.0) - ./compile-with-pkg-config.sh + echo $(pkg-config --libs --cflags mongoc$major) + env major=$major ./compile-with-pkg-config.sh fi fi diff -pruN 1.30.4-1/.evergreen/scripts/run-auth-tests.sh 2.0.2-1/.evergreen/scripts/run-auth-tests.sh --- 1.30.4-1/.evergreen/scripts/run-auth-tests.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/run-auth-tests.sh 2025-06-19 15:42:22.000000000 +0000 @@ -27,11 +27,9 @@ chmod 700 "${secrets_dir}" # Create certificate to test X509 auth with Atlas: atlas_x509_path="${secrets_dir:?}/atlas_x509.pem" echo "${atlas_x509_cert_base64:?}" | base64 --decode > "${secrets_dir:?}/atlas_x509.pem" -# On Windows, convert certificate to PKCS#1 to work around CDRIVER-4269: +# Fix path on Windows: if $IS_WINDOWS; then - openssl pkey -in "${secrets_dir:?}/atlas_x509.pem" -traditional > "${secrets_dir:?}/atlas_x509_pkcs1.pem" - openssl x509 -in "${secrets_dir:?}/atlas_x509.pem" >> "${secrets_dir:?}/atlas_x509_pkcs1.pem" - atlas_x509_path="$(cygpath -m "${secrets_dir:?}/atlas_x509_pkcs1.pem")" + atlas_x509_path="$(cygpath -m "${secrets_dir:?}/atlas_x509.pem")" fi # Create Kerberos config and keytab files. @@ -98,7 +96,7 @@ esac # Archlinux (which we use for testing various self-installed OpenSSL versions) # stores their trust list under /etc/ca-certificates/extracted/. -# We need to copy it to our custom installed OpenSSL/LibreSSL trust store. +# We need to copy it to our custom installed OpenSSL trust store. declare pem_file="/etc/ca-certificates/extracted/tls-ca-bundle.pem" if [[ -f "${pem_file}" ]]; then [[ ! -d "${install_dir}" ]] || cp -v "${pem_file}" "${install_dir}/cert.pem" diff -pruN 1.30.4-1/.evergreen/scripts/run-ocsp-cache-test.sh 2.0.2-1/.evergreen/scripts/run-ocsp-cache-test.sh --- 1.30.4-1/.evergreen/scripts/run-ocsp-cache-test.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/.evergreen/scripts/run-ocsp-cache-test.sh 2025-06-19 15:42:22.000000000 +0000 @@ -68,7 +68,7 @@ if [[ -d "${openssl_install_dir}" ]]; th fi # This test will hang after the first ping. -LD_LIBRARY_PATH="${openssl_lib_prefix}" "${mongoc_dir}/src/libmongoc/test-mongoc-cache" "${mongoc_dir}/.evergreen/ocsp/${CERT_TYPE}/ca.pem" & +LD_LIBRARY_PATH="${openssl_lib_prefix}" "${mongoc_dir}/cmake-build/src/libmongoc/test-mongoc-cache" "${mongoc_dir}/.evergreen/ocsp/${CERT_TYPE}/ca.pem" & sleep 5 # Give the program time to contact the OCSP responder pkill -nf "ocsp_mock" # We assume that the mock OCSP responder is named "ocsp_mock" diff -pruN 1.30.4-1/CMakeLists.txt 2.0.2-1/CMakeLists.txt --- 1.30.4-1/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -111,15 +111,13 @@ mongo_bool_setting(USE_BUNDLED_UTF8PROC ADVANCED) mongo_setting( ENABLE_SSL [[Enable TLS connection and SCRAM authentication.]] - OPTIONS WINDOWS DARWIN OPENSSL LIBRESSL OFF AUTO + OPTIONS WINDOWS DARWIN OPENSSL OFF AUTO DEFAULT VALUE AUTO VALIDATE CODE [[ if(ENABLE_SSL STREQUAL "DARWIN" AND NOT APPLE) message(WARNING "ENABLE_SSL=DARWIN is only supported on Apple platforms") elseif(ENABLE_SSL STREQUAL "WINDOWS" AND NOT WIN32) message(WARNING "ENABLE_SSL=WINDOWS is only supported on Windows platforms") - elseif (ENABLE_SSL STREQUAL "LIBRESSL") - message(DEPRECATION "ENABLE_SSL=LIBRESSL is deprecated and may be removed in a future major release") endif() ]] ) @@ -149,21 +147,11 @@ mongo_setting( message(WARNING "ENABLE_SASL=SSPI is only supported on Windows platforms") endif() if(ENABLE_SASL STREQUAL "CYRUS" AND WIN32) - message(DEPRECATION "ENABLE_SASL=CYRUS on Windows platforms is deprecated and may be removed in a future major release") + message(WARNING "ENABLE_SASL=CYRUS on Windows platforms is unsupported. Use ENABLE_SASL=SSPI or ENABLE_SASL=OFF instead") endif() ]] ) -mongo_setting(CYRUS_PLUGIN_PATH_PREFIX "An absolute path prefix to enable loading Cyrus SASL plugins on Windows" - TYPE STRING - VISIBLE_IF [[ENABLE_SASL STREQUAL "CYRUS" AND WIN32]] - VALIDATE CODE [[ - if (CYRUS_PLUGIN_PATH_PREFIX) - message(DEPRECATION "CYRUS_PLUGIN_PATH_PREFIX is deprecated and may be removed in a future major release") - endif () - ]] -) - mongo_setting(ENABLE_CLIENT_SIDE_ENCRYPTION "Enable In-Use Encryption support. Requires additional support libraries." OPTIONS ON OFF AUTO DEFAULT VALUE AUTO) @@ -184,8 +172,6 @@ mongo_setting(ENABLE_MONGODB_AWS_AUTH "E # Optional features that are DISABLED by default: mongo_bool_setting(ENABLE_RDTSCP "Enable fast performance counters using the Intel RDTSCP instruction" DEFAULT VALUE OFF) -mongo_bool_setting(ENABLE_APPLE_FRAMEWORK "Build libraries as Apple Frameworks on Darwin platforms" - DEFAULT VALUE OFF) mongo_bool_setting( ENABLE_CRYPTO_SYSTEM_PROFILE "Use system crypto profile" DEFAULT VALUE OFF @@ -196,41 +182,8 @@ mongo_bool_setting( ]] ) -# Deprecated options: -mongo_bool_setting( - ENABLE_AUTOMATIC_INIT_AND_CLEANUP - "[Deprecated] Enable automatic initialization of the C driver library" - DEFAULT EVAL [[ - set(DEFAULT OFF) - if(CMAKE_C_COMPILER_ID STREQUAL "GNU") - message(VERBOSE "For backwards compatibility, when using GCC the default of " - "ENABLE_AUTOMATIC_INIT_AND_CLEANUP is ON") - set(DEFAULT ON) - endif() - ]] - DEVEL VALUE OFF - VALIDATE CODE [[ - if(ENABLE_AUTOMATIC_INIT_AND_CLEANUP) - if(NOT CMAKE_C_COMPILER_ID STREQUAL "GNU") - message(WARNING "ENABLE_AUTOMATIC_INIT_AND_CLEANUP is only supported on GCC.") - endif() - message(DEPRECATION - "Enabling ENABLE_AUTOMATIC_INIT_AND_CLEANUP is deprecated and " - "may be removed in a future release") - endif() - ]] -) -mongo_bool_setting( - ENABLE_EXTRA_ALIGNMENT - "[Deprecated] Enable extra alignment on libbson types" - DEFAULT VALUE ON - DEVEL VALUE OFF - VALIDATE CODE [[ - if(ENABLE_EXTRA_ALIGNMENT AND MONGO_SANITIZE MATCHES "undefined") - message(WARNING "ENABLE_EXTRA_ALIGNMENT=“${ENABLE_EXTRA_ALIGNMENT}” will create conflicts with UndefinedBehaviorSanitizer") - endif() - ]] -) +# Announce the build configuration. Used by `mlib_build_config_is()` in `mlib/config.h` +add_compile_definitions(_MLIB_BUILD_CONFIG=$) if(ENABLE_COVERAGE) mongo_platform_link_options(--coverage) @@ -331,6 +284,9 @@ if(ENABLE_MAINTAINER_FLAGS) gnu-like:-Wuninitialized # Disabled, for now: gnu-like:-Wno-strict-aliasing + # Sign-comparison-mismatch: + gnu-like:-Wsign-compare + msvc:/we4018 ) endif() @@ -343,8 +299,6 @@ if ( (ENABLE_BUILD_DEPENDECIES STREQUAL set (ENABLE_BUILD_DEPENDECIES ON) endif () -mongo_pick(BSON_EXTRA_ALIGN 1 0 ENABLE_EXTRA_ALIGNMENT) - mongo_pick(MONGOC_ENABLE_RDTSCP 1 0 ENABLE_RDTSCP) mongo_pick(MONGOC_ENABLE_STATIC_BUILD 1 0 ENABLE_STATIC) @@ -352,31 +306,17 @@ mongo_pick(MONGOC_ENABLE_STATIC_INSTALL [[ENABLE_STATIC AND NOT ENABLE_STATIC STREQUAL "BUILD_ONLY"]]) if (USE_SYSTEM_LIBBSON) - # The input variable BSON_ROOT_DIR is respected for backwards compatibility, - # but you should use the standard CMAKE_PREFIX_PATH instead. - message (STATUS "Searching for libbson CMake packages") - find_package (bson-1.0 - "${PROJECT_VERSION}" - HINTS - ${BSON_ROOT_DIR}) - - if (NOT bson-1.0_FOUND) - message (FATAL_ERROR "System libbson not found") - endif () - - message (STATUS "libbson found version \"${bson-1.0_VERSION}\"") - message (STATUS "disabling test-libmongoc since using system libbson") - SET (ENABLE_TESTS OFF) + find_package (bson "${PROJECT_VERSION}" REQUIRED) + # Disable test-libmongoc since we are using a system libbson + set (ENABLE_TESTS OFF) set (USING_SYSTEM_BSON TRUE) - if (NOT TARGET mongo::bson_shared) - message (FATAL_ERROR "System libbson built without shared library target") + if (NOT TARGET bson::shared) + message (FATAL_ERROR "System libbson built without shared library target") endif () - set (BSON_LIBRARIES mongo::bson_shared) - if (NOT TARGET mongo::bson_static) - message (FATAL_ERROR "System libbson built without static library target") + if (NOT TARGET bson::static) + message (FATAL_ERROR "System libbson built without static library target") endif () - set (BSON_STATIC_LIBRARIES mongo::bson_static) endif () set (BUILD_SOURCE_DIR ${CMAKE_BINARY_DIR}) @@ -399,9 +339,15 @@ set (CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Include any custom library paths in the final RPATH. set (CMAKE_INSTALL_RPATH_USE_LINK_PATH ON) -# Install libs with names like @rpath/libmongoc-1.0.0.dylib, not bare names. +# Install libs with names like @rpath/libfoo.dylib, not bare names. set (CMAKE_MACOSX_RPATH ON) +# Distinguish DLL import libs with a .dll.lib suffix. Also prevents filename collisions +# between static libraries and the import libraries +if(WIN32) + set (CMAKE_IMPORT_LIBRARY_SUFFIX .dll.lib) +endif() + # https://cmake.org/cmake/help/v3.11/policy/CMP0042.html # Enable a CMake 3.0+ policy that sets CMAKE_MACOSX_RPATH by default, and # silence a CMake 3.11 warning that the old behavior is deprecated. @@ -449,14 +395,7 @@ add_subdirectory (src/common) if (NOT USING_SYSTEM_BSON) message (STATUS "Using bundled libbson") - add_subdirectory (src/libbson) - # Defined in src/libbson/CMakeLists.txt - set (BSON_STATIC_LIBRARIES bson_static) - set (BSON_LIBRARIES bson_shared) - set (BSON_STATIC_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/libbson/src" "${PROJECT_BINARY_DIR}/src/libbson/src") - set (BSON_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src/libbson/src" "${PROJECT_BINARY_DIR}/src/libbson/src") - set (BSON_STATIC_PUBLIC_DEFINITIONS "BSON_STATIC") endif () if (MSVC) @@ -476,11 +415,6 @@ if (ENABLE_MONGOC) # Ensure the default behavior: don't ignore RPATH settings. set (CMAKE_SKIP_BUILD_RPATH OFF) - if (APPLE) - # Until CDRIVER-520. - add_definitions (-Wno-deprecated-declarations) - endif () - if (NOT ENABLE_MONGODB_AWS_AUTH MATCHES "ON|OFF|AUTO") message (FATAL_ERROR "ENABLE_MONGODB_AWS_AUTH option must be ON, AUTO, or OFF") endif () @@ -531,7 +465,7 @@ if (ENABLE_MONGOC) endif () install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES - DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver + DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver/${PROJECT_VERSION} ) if (ENABLE_UNINSTALL) @@ -543,7 +477,7 @@ if (ENABLE_UNINSTALL) # Generate a different script name for uninstalling libbson only: set (UNINSTALL_SCRIPT_NAME "uninstall-bson") endif () - set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_DATADIR}/mongo-c-driver") + set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_DATADIR}/mongo-c-driver/${PROJECT_VERSION}") include (GenerateUninstaller) endif () diff -pruN 1.30.4-1/CONTRIBUTING.md 2.0.2-1/CONTRIBUTING.md --- 1.30.4-1/CONTRIBUTING.md 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/CONTRIBUTING.md 2025-06-19 15:42:22.000000000 +0000 @@ -289,8 +289,9 @@ The set of mock KMS servers running in t | 8999 | ca.pem | server.pem | python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port 8999 | 9000 | ca.pem | expired.pem | python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/expired.pem --port 9000 | 9001 | ca.pem | wrong-host.pem | python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/wrong-host.pem --port 9001 -| 9002 | ca.pem | server.pem | python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --port --require_client_cert 9002 +| 9002 | ca.pem | server.pem | python -u kms_http_server.py --ca_file ../x509gen/ca.pem --cert_file ../x509gen/server.pem --require_client_cert --port 9002 | 5698 | ca.pem | server.pem | python -u kms_kmip_server.py +| 9003 | ca.pem | server.pem | python kms_failpoint_server.py --port 9003 The path to `ca.pem` and `client.pem` must be passed through the following environment variables: diff -pruN 1.30.4-1/Earthfile 2.0.2-1/Earthfile --- 1.30.4-1/Earthfile 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/Earthfile 2025-06-19 15:42:22.000000000 +0000 @@ -1,5 +1,5 @@ VERSION --arg-scope-and-set --pass-args 0.7 -FROM alpine:3.21 +LOCALLY IMPORT ./tools/ AS tools @@ -37,10 +37,8 @@ build: "$source_dir" ENV CCACHE_HOME=/root/.cache/ccache RUN cmake -S "$source_dir" -B "$build_dir" -G "Ninja Multi-Config" \ - -D ENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \ -D ENABLE_MAINTAINER_FLAGS=ON \ -D ENABLE_SHM_COUNTERS=ON \ - -D ENABLE_EXTRA_ALIGNMENT=OFF \ -D ENABLE_SASL=$(echo $sasl | __str upper) \ -D ENABLE_SNAPPY=ON \ -D ENABLE_SRV=ON \ @@ -66,7 +64,6 @@ test-example: # Add the example files COPY --dir \ src/libmongoc/examples/cmake \ - src/libmongoc/examples/cmake-deprecated \ src/libmongoc/examples/hello_mongoc.c \ /opt/mongoc-test/ # Configure and build it @@ -147,20 +144,11 @@ multibuild: --sasl=Cyrus --sasl=off \ --c_compiler=gcc --c_compiler=clang \ --test_mongocxx_ref=master - # Note: At time of writing, Ubuntu does not support LibreSSL, so run those - # tests on a separate BUILD line that does not include Ubuntu: - BUILD +run --targets "test-example" \ - --env=alpine3.16 --env=alpine3.17 --env=alpine3.18 --env=alpine3.19 \ - --env=archlinux \ - --tls=LibreSSL \ - --sasl=Cyrus --sasl=off \ - --c_compiler=gcc --c_compiler=clang \ - --test_mongocxx_ref=master # release-archive : # Create a release archive of the source tree. (Refer to dev docs) release-archive: - FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.20 + FROM alpine:3.20 RUN apk add git bash ARG --required prefix ARG --required ref @@ -205,7 +193,7 @@ release-archive: # Obtain the signing public key. Exported as an artifact /c-driver.pub signing-pubkey: - FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.20 + FROM alpine:3.20 RUN apk add curl RUN curl --location --silent --fail "https://pgp.mongodb.com/c-driver.pub" -o /c-driver.pub SAVE ARTIFACT /c-driver.pub @@ -235,7 +223,7 @@ sign-file: # Generate a signed release artifact. Refer to the "Earthly" page of our dev docs for more information. # (Refer to dev docs) signed-release: - FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.20 + FROM alpine:3.20 RUN apk add git # The version of the release. This affects the filepaths of the output and is the default for --ref ARG --required version @@ -324,7 +312,7 @@ sbom-validate: --exclude jira snyk: - FROM --platform=linux/amd64 artifactory.corp.mongodb.com/dockerhub/library/ubuntu:24.04 + FROM --platform=linux/amd64 ubuntu:24.04 RUN apt-get update && apt-get -y install curl RUN curl --location https://github.com/snyk/cli/releases/download/v1.1291.1/snyk-linux -o /usr/local/bin/snyk RUN chmod a+x /usr/local/bin/snyk @@ -396,7 +384,7 @@ test-vcpkg-manifest-mode: make test-manifest-mode vcpkg-base: - FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.18 + FROM alpine:3.18 RUN apk add cmake curl gcc g++ musl-dev ninja-is-really-ninja zip unzip tar \ build-base git pkgconf perl bash linux-headers ENV VCPKG_ROOT=/opt/vcpkg-git @@ -455,7 +443,7 @@ env.alpine3.19: DO --pass-args +ALPINE_ENV --version=3.19 env.archlinux: - FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/archlinux + FROM --pass-args tools+init-env --from archlinux RUN pacman-key --init ARG --required purpose @@ -476,7 +464,7 @@ env.centos7: ALPINE_ENV: COMMAND ARG --required version - FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/alpine:$version + FROM --pass-args tools+init-env --from alpine:$version # XXX: On Alpine, we just use the system's CMake. At time of writing, it is # very up-to-date and much faster than building our own from source (since # Kitware does not (yet) provide libmuslc builds of CMake) @@ -498,7 +486,7 @@ ALPINE_ENV: UBUNTU_ENV: COMMAND ARG --required version - FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/ubuntu:$version + FROM --pass-args tools+init-env --from ubuntu:$version RUN __install curl build-essential ARG --required purpose @@ -516,7 +504,7 @@ UBUNTU_ENV: CENTOS_ENV: COMMAND ARG --required version - FROM --pass-args tools+init-env --from artifactory.corp.mongodb.com/dockerhub/library/centos:$version + FROM --pass-args tools+init-env --from centos:$version # Update repositories to use vault.centos.org RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && \ sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* diff -pruN 1.30.4-1/NEWS 2.0.2-1/NEWS --- 1.30.4-1/NEWS 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/NEWS 2025-06-19 15:42:22.000000000 +0000 @@ -1,5 +1,21 @@ -libmongoc 1.30.4 -================ +libmongoc 2.0.2 +=============== + +Fixes: + + * Fix message of `bson_strerror_r` on Windows. + * Fix memory leaks with Windows Secure Channel. + * Fix loading PKCS#8 RSA keys with Windows Secure Channel. + +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + * Colby Pike + + + +libmongoc 2.0.1 +=============== Fixes: @@ -12,32 +28,188 @@ Thanks to everyone who contributed to th -libmongoc 1.30.3 -================ +libmongoc 2.0.0 +=============== -New Features: +## Notes + +* In a future minor release the minimum supported MongoDB Server version will be raised from 4.0 to 4.2. This is in accordance with [MongoDB Software Lifecycle Schedules](https://www.mongodb.com/legal/support-policy/lifecycles). +* Raise required version of libmongocrypt to 1.13.0 to support In-Use Encryption (corresponds to the CMake option: `ENABLE_CLIENT_SIDE_ENCRYPTION`). -* In anticipation of the 2.0 release of mongo-c-driver, new CMake packages and - imported targets have been defined (for both `bson` and `mongoc`). To import - `mongoc` with the new names, call `find_package` for the `mongoc` package. The - new imported targets are named `mongoc::static`, `mongoc::shared`, and - `mongoc::mongoc` (which points to either the static or the shared library, - depending on an import-time configuration option). - - The new package and target names will remain unchanged when upgrading to the - 2.0 release, allowing consumers to support both major versions without - modifying their CMake project. The current imported target names will be - removed from the 2.0 release, and should not be used for - forward-compatibility. +## Changes + +* Passing `batchSize:0` as an option to `mongoc_client_watch`, `mongoc_database_watch`, or `mongoc_collection_watch` + now applies `batchSize:0` to the `aggregate` command. Useful to request an immediate cursor. Previously the value + was ignored. +* `bson_oid_init_sequence` is removed. Use `bson_oid_init` instead. +* `mongoc_server_description_host` changes the return type from `mongoc_host_list_t *` to `const mongoc_host_list_t *`. +* URI authentication credentials validation (only applicable during creation of a new `mongoc_uri_t` object from a connection string): + * The requirement that a username is non-empty when specified is now enforced regardless of authentication mechanism. + * Username and password specification requirements are now validated and returns a client error for the specified authentication mechanism. + * e.g. it is a client error to not specify a username or a password for SCRAM-SHA-1, SCRAM-SHA-256, and PLAIN. + * e.g. it is a client error to specify a password for MONGODB-X509. + * e.g. it is a client error to specify a username or a password without the other for MONGODB-AWS. + * `authSource` is now correctly defaulted to `"$external"` for MONGODB-AWS (instead of the database name or `"admin"`). + * `authMechanism` is now validated and returns a client error for invalid or unsupported values. + * `authMechanismProperties` is now validated and returns a client error for invalid or unsupported properties for the specified authentication mechanism. + * `authMechanismProperties` now correctly supports `':'` within property values. + * Old behavior: `authMechanismProperties=A:B,C:D:E,F:G` is parsed as `{'A': 'B', 'C': 'D:E,F:G'}`. + * New behavior: `authMechanismProperties=A:B,C:D:E,F:G` is parsed as `{'A': 'B': 'C': 'D:E', 'F': 'G'}`. +* Calling `mongoc_bulk_operation_execute` on the same `mongoc_bulk_operation_t` repeatedly is an error. Previously this was only discouraged in documentation. +* Consistently apply `__cdecl` calling convention to function declarations in public API. Intended to support consumers building their code using a different [default calling convention](https://learn.microsoft.com/en-us/cpp/build/reference/gd-gr-gv-gz-calling-convention) with MSVC. The mongoc and bson libraries only support being built with the `__cdecl` default calling convention. +* `mongoc_client_set_ssl_opts` now ignores a pooled `mongoc_client_t` and logs an error. Use `mongoc_client_pool_set_ssl_opts` to set TLS options on a `mongoc_client_pool_t` before popping any clients. +* `mongoc_client_set_ssl_stream_initiator` now ignores a pooled `mongoc_client_t` and logs an error. +* The pkg-config files `libmongoc-1.0`, `libmongoc-static-1.0`, `libbson-1.0`, + and `libbson-static-1.0` have been renamed to `mongoc2`, `mongoc2-static`, + `bson2`, and `bson2-static`, respectively. + +### CMake Packages and Imported Targets + +The `mongoc-1.0` (and `bson-1.0`) CMake packages have been removed. Instead, use +`mongoc` or `bson`, and specify a version or version range to be imported: + +```cmake +find_package(mongoc 1.30...2.0) +``` + +The new packages import different target names: + +- `mongo::mongoc_static` → `mongoc::static` +- `mongo::mongoc_shared` → `mongoc::shared` +- The target `mongoc::mongoc` is a shim target that points to either the shared + library or the static library. + +The BSON library has had similar name changes. + +## Removals + +* The `bson_md5_t` struct and associated API is removed. +* The client side matching feature, `mongoc_matcher_t` and related functions are removed. +* `mongoc_server_description_ismaster` is removed. Use the equivalent `mongoc_server_description_hello` instead. +* `MONGOC_QUERY_SLAVE_OK` is removed. Use the equivalent `MONGOC_QUERY_SECONDARY_OK` instead. +* `MONGOC_URI_SLAVEOK` is removed. It was unused. +* `mongoc_client_command`, `mongoc_database_command`, and `mongoc_collection_command` are removed. Use `mongoc_client_command_simple`, `mongoc_database_command_simple`, and `mongoc_collection_command_simple` instead. +* `MONGOC_URI_MAXIDLETIMEMS` and `MONGOC_URI_WAITQUEUEMULTIPLE` are removed. They were unused. +* `bson_string_t` and associated functions are removed. +* Support for `ENABLE_SASL=CYRUS` on Windows is removed. Use `ENABLE_SASL=SSPI` or `ENABLE_SASL=OFF` instead. + * The associated Windows-only option `CYRUS_PLUGIN_PATH_PREFIX` is removed. +* Support for the deprecated `minPoolSize` URI option is removed along with associated API: `MONGOC_URI_MINPOOLSIZE` and `mongoc_client_pool_min_size`. +* Support for LibreSSL (the CMake option `ENABLE_SSL=LIBRESSL`) is removed. Associated API is removed (`MONGOC_ENABLE_SSL_LIBRESSL` and `mongoc_stream_tls_libressl_new`). +* `MONGOC_WRITE_CONCERN_W_ERRORS_IGNORED` (value -1) is removed. Use `MONGOC_WRITE_CONCERN_W_UNACKNOWLEDGED` (value 0) which is handled equivalently. If specified in a URI, replace: `mongodb://host/?w=-1` with `mongodb://host/?w=0`. +* The deprecated CMake option `ENABLE_AUTOMATIC_INIT_AND_CLEANUP` is removed. See [Initialization and cleanup](https://mongoc.org/libmongoc/1.30.2/init-cleanup.html) for expected use of `mongoc_init()` and `mongoc_cleanup()`. +* `mongoc_client_get_database_names` is removed. Use `mongoc_client_get_database_names_with_opts` instead. +* `mongoc_client_find_databases` is removed. Use `mongoc_client_find_databases_with_opts` instead. +* `mongoc_client_get_max_message_size` is removed. +* `mongoc_client_get_max_bson_size` is removed. +* Deprecated `mongoc_apm_command_*_get_server_connection_id` functions are removed. Use `mongoc_apm_command_*_get_server_connection_id_int64` instead. +* Deprecated index management API is removed: + * `mongoc_collection_create_index_with_opts`, `mongoc_collection_create_index`, and `mongoc_collection_ensure_index` are removed. Use `mongoc_collection_create_indexes_with_opts` instead. + * `mongoc_index_opt_t`, `mongoc_index_opt_geo_t` `mongoc_index_opt_wt_t` are removed. Pass options using `bson_t` to `mongoc_collection_create_indexes_with_opts` instead. + * `mongoc_collection_find_indexes` is removed. Use `mongoc_collection_find_indexes_with_opts` instead. + * See [MongoDB documentation](https://www.mongodb.com/docs/languages/c/c-driver/current/indexes/) for working with indexes. +* Deprecated cursor API is removed: + * `mongoc_cursor_is_alive` is removed. Use the equivalent `mongoc_cursor_more` instead. + * `mongoc_cursor_set_hint` is removed. Use the equivalent `mongoc_cursor_set_server_id` instead. + * `mongoc_cursor_get_hint` is removed. Use the equivalent `mongoc_cursor_get_server_id` instead. + * `mongoc_cursor_new_from_command_reply` is removed. Use `mongoc_cursor_new_from_command_reply_with_opts` instead. +* Deprecated CRUD API is removed: + * `mongoc_collection_save` is removed. Use `mongoc_collection_insert_one` or `mongoc_collection_replace_one` instead. + * `mongoc_collection_delete` is removed. Use `mongoc_collection_delete_one` or `mongoc_collection_delete_many` instead. + * `mongoc_delete_flags_t` and `mongoc_reply_flags_t` are removed. + * `mongoc_collection_find` is removed. Use `mongoc_collection_find_with_opts` instead. + * `mongoc_collection_insert_bulk` is removed. Use `mongoc_collection_insert_many` instead. + * `mongoc_collection_create_bulk_operation` is removed. Use `mongoc_collection_create_bulk_operation_with_opts` instead. + * `mongoc_collection_get_last_error` is removed. To get results from write operations, instead use: + * `mongoc_collection_update_one` + * `mongoc_collection_update_many` + * `mongoc_collection_replace_one` + * `mongoc_collection_delete_one` + * `mongoc_collection_delete_many` + * `mongoc_collection_insert_one` + * `mongoc_collection_insert_many` + * `mongoc_bulkwrite_t` + * `mongoc_bulk_operation_t` + * `mongoc_bulk_operation_delete` is removed. Use `mongoc_bulk_operation_remove()` instead. + * `mongoc_bulk_operation_delete_one` is removed. Use `mongoc_bulk_operation_remove_one` instead. + * `mongoc_bulk_operation_get_hint` is removed. Use `mongoc_bulk_operation_get_server_id` instead. + * `mongoc_bulk_operation_set_hint` is removed. Use `mongoc_bulk_operation_set_server_id` instead. + * `mongoc_collection_count` and `mongoc_collection_count_with_opts` are removed. Use `mongoc_collection_count_documents` or `mongoc_collection_estimated_document_count` instead. +* `mongoc_collection_stats` is removed. Use the [$collStats aggregation pipeline stage](https://www.mongodb.com/docs/manual/reference/operator/aggregation/collStats/) with `mongoc_collection_aggregate` instead. +* `mongoc_collection_validate` is removed. Run the [validate](https://www.mongodb.com/docs/manual/reference/command/validate/) command directly with `mongoc_client_read_command_with_opts` instead. +* Deprecated API for `mongoc_database_t` is removed: + * `mongoc_database_find_collections` is removed. Use `mongoc_database_find_collections_with_opts` instead. + * `mongoc_database_get_collection_names` is removed. Use `mongoc_database_get_collection_names_with_opts` instead. +* Deprecated GridFS API has been removed: + * `mongoc_gridfs_find` is removed. Use `mongoc_gridfs_find_with_opts` instead. + * `mongoc_gridfs_find_one` is removed. Use `mongoc_gridfs_find_one_with_opts` instead. +* Deprecated TLS stream API is removed: + * `mongoc_stream_tls_do_handshake` is removed. Use `mongoc_stream_tls_handshake` instead. + * `mongoc_stream_tls_check_cert` is removed. Use `mongoc_stream_tls_handshake` instead. + * `mongoc_stream_tls_new` is removed. Use `mongoc_stream_tls_new_with_hostname` instead. +* Deprecated URI API has been removed: + * `mongoc_uri_get_service` is removed. Use `mongoc_uri_get_srv_hostname` instead. + * `mongoc_uri_get_read_prefs` is removed. Use `mongoc_uri_get_read_prefs_t` instead. + * `mongoc_uri_get_ssl` is removed. Use `mongoc_uri_get_tls` instead. +* Deprecated write concern API is removed: + * `mongoc_write_concern_get_fsync` is removed. Use `mongoc_write_concern_get_journal` instead. + * `mongoc_write_concern_set_fsync` is removed. Use `mongoc_write_concern_set_journal` instead. +* The `libmongoc-ssl-1.0` pkg-config file has been removed. + +### Forwarding headers (`#include ` and `#include `) + +The compatibility "forwarding" headers have been removed (previously added in 1.13.0). This means it is no longer valid to include the literal header names `mongoc.h` or `bson.h` directly: + +```c +#include // No longer provided! +#include // No longer provided! +``` + +Instead, the names must be prefixed with the parent directory: `mongoc/mongoc.h` and `bson/bson.h`: + +```c +#include +#include +``` + +### `mongoc_client_kill_cursor` + +`mongoc_client_kill_cursor` is removed. It did not accept a server identifier. It was only reliable when connected to a single server. + +Sending [killCursors](https://www.mongodb.com/docs/manual/reference/command/killCursors/) is not typically needed. `mongoc_cursor_t` manages the cursor lifetime. If needed, use a generic command helper to manually send a `killCursors` command: + +```c +bson_t *cmd = BCON_NEW ("killCursors", "coll", "cursors", "[", BCON_INT64 (cursor_id), "]"); +bool ok = mongoc_client_command_simple_with_server_id (client, "db", cmd, NULL, server_id, NULL, &error); +if (!ok) { + printf ("Failed to send 'killCursors': %s\n", error.message); +} +bson_destroy (cmd); +``` + +### `mongoc_client_get_server_status` + +`mongoc_client_get_server_status` is removed. Use a command helper to run the "serverStatus" command instead: + +```c +bson_t *cmd = BCON_NEW("serverStatus", BCON_INT32(1)); +if (!mongoc_client_command_simple(client, "db", cmd, NULL, &reply, &error)) { + printf("Failed to send 'serverStatus': %s\n", error.message); +} else { + // TODO: use `reply` +} +bson_destroy(&reply); +bson_destroy(cmd); +``` - Programs that link to BSON libraries directly should also use the new target - names `bson::static`, `bson::shared`, or `bson::bson`. +## Contributors Thanks to everyone who contributed to the development of this release. * Kevin Albertson * Ezra Chung * Colby Pike + * Micah Scott + * Jeroen Ooms libmongoc 1.30.2 @@ -1535,6 +1707,7 @@ Features: and all bson headers are under bson/. The preferred way of including the headers are mongoc/mongoc.h and bson/bson.h respectively. Forwarding headers in the root are provided for backwards compatibility. + (**Update**: These headers were removed in the 2.0 release) * The default CMake build type had been unspecified, now it is RelWithDebInfo. * Support LibreSSL 2.7+. diff -pruN 1.30.4-1/VERSION_CURRENT 2.0.2-1/VERSION_CURRENT --- 1.30.4-1/VERSION_CURRENT 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/VERSION_CURRENT 2025-06-19 15:42:22.000000000 +0000 @@ -1 +1 @@ -1.30.4 +2.0.2 diff -pruN 1.30.4-1/build/calc_release_version.py 2.0.2-1/build/calc_release_version.py --- 1.30.4-1/build/calc_release_version.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/calc_release_version.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,403 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -""" -A script that calculates the release version number (based on the current Git -branch and/or recent tags in history) to assign to a tarball generated from the -current Git commit. - -This script needs to remain compatible with its target platforms, which currently -includes RHEL 6, which uses Python 2.6! -""" - -# XXX NOTE XXX NOTE XXX NOTE XXX -# After modifying this script it is advisable to execute the self-tests in this directory: -# - calc_release_version_selftest.sh -# - calc_release_version_selftest.py -# XXX NOTE XXX NOTE XXX NOTE XXX - -# pyright: reportTypeCommentUsage=false - -import datetime -import errno -import re -import subprocess -import optparse # No 'argparse' on Python 2.6 -import sys - - -class Version: - def __init__(self, s): - pat = r'(\d+)\.(\d+)\.(\d+)(\-\S+)?' - match = re.match(pat, s) - assert match, "Unrecognized version string %s" % s - self.major, self.minor, self.micro = ( - map(int, (match.group(1), match.group(2), match.group(3)))) - - if match.group(4): - self.prerelease = match.group(4)[1:] - else: - self.prerelease = '' - - def __lt__(self, other): - if self.major != other.major: - return self.major < other.major - if self.minor != other.minor: - return self.minor < other.minor - if self.micro != other.micro: - return self.micro < other.micro - if self.prerelease != other.prerelease: - if self.prerelease != '' and other.prerelease == '': - # Consider a prerelease less than non-prerelease. - return True - # For simplicity, compare prerelease versions lexicographically. - return self.prerelease < other.prerelease - - # Versions are equal. - return False - - def __eq__(self, other): - self_tuple = self.major, self.minor, self.micro, self.prerelease - other_tuple = other.major, other.minor, other.micro, other.prerelease - return self_tuple == other_tuple - - -def parse_version(ver): - return Version(ver) - - -parser = optparse.OptionParser(description=__doc__) -parser.add_option("--debug", "-d", action="store_true", help="Enable debug output") -parser.add_option("--previous", "-p", action="store_true", help="Calculate the previous version instead of the current") -parser.add_option("--next-minor", action="store_true", help="Calculate the next minor version instead of the current") -args, pos = parser.parse_args() -assert not pos, "No positional arguments are expected" - - -_DEBUG = args.debug # type: bool - - -def debug(msg): # type: (str) -> None - if _DEBUG: - sys.stderr.write(msg) - sys.stderr.write("\n") - sys.stderr.flush() - - -debug("Debugging output enabled.") - -# This option indicates we are to determine the previous release version -PREVIOUS = args.previous # type: bool -# This options indicates to output the next minor release version -NEXT_MINOR = args.next_minor # type: bool - -# fmt: off - -PREVIOUS_TAG_RE = re.compile('(?P(?P[0-9]+)\\.(?P[0-9]+)' - '\\.(?P[0-9]+)(?:-(?P.*))?)') -RELEASE_TAG_RE = re.compile('(?P(?P[0-9]+)\\.(?P[0-9]+)' - '\\.(?P[0-9]+)(?:-(?P.*))?)') -RELEASE_BRANCH_RE = re.compile('(?:(?:refs/remotes/)?origin/)?(?Pr' - '(?P[0-9]+)\\.(?P[0-9]+))') - - -def check_output(args): # type: (list[str]) -> str - """ - Delegates to subprocess.check_output() if it is available, otherwise - provides a reasonable facsimile. - """ - debug('Run command: {0}'.format(args)) - try: - proc = subprocess.Popen(args, stdout=subprocess.PIPE) - except OSError as e: - suppl = '' - if e.errno == errno.ENOENT: - suppl = 'Does the executable “{0}” not exist?'.format(args[0]) - raise RuntimeError("Failed to execute subprocess {0}: {1} [{2}]".format(args, e, suppl)) - out = proc.communicate()[0] - ret = proc.poll() - if ret: - raise subprocess.CalledProcessError(ret, args[0]) - - # git isn't guaranteed to always return UTF-8, but for our purposes - # this should be fine as tags and hashes should be ASCII only. - out = out.decode('utf-8') - - return out - - -def check_head_tag(): # type: () -> str | None - """ - Checks the current HEAD to see if it has been tagged with a tag that matches - the pattern for a release tag. Returns release version calculated from the - tag, or None if there is no matching tag associated with HEAD. - """ - - found_tag = False - version_str = '0.0.0' - version_parsed = parse_version(version_str) - - # have git tell us if any tags that look like release tags point at HEAD; - # based on our policy, a commit should never have more than one release tag - tags = check_output(['git', 'tag', '--points-at', 'HEAD', '--list', '1.*']).split() - tag = '' - if len(tags) == 1: - tag = tags[0] - elif len(tags) > 1: - raise Exception('Expected 1 or 0 tags on HEAD, got: {}'.format(tags)) - - release_tag_match = RELEASE_TAG_RE.match(tag) - if release_tag_match: - new_version_str = release_tag_match.group('ver') - new_version_parsed = parse_version(new_version_str) - if new_version_parsed > version_parsed: # type: ignore - debug('HEAD release tag: ' + new_version_str) - version_str = new_version_str - version_parsed = new_version_parsed - found_tag = True - - if found_tag: - debug('Calculated version: ' + version_str) - return version_str - - return None - -def get_next_minor(prerelease_marker): # type: (str) -> str - """ - get_next_minor does the following: - - Inspect the branches that fit the convention for a release branch. - - Choose the latest and increment the minor version. - - Append .0 to form the new version (e.g., r1.21 becomes 1.22.0) - - Append a pre-release marker. (e.g. 1.22.0 becomes 1.22.0-20220201+gitf6e6a7025d) - """ - - version_str = '0.0.0' - version_parsed = parse_version(version_str) - - version_new = {} - # Use refs (not branches) to get local branches plus remote branches - refs = check_output(['git', 'show-ref']).splitlines() - for ref in refs: - release_branch_match = RELEASE_BRANCH_RE.match(ref.split()[1]) - if release_branch_match: - # Construct a candidate version from this branch name - version_new['major'] = int(release_branch_match.group('vermaj')) - version_new['minor'] = int(release_branch_match.group('vermin')) + 1 - version_new['patch'] = 0 - version_new['prerelease'] = prerelease_marker - new_version_str = str(version_new['major']) + '.' + \ - str(version_new['minor']) + '.' + \ - str(version_new['patch']) + '-' + \ - version_new['prerelease'] - new_version_parsed = parse_version(new_version_str) - if new_version_parsed > version_parsed: # type: ignore - version_str = new_version_str - version_parsed = new_version_parsed - debug('Found new best version "' + version_str \ - + '" based on branch "' \ - + release_branch_match.group('brname') + '"') - return version_str - -def get_branch_tags(active_branch_name): # type: (str) -> list[str] - """ - Returns a list of tags corresponding to the current branch, which must not - be master. If the specified branch is a release branch then return all tags - based on the major/minor X.Y release version. If the specified branch is - neither master nor a release branch, then walk backwards in history until - the first tag matching the glob '1.*' and return that tag. - """ - - if active_branch_name == 'master': - raise Exception('this method is not meant to be called while on "master"') - - release_branch_match = RELEASE_BRANCH_RE.match(active_branch_name) - if release_branch_match: - # This is a release branch, so look for tags only on this branch - tag_glob = release_branch_match.group('vermaj') + '.' \ - + release_branch_match.group('vermin') + '.*' - return check_output(['git', 'tag', '--list', tag_glob]).splitlines() - - # Not a release branch, so look for the most recent tag in history - commits = check_output(['git', 'log', '--pretty=format:%H', '--no-merges']) - tags_by_obj = get_object_tags() - for commit in commits.splitlines(): - got = tags_by_obj.get(commit) - if got: - return got - # No tags - return [] - - -def iter_tag_lines(): - """ - Generate a list of pairs of strings, where the first is a commit hash, and - the second is a tag that is associated with that commit. Duplicate commits - are possible. - """ - output = check_output(['git', 'tag', '--list', '1.*', '--format=%(*objectname)|%(tag)']) - lines = output.splitlines() - for l in lines: - obj, tag = l.split('|', 1) - if tag: - yield obj, tag - - -def get_object_tags(): # type: () -> dict[str, list[str]] - """ - Obtain a mapping between commit hashes and a list of tags that point to - that commit. Untagged commits will not be included in the resulting map. - """ - ret = {} # type: dict[str, list[str]] - for obj, tag in iter_tag_lines(): - ret.setdefault(obj, []).append(tag) - return ret - - -def process_and_sort_tags(tags): # type: (list[str]) -> list[str] - """ - Given a string (as returned from get_branch_tags), return a sorted list of - zero or more tags (sorted based on the Version comparison) which meet - the following criteria: - - a final release tag (i.e., 1.x.y without any pre-release suffix) - - a pre-release tag which is not superseded by a release tag (i.e., - 1.x.y-preX iff 1.x.y does not already exist) - """ - - processed_and_sorted_tags = [] # type: list[str] - if not tags or len(tags) == 0: - return processed_and_sorted_tags - - # find all the final release tags - for tag in tags: - release_tag_match = RELEASE_TAG_RE.match(tag) - if release_tag_match and not release_tag_match.group('verpre'): - processed_and_sorted_tags.append(tag) - # collect together final release tags and pre-release tags for - # versions that have not yet had a final release - for tag in tags: - tag_parts = tag.split('-') - if len(tag_parts) >= 2 and tag_parts[0] not in processed_and_sorted_tags: - processed_and_sorted_tags.append(tag) - processed_and_sorted_tags.sort(key=Version) # type: ignore - - return processed_and_sorted_tags - -def main(): - """ - The algorithm is roughly: - - - Is the --next-minor flag passed? If "yes", then return the next minor - release with a pre-release marker. - - Is the current HEAD associated with a tag that looks like a release - version? - - If "yes" then use that as the version - - If "no" then is the current branch master? - - If "yes" the current branch is master, then return the next minor - release with a pre-release marker. - - If "no" the current branch is not master, then determine the most - recent tag in history; strip any pre-release marker, increment the - patch version, and append a new pre-release marker - """ - - version_str = '0.0.0' - version_parsed = parse_version(version_str) - head_commit_short = check_output(['git', 'rev-parse', '--revs-only', - '--short=10', 'HEAD^{commit}']).strip() - prerelease_marker = datetime.date.today().strftime('%Y%m%d') \ - + '+git' + head_commit_short - - if NEXT_MINOR: - debug('Calculating next minor release') - return get_next_minor(prerelease_marker) - - head_tag_ver = check_head_tag() - if head_tag_ver: - return head_tag_ver - - active_branch_name = check_output(['git', 'rev-parse', - '--abbrev-ref', 'HEAD']).strip() - debug('Calculating release version for branch: ' + active_branch_name) - if active_branch_name == 'master': - return get_next_minor(prerelease_marker) - - branch_tags = get_branch_tags(active_branch_name) - tags = process_and_sort_tags(branch_tags) - - tag = tags[-1] if len(tags) > 0 else '' - # at this point the RE match is redundant, but convenient for accessing - # the components of the version string - release_tag_match = RELEASE_TAG_RE.match(tag) - if release_tag_match: - version_new = {} - version_new['major'] = int(release_tag_match.group('vermaj')) - version_new['minor'] = int(release_tag_match.group('vermin')) - version_new['patch'] = int(release_tag_match.group('verpatch')) + 1 - version_new['prerelease'] = prerelease_marker - new_version_str = str(version_new['major']) + '.' + \ - str(version_new['minor']) + '.' + \ - str(version_new['patch']) + '-' + \ - version_new['prerelease'] - new_version_parsed = parse_version(new_version_str) - if new_version_parsed > version_parsed: # type: ignore - version_str = new_version_str - version_parsed = new_version_parsed - debug('Found new best version "' + version_str \ - + '" from tag "' + release_tag_match.group('ver') + '"') - - return version_str - -def previous(rel_ver): # type: (str) -> str - """ - Given a release version, find the previous version based on the latest Git - tag that is strictly a lower version than the given release version. - """ - debug('Calculating previous release version (option -p was specified).') - version_str = '0.0.0' - version_parsed = parse_version(version_str) - rel_ver_str = rel_ver - rel_ver_parsed = parse_version(rel_ver_str) - tags = check_output(['git', 'tag', '--list', '1.*']).splitlines() - processed_and_sorted_tags = process_and_sort_tags(tags) - for tag in processed_and_sorted_tags: - previous_tag_match = PREVIOUS_TAG_RE.match(tag) - if previous_tag_match: - version_new = {} - version_new['major'] = int(previous_tag_match.group('vermaj')) - version_new['minor'] = int(previous_tag_match.group('vermin')) - version_new['patch'] = int(previous_tag_match.group('verpatch')) - version_new['prerelease'] = previous_tag_match.group('verpre') - new_version_str = str(version_new['major']) + '.' + \ - str(version_new['minor']) + '.' + \ - str(version_new['patch']) - if version_new['prerelease'] is not None: - new_version_str += '-' + version_new['prerelease'] - new_version_parsed = parse_version(new_version_str) - if new_version_parsed < rel_ver_parsed and new_version_parsed > version_parsed: # type: ignore - version_str = new_version_str - version_parsed = new_version_parsed - debug('Found new best version "' + version_str \ - + '" from tag "' + tag + '"') - - return version_str - -if __name__ == "__main__": - RELEASE_VER = previous(main()) if PREVIOUS else main() - - debug('Final calculated release version:') - print(RELEASE_VER) diff -pruN 1.30.4-1/build/cmake/.gitignore 2.0.2-1/build/cmake/.gitignore --- 1.30.4-1/build/cmake/.gitignore 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -libmongoc-1.0-config.cmake -libmongoc-1.0-config-version.cmake -libmongoc-static-1.0-config.cmake -libmongoc-static-1.0-config-version.cmake diff -pruN 1.30.4-1/build/cmake/FindLibreSSL.cmake 2.0.2-1/build/cmake/FindLibreSSL.cmake --- 1.30.4-1/build/cmake/FindLibreSSL.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/FindLibreSSL.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -#[=======================================================================[ - -Copyright (c) 2019 John Norrbin - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -FindLibreSSL ------------- - -Find the LibreSSL encryption library. - -Optional Components -^^^^^^^^^^^^^^^^^^^ - -This module supports two optional components: SSL and TLS. Both -components have associated imported targets, as described below. - -Imported Targets -^^^^^^^^^^^^^^^^ - -This module defines the following imported targets: - -LibreSSL::Crypto - The LibreSSL crypto library, if found. - -LibreSSL::SSL - The LibreSSL ssl library, if found. Requires and includes LibreSSL::Crypto automatically. - -LibreSSL::TLS - The LibreSSL tls library, if found. Requires and includes LibreSSL::SSL and LibreSSL::Crypto automatically. - -Result Variables -^^^^^^^^^^^^^^^^ - -This module will set the following variables in your project: - -LIBRESSL_FOUND - System has the LibreSSL library. If no components are requested it only requires the crypto library. -LIBRESSL_INCLUDE_DIR - The LibreSSL include directory. -LIBRESSL_CRYPTO_LIBRARY - The LibreSSL crypto library. -LIBRESSL_SSL_LIBRARY - The LibreSSL SSL library. -LIBRESSL_TLS_LIBRARY - The LibreSSL TLS library. -LIBRESSL_LIBRARIES - All LibreSSL libraries. -LIBRESSL_VERSION - This is set to $major.$minor.$revision (e.g. 2.6.8). - -Hints -^^^^^ - -Set LIBRESSL_ROOT_DIR to the root directory of an LibreSSL installation. - -XXX: Note! This file differs somewhat from the upstream FindLibreSSL and has -been modified with fixes used by mongo-c-driver. Such differences are noted -where they appear. - -]=======================================================================] - -INCLUDE(FindPackageHandleStandardArgs) - -# Set Hints -set(_LIBRESSL_ROOT_HINTS - ${LIBRESSL_ROOT_DIR} - ENV LIBRESSL_ROOT_DIR -) - -# Set Paths -if (WIN32) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _programfiles) - set(_LIBRESSL_ROOT_PATHS - "${_programfiles}/LibreSSL" - ) - unset(_programfiles) -else() - set(_LIBRESSL_ROOT_PATHS - "/usr/local/" - ) -endif() - -# Combine -set(_LIBRESSL_ROOT_HINTS_AND_PATHS - HINTS ${_LIBRESSL_ROOT_HINTS} - PATHS ${_LIBRESSL_ROOT_PATHS} - # XXX: Changed from upstream FindLibreSSL: - # Some platforms (e.g. Arch) install LibreSSL in a qualified path so as not to - # collide with OpenSSL. Add path suffixies that match such distributions - PATH_SUFFIXES - include - lib - libressl - libressl/include - libressl/lib -) - -# Find Include Path -find_path(LIBRESSL_INCLUDE_DIR - NAMES - tls.h - ${_LIBRESSL_ROOT_HINTS_AND_PATHS} -) - -# Find Crypto Library -find_library(LIBRESSL_CRYPTO_LIBRARY - NAMES - libcrypto - crypto - NAMES_PER_DIR - ${_LIBRESSL_ROOT_HINTS_AND_PATHS} -) - -# Find SSL Library -find_library(LIBRESSL_SSL_LIBRARY - NAMES - libssl - ssl - NAMES_PER_DIR - ${_LIBRESSL_ROOT_HINTS_AND_PATHS} -) - -# Find TLS Library -find_library(LIBRESSL_TLS_LIBRARY - NAMES - libtls - tls - NAMES_PER_DIR - ${_LIBRESSL_ROOT_HINTS_AND_PATHS} -) - -# Set Libraries -set(LIBRESSL_LIBRARIES ${LIBRESSL_CRYPTO_LIBRARY} ${LIBRESSL_SSL_LIBRARY} ${LIBRESSL_TLS_LIBRARY}) - -# Mark Variables As Advanced -mark_as_advanced(LIBRESSL_INCLUDE_DIR LIBRESSL_LIBRARIES LIBRESSL_CRYPTO_LIBRARY LIBRESSL_SSL_LIBRARY LIBRESSL_TLS_LIBRARY) - -# Find Version File -if(LIBRESSL_INCLUDE_DIR AND EXISTS "${LIBRESSL_INCLUDE_DIR}/openssl/opensslv.h") - - # Get Version From File - file(STRINGS "${LIBRESSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSLV.H REGEX "#define LIBRESSL_VERSION_TEXT[ \t]+\".*\"") - # XXX: The above line differs from upstream FindLibreSSL, which does not contain the "\t" regex element. - # Newer LibreSSL uses a tab character at this point in the file, which otherwise causes the above - # regex to fail. Newer LibreSSL versions ship full config-file packages, with will remove the - # need to use this file. - - # Match Version String - string(REGEX REPLACE ".*\".*([0-9]+)\\.([0-9]+)\\.([0-9]+)\"" "\\1;\\2;\\3" LIBRESSL_VERSION_LIST "${OPENSSLV.H}") - - # Split Parts - list(GET LIBRESSL_VERSION_LIST 0 LIBRESSL_VERSION_MAJOR) - list(GET LIBRESSL_VERSION_LIST 1 LIBRESSL_VERSION_MINOR) - list(GET LIBRESSL_VERSION_LIST 2 LIBRESSL_VERSION_REVISION) - - # Set Version String - set(LIBRESSL_VERSION "${LIBRESSL_VERSION_MAJOR}.${LIBRESSL_VERSION_MINOR}.${LIBRESSL_VERSION_REVISION}") - -endif() - -# Set Find Package Arguments -find_package_handle_standard_args(LibreSSL - REQUIRED_VARS - LIBRESSL_CRYPTO_LIBRARY - LIBRESSL_INCLUDE_DIR - VERSION_VAR - LIBRESSL_VERSION - HANDLE_COMPONENTS - FAIL_MESSAGE - "Could NOT find LibreSSL, try setting the path to LibreSSL using the LIBRESSL_ROOT_DIR environment variable" -) - -# LibreSSL Found -if(LIBRESSL_FOUND) - - # Set LibreSSL::Crypto - if(NOT TARGET LibreSSL::Crypto AND EXISTS "${LIBRESSL_CRYPTO_LIBRARY}") - - # Add Library - add_library(LibreSSL::Crypto UNKNOWN IMPORTED) - - # Set Properties - set_target_properties( - LibreSSL::Crypto - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${LIBRESSL_INCLUDE_DIR}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${LIBRESSL_CRYPTO_LIBRARY}" - ) - - endif() # LibreSSL::Crypto - - # Set LibreSSL::SSL - if(NOT TARGET LibreSSL::SSL AND EXISTS "${LIBRESSL_SSL_LIBRARY}") - - # Add Library - add_library(LibreSSL::SSL UNKNOWN IMPORTED) - - # Set Properties - set_target_properties( - LibreSSL::SSL - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${LIBRESSL_INCLUDE_DIR}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${LIBRESSL_SSL_LIBRARY}" - INTERFACE_LINK_LIBRARIES LibreSSL::Crypto - ) - - endif() # LibreSSL::SSL - - # Set LibreSSL::TLS - if(NOT TARGET LibreSSL::TLS AND EXISTS "${LIBRESSL_TLS_LIBRARY}") - add_library(LibreSSL::TLS UNKNOWN IMPORTED) - set_target_properties( - LibreSSL::TLS - PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${LIBRESSL_INCLUDE_DIR}" - IMPORTED_LINK_INTERFACE_LANGUAGES "C" - IMPORTED_LOCATION "${LIBRESSL_TLS_LIBRARY}" - INTERFACE_LINK_LIBRARIES LibreSSL::SSL - ) - - endif() # LibreSSL::TLS - -endif(LIBRESSL_FOUND) diff -pruN 1.30.4-1/build/cmake/GeneratePkgConfig.cmake 2.0.2-1/build/cmake/GeneratePkgConfig.cmake --- 1.30.4-1/build/cmake/GeneratePkgConfig.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/GeneratePkgConfig.cmake 2025-06-19 15:42:22.000000000 +0000 @@ -278,8 +278,11 @@ function(_generate_pkg_config_content ou set(libs) # Link options: set(gx_libs - "-L\${libdir}" - "-l$" + $,STATIC_LIBRARY>, + # If linking static, emit the full path to the static library file + \${libdir}/$, + # Otherwise, link to the dynamic library namelink + -L\${libdir} -l$> $> $> ) diff -pruN 1.30.4-1/build/cmake/LLDLinker.cmake 2.0.2-1/build/cmake/LLDLinker.cmake --- 1.30.4-1/build/cmake/LLDLinker.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/LLDLinker.cmake 2025-06-19 15:42:22.000000000 +0000 @@ -56,5 +56,7 @@ endif () if (MONGO_USE_LLD) message (STATUS "Linking using LLVM lld. Disable by setting MONGO_USE_LLD to OFF") - add_link_options (-fuse-ld=lld) + # We only tested with C, so only use LLD on C (some platforms don't support lld with g++) + # XXX: This should use $ when we can require CMake 3.18+ + add_link_options ($<$:-fuse-ld=lld>) endif () diff -pruN 1.30.4-1/build/cmake/LegacyPackage.cmake 2.0.2-1/build/cmake/LegacyPackage.cmake --- 1.30.4-1/build/cmake/LegacyPackage.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/LegacyPackage.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -include (CMakePackageConfigHelpers) - -# These aren't pkg-config files, they're CMake package configuration files. -function (install_package_config_file prefix) - foreach (suffix "config.cmake") - configure_package_config_file ( - ${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-${prefix}-${suffix}.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-${prefix}-${suffix} - INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${prefix} - ) - - install ( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-${prefix}-${suffix} - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${prefix} - ) - endforeach () - write_basic_package_version_file( - ${PROJECT_NAME}-${prefix}-config-version.cmake - VERSION "${PROJECT_VERSION}" - COMPATIBILITY SameMajorVersion - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-${prefix}-config-version.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${prefix}) -endfunction () - -install_package_config_file ("1.0") - -if (ENABLE_STATIC) - install_package_config_file ("static-1.0") -endif () diff -pruN 1.30.4-1/build/cmake/MongoPlatform.cmake 2.0.2-1/build/cmake/MongoPlatform.cmake --- 1.30.4-1/build/cmake/MongoPlatform.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/MongoPlatform.cmake 2025-06-19 15:42:22.000000000 +0000 @@ -8,9 +8,9 @@ Use mongo_platform_compile_options and m requirements to this library. The mongo::detail::c_platform library is installed and exported with the -bson-targets export set as an implementation detail. It is installed with this +mongo-platform-targets export set as an implementation detail. It is installed with this export set so that it is available to both libbson and libmongoc (attempting to -install this target in both bson-targets and mongoc-targets export sets would +install this target in both mongo-platform-targets and mongoc-targets export sets would lead to duplicate definitions of mongo::detail::c_platform for downstream users). @@ -23,9 +23,9 @@ else () # The system libbson exports the `mongo::detail::c_platform` target. # Do not define the `mongo::detail::c_platform` target, to prevent an "already defined" error. endif () -set_property(TARGET _mongo-platform PROPERTY EXPORT_NAME detail::c_platform) -install(TARGETS _mongo-platform EXPORT bson-targets) - +set_property(TARGET _mongo-platform PROPERTY EXPORT_NAME mongo::detail::c_platform) +# This export set is installed as part of libbson. Search: PLATFORM-EXPORT-TARGET-INSTALL +install(TARGETS _mongo-platform EXPORT mongo-platform-targets) #[[ Define additional platform-support compile options diff -pruN 1.30.4-1/build/cmake/TestProject.cmake 2.0.2-1/build/cmake/TestProject.cmake --- 1.30.4-1/build/cmake/TestProject.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/TestProject.cmake 2025-06-19 15:42:22.000000000 +0000 @@ -160,15 +160,20 @@ function(__do_test_project) set(tmp_install_prefix "${TEST_PROJECT_PARENT_BINARY_DIR}/TestProject-install/${test_name_hash}") file(REMOVE_RECURSE "${tmp_install_prefix}") list(APPEND TEST_PROJECT_SETTINGS/CMAKE_INSTALL_PREFIX "${tmp_install_prefix}") + list(APPEND TEST_PROJECT_SETTINGS/CMAKE_PREFIX_PATH "${tmp_install_prefix}") if(TEST_PROJECT_INSTALL_PARENT) cmake_path(ABSOLUTE_PATH tmp_install_prefix NORMALIZE) message(STATUS "Installing parent project into [${tmp_install_prefix}]") execute_process( - COMMAND ${CMAKE_COMMAND} - --install "${TEST_PROJECT_PARENT_BINARY_DIR}" - --prefix "${tmp_install_prefix}" - --config "${TEST_PROJECT_CONFIG}" + COMMAND + # Suppress DESTDIR + ${CMAKE_COMMAND} -E env --unset=DESTDIR + # Do the install: + ${CMAKE_COMMAND} + --install "${TEST_PROJECT_PARENT_BINARY_DIR}" + --prefix "${tmp_install_prefix}" + --config "${TEST_PROJECT_CONFIG}" COMMAND_ERROR_IS_FATAL LAST ) endif() diff -pruN 1.30.4-1/build/cmake/libbson-1.0-config.cmake.in 2.0.2-1/build/cmake/libbson-1.0-config.cmake.in --- 1.30.4-1/build/cmake/libbson-1.0-config.cmake.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/libbson-1.0-config.cmake.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if(NOT libbson-1.0_FIND_QUIETLY) - message(WARNING "This CMake package is deprecated. Prefer instead to use the \"bson-1.0\" package and link to mongo::bson_shared.") -endif() - -set (BSON_MAJOR_VERSION @libbson_VERSION_MAJOR@) -set (BSON_MINOR_VERSION @libbson_VERSION_MINOR@) -set (BSON_MICRO_VERSION @libbson_VERSION_PATCH@) -set (BSON_VERSION @libbson_VERSION@) -set (BSON_VERSION_FULL @libbson_VERSION_FULL@) - -include(CMakeFindDependencyMacro) -find_dependency(bson-1.0) - -set (BSON_LIBRARY mongo::bson_shared) -set (BSON_LIBRARIES mongo::bson_shared) diff -pruN 1.30.4-1/build/cmake/libbson-static-1.0-config.cmake.in 2.0.2-1/build/cmake/libbson-static-1.0-config.cmake.in --- 1.30.4-1/build/cmake/libbson-static-1.0-config.cmake.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/libbson-static-1.0-config.cmake.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if(NOT libbson-static-1.0_FIND_QUIETLY) - message(WARNING "This CMake package is deprecated. Prefer instead to use the \"bson-1.0\" package and link to mongo::bson_static.") -endif() - -set (BSON_STATIC_MAJOR_VERSION @libbson_VERSION_MAJOR@) -set (BSON_STATIC_MINOR_VERSION @libbson_VERSION_MINOR@) -set (BSON_STATIC_MICRO_VERSION @libbson_VERSION_PATCH@) -set (BSON_STATIC_VERSION @libbson_VERSION@) -set (BSON_STATIC_VERSION_FULL @libbson_VERSION_FULL@) - -include(CMakeFindDependencyMacro) -find_dependency(bson-1.0) - -set (BSON_STATIC_LIBRARY mongo::bson_static) -set (BSON_STATIC_LIBRARIES mongo::bson_static) diff -pruN 1.30.4-1/build/cmake/libmongoc-1.0-config.cmake.in 2.0.2-1/build/cmake/libmongoc-1.0-config.cmake.in --- 1.30.4-1/build/cmake/libmongoc-1.0-config.cmake.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/libmongoc-1.0-config.cmake.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if(NOT libmongoc-1.0_FIND_QUIETLY) - message(WARNING "This CMake package is deprecated. Prefer instead to use the \"mongoc-1.0\" package and link to mongo::mongoc_shared.") -endif() - -set (MONGOC_MAJOR_VERSION @libmongoc_VERSION_MAJOR@) -set (MONGOC_MINOR_VERSION @libmongoc_VERSION_MINOR@) -set (MONGOC_MICRO_VERSION @libmongoc_VERSION_PATCH@) -set (MONGOC_VERSION @libmongoc_VERSION@) -set (MONGOC_VERSION_FULL @libmongoc_VERSION_FULL@) - -include(CMakeFindDependencyMacro) -find_dependency (mongoc-1.0) - -set(MONGOC_LIBRARY mongo::mongoc_shared) -set(MONGOC_LIBRARIES mongo::mongoc_shared) diff -pruN 1.30.4-1/build/cmake/libmongoc-static-1.0-config.cmake.in 2.0.2-1/build/cmake/libmongoc-static-1.0-config.cmake.in --- 1.30.4-1/build/cmake/libmongoc-static-1.0-config.cmake.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/cmake/libmongoc-static-1.0-config.cmake.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if(NOT libmongoc-static-1.0_FIND_QUIETLY) - message(WARNING "This CMake package is deprecated. Prefer instead to use the \"mongoc-1.0\" package and link to mongo::mongoc_static.") -endif() - -set (MONGOC_STATIC_MAJOR_VERSION @libmongoc_VERSION_MAJOR@) -set (MONGOC_STATIC_MINOR_VERSION @libmongoc_VERSION_MINOR@) -set (MONGOC_STATIC_MICRO_VERSION @libmongoc_VERSION_PATCH@) -set (MONGOC_STATIC_VERSION @libmongoc_VERSION@) -set (MONGOC_STATIC_VERSION_FULL @libmongoc_VERSION_FULL@) - -include(CMakeFindDependencyMacro) -find_dependency (mongoc-1.0) - -set(MONGOC_STATIC_LIBRARY mongo::mongoc_static) -set(MONGOC_STATIC_LIBRARIES mongo::mongoc_static) diff -pruN 1.30.4-1/build/generate-future-functions.py 2.0.2-1/build/generate-future-functions.py --- 1.30.4-1/build/generate-future-functions.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/generate-future-functions.py 2025-06-19 15:42:22.000000000 +0000 @@ -87,7 +87,6 @@ typedef_list = [ typedef("mongoc_iovec_ptr", "mongoc_iovec_t *"), typedef("mongoc_server_stream_ptr", "mongoc_server_stream_t *"), typedef("mongoc_query_flags_t", None), - typedef("const_mongoc_index_opt_t", "const mongoc_index_opt_t *"), typedef("mongoc_server_description_ptr", "mongoc_server_description_t *"), typedef("mongoc_ss_optype_t", None), typedef("mongoc_topology_ptr", "mongoc_topology_t *"), @@ -104,6 +103,7 @@ typedef_list = [ "const mongoc_write_concern_t *"), typedef("const_mongoc_ss_log_context_ptr", "const mongoc_ss_log_context_t *"), + typedef("mongoc_index_model_t_ptr_const_ptr", "mongoc_index_model_t *const *") ] type_list = [T.name for T in typedef_list] @@ -201,11 +201,6 @@ future_functions = [ param("bson_ptr", "reply"), param("bson_error_ptr", "error")]), - future_function("void", - "mongoc_client_kill_cursor", - [param("mongoc_client_ptr", "client"), - param("int64_t", "cursor_id")]), - future_function("mongoc_change_stream_ptr", "mongoc_client_watch", [param("mongoc_client_ptr", "client"), @@ -220,32 +215,11 @@ future_functions = [ param("const_bson_ptr", "options"), param("const_mongoc_read_prefs_ptr", "read_prefs")]), - future_function("int64_t", - "mongoc_collection_count", - [param("mongoc_collection_ptr", "collection"), - param("mongoc_query_flags_t", "flags"), - param("const_bson_ptr", "query"), - param("int64_t", "skip"), - param("int64_t", "limit"), - param("const_mongoc_read_prefs_ptr", "read_prefs"), - param("bson_error_ptr", "error")]), - - future_function("int64_t", - "mongoc_collection_count_with_opts", - [param("mongoc_collection_ptr", "collection"), - param("mongoc_query_flags_t", "flags"), - param("const_bson_ptr", "query"), - param("int64_t", "skip"), - param("int64_t", "limit"), - param("const_bson_ptr", "opts"), - param("const_mongoc_read_prefs_ptr", "read_prefs"), - param("bson_error_ptr", "error")]), - future_function("bool", - "mongoc_collection_create_index_with_opts", + "mongoc_collection_create_indexes_with_opts", [param("mongoc_collection_ptr", "collection"), - param("const_bson_ptr", "keys"), - param("const_mongoc_index_opt_t", "opt"), + param("mongoc_index_model_t_ptr_const_ptr", "models"), + param("size_t", "num_models"), param("const_bson_ptr", "opts"), param("bson_ptr", "reply"), param("bson_error_ptr", "error")]), @@ -290,13 +264,6 @@ future_functions = [ param("const_bson_ptr", "opts")]), future_function("bool", - "mongoc_collection_stats", - [param("mongoc_collection_ptr", "collection"), - param("const_bson_ptr", "options"), - param("bson_ptr", "stats"), - param("bson_error_ptr", "error")]), - - future_function("bool", "mongoc_collection_insert_many", [param("mongoc_collection_ptr", "collection"), param("const_bson_ptr_ptr", "documents"), @@ -340,15 +307,6 @@ future_functions = [ param("bson_error_ptr", "error")]), future_function("bool", - "mongoc_collection_insert_bulk", - [param("mongoc_collection_ptr", "collection"), - param("mongoc_insert_flags_t", "flags"), - param("const_bson_ptr_ptr", "documents"), - param("uint32_t", "n_documents"), - param("const_mongoc_write_concern_ptr", "write_concern"), - param("bson_error_ptr", "error")]), - - future_function("bool", "mongoc_cluster_run_command_parts", [param("mongoc_cluster_ptr", "cluster"), param("mongoc_server_stream_ptr", "server_stream"), @@ -420,12 +378,6 @@ future_functions = [ param("size_t", "min_bytes"), param("uint32_t", "timeout_msec")]), - future_function("mongoc_gridfs_file_ptr", - "mongoc_gridfs_find_one", - [param("mongoc_gridfs_ptr", "gridfs"), - param("const_bson_ptr", "query"), - param("bson_error_ptr", "error")]), - future_function("bool", "mongoc_gridfs_file_remove", [param("mongoc_gridfs_file_ptr", "file"), @@ -573,7 +525,7 @@ def future_function_name(fn): # E.g. future_cursor_next(). return 'future' + fn.name[len('mongoc'):] else: - # E.g. future__mongoc_client_kill_cursor(). + # E.g. future_mongoc_client_command_simple(). return 'future_' + fn.name diff -pruN 1.30.4-1/build/generate-opts.py 2.0.2-1/build/generate-opts.py --- 1.30.4-1/build/generate-opts.py 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/generate-opts.py 2025-06-19 15:42:22.000000000 +0000 @@ -49,7 +49,7 @@ def flatten(items): class Struct(OrderedDict): def __init__(self, items, opts_name='opts', generate_rst=True, - generate_code=True, allow_extra=True, **defaults): + generate_code=True, allow_extra=True, rst_prelude=None, **defaults): """Define an options struct. - items: List of pairs: (optionName, info) @@ -64,6 +64,7 @@ class Struct(OrderedDict): self.generate_code = generate_code self.allow_extra = allow_extra self.defaults = defaults + self.rst_prelude = rst_prelude def default(self, item, fallback): return self.defaults.get(item, fallback) @@ -293,7 +294,7 @@ opts_structs = OrderedDict([ ], limit=0, allow_extra=False)), ('mongoc_change_stream_opts_t', Struct([ - ('batchSize', {'type': 'int32_t', 'help': 'An ``int32`` representing number of documents requested to be returned on each call to :symbol:`mongoc_change_stream_next`'}), + ('batchSize', {'type': 'int32_t', 'help': 'An ``int32`` requesting a limit of documents returned in each server reply. If positive, the ``batchSize`` is applied to both ``aggregate`` and ``getMore`` commands. If 0, the ``batchSize`` is only applied to the ``aggregate`` command (Useful to request an immediate cursor without significant server-side work. See `Aggregate Data Specifying Batch Size `_). If omitted or negative, the value is ignored and server defaults are used (See `Cursor Batches `_ for a description of server defaults).'}), ('resumeAfter', {'type': 'document', 'help': 'A ``Document`` representing the logical starting point of the change stream. The result of :symbol:`mongoc_change_stream_get_resume_token()` or the ``_id`` field of any change received from a change stream can be used here. This option is mutually exclusive with ``startAfter`` and ``startAtOperationTime``.'}), ('startAfter', {'type': 'document', 'help': 'A ``Document`` representing the logical starting point of the change stream. Unlike ``resumeAfter``, this can resume notifications after an "invalidate" event. The result of :symbol:`mongoc_change_stream_get_resume_token()` or the ``_id`` field of any change received from a change stream can be used here. This option is mutually exclusive with ``resumeAfter`` and ``startAtOperationTime``.'}), ('startAtOperationTime', {'type': 'timestamp', 'help': 'A ``Timestamp``. The change stream only provides changes that occurred at or after the specified timestamp. Any command run against the server will return an operation time that can be used here. This option is mutually exclusive with ``resumeAfter`` and ``startAfter``.'}), @@ -317,7 +318,7 @@ opts_structs = OrderedDict([ }), ('showExpandedEvents', { 'type': 'bool', 'help': 'Set to ``true`` to return an expanded list of change stream events. Available only on MongoDB versions >=6.0'}), comment_option_string_pre_4_4, - ], fullDocument=None, fullDocumentBeforeChange=None)), + ], fullDocument=None, fullDocumentBeforeChange=None, batchSize=-1, rst_prelude=".. versionchanged:: 2.0.0 ``batchSize`` of 0 is applied to the ``aggregate`` command. 0 was previously ignored.")), ('mongoc_create_index_opts_t', Struct([ write_concern_option, @@ -474,6 +475,9 @@ for struct_name, struct in opts_structs. print(file_name) f = open(joinpath(doc_includes, file_name), 'w') f.write (disclaimer) + if struct.rst_prelude is not None: + f.write(struct.rst_prelude) + f.write("\n\n") f.write( "``%s`` may be NULL or a BSON document with additional" " command options:\n\n" % struct.opts_name) diff -pruN 1.30.4-1/build/opts_templates/mongoc-opts.c.template 2.0.2-1/build/opts_templates/mongoc-opts.c.template --- 1.30.4-1/build/opts_templates/mongoc-opts.c.template 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/build/opts_templates/mongoc-opts.c.template 2025-06-19 15:42:22.000000000 +0000 @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include @@ -54,10 +54,10 @@ _{{ struct_name }}_parse ( } if (!bson_iter_init (&iter, opts)) { - bson_set_error (error, - MONGOC_ERROR_BSON, - MONGOC_ERROR_BSON_INVALID, - "Invalid 'opts' parameter."); + _mongoc_set_error (error, + MONGOC_ERROR_BSON, + MONGOC_ERROR_BSON_INVALID, + "Invalid 'opts' parameter."); return false; } @@ -100,18 +100,18 @@ _{{ struct_name }}_parse ( &{{ struct_name }}->extra, bson_iter_key (&iter), bson_iter_value (&iter))) { - bson_set_error (error, - MONGOC_ERROR_BSON, - MONGOC_ERROR_BSON_INVALID, - "Invalid 'opts' parameter."); + _mongoc_set_error (error, + MONGOC_ERROR_BSON, + MONGOC_ERROR_BSON_INVALID, + "Invalid 'opts' parameter."); return false; } {% else %} - bson_set_error (error, - MONGOC_ERROR_COMMAND, - MONGOC_ERROR_COMMAND_INVALID_ARG, - "Invalid option '%s'", - bson_iter_key (&iter)); + _mongoc_set_error (error, + MONGOC_ERROR_COMMAND, + MONGOC_ERROR_COMMAND_INVALID_ARG, + "Invalid option '%s'", + bson_iter_key (&iter)); return false; {% endif %} } diff -pruN 1.30.4-1/debian/changelog 2.0.2-1/debian/changelog --- 1.30.4-1/debian/changelog 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/changelog 2025-06-17 21:04:34.000000000 +0000 @@ -1,3 +1,9 @@ +mongo-c-driver (2.0.2-1) experimental; urgency=medium + + * New upstream release + + -- Roberto C. Sanchez Tue, 17 Jun 2025 17:04:34 -0400 + mongo-c-driver (1.30.4-1) unstable; urgency=medium * New upstream release diff -pruN 1.30.4-1/debian/control 2.0.2-1/debian/control --- 1.30.4-1/debian/control 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/control 2025-06-17 21:04:34.000000000 +0000 @@ -26,7 +26,7 @@ Package: libmongoc-dev Section: libdevel Architecture: any Build-Profiles: -Depends: libmongoc-1.0-0t64 (= ${binary:Version}), +Depends: libmongoc2-2 (= ${binary:Version}), libbson-dev (= ${binary:Version}), libmongocrypt-dev (>= 1.12.0), libssl-dev, @@ -43,10 +43,7 @@ Description: MongoDB C client library - This package contains all files necessary to develop applications which use libmongoc. -Package: libmongoc-1.0-0t64 -Provides: ${t64:Provides} -Replaces: libmongoc-1.0-0 -Breaks: libmongoc-1.0-0 (<< ${source:Version}) +Package: libmongoc2-2 Architecture: any Build-Profiles: Depends: ${misc:Depends}, @@ -73,7 +70,7 @@ Description: MongoDB C client library - Package: libbson-dev Section: libdevel Architecture: any -Depends: libbson-1.0-0t64 (= ${binary:Version}), +Depends: libbson2-2 (= ${binary:Version}), ${misc:Depends} Description: Library to parse and generate BSON documents - dev files libbson parses and generates BSON documents, the data format for @@ -84,10 +81,7 @@ Description: Library to parse and genera This package contains all files necessary to develop applications which use libbson. -Package: libbson-1.0-0t64 -Provides: ${t64:Provides} -Replaces: libbson-1.0-0 -Breaks: libbson-1.0-0 (<< ${source:Version}) +Package: libbson2-2 Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} diff -pruN 1.30.4-1/debian/copyright 2.0.2-1/debian/copyright --- 1.30.4-1/debian/copyright 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/copyright 2025-06-17 21:04:34.000000000 +0000 @@ -40,28 +40,6 @@ Files: debian/* Copyright: 2015-2018 MongoDB, Inc. License: Apache-2.0 -Files: src/libbson/src/bson/bson-md5.h -Copyright: 1999, 2002 Aladdin Enterprises. -License: ZLib - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - . - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - . - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - . - L. Peter Deutsch - ghost@aladdin.com - License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff -pruN 1.30.4-1/debian/gbp.conf 2.0.2-1/debian/gbp.conf --- 1.30.4-1/debian/gbp.conf 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/gbp.conf 2025-06-17 21:04:34.000000000 +0000 @@ -14,7 +14,7 @@ prebuild = bash -c " utf8proc_rm_files=\"$(find src/utf8proc-* -printf '%p ')\" && # Create upstream tarball from reference, exclude items that do not belong pushd $GBP_GIT_DIR/.. && - git archive --format=tar --prefix=mongo-c-driver-\${upstream_version}/ HEAD | tar -f - --delete mongo-c-driver-\${upstream_version}/debian \$zlib_filter_files \$utf8proc_filter_files | gzip > $GBP_BUILD_DIR/../mongo-c-driver_\${upstream_version}.orig.tar.gz && + ( [ -f $GBP_BUILD_DIR/../mongo-c-driver_\${upstream_version}.orig.tar.gz ] || git archive --format=tar --prefix=mongo-c-driver-\${upstream_version}/ HEAD | tar -f - --delete mongo-c-driver-\${upstream_version}/debian \$zlib_filter_files \$utf8proc_filter_files | gzip > $GBP_BUILD_DIR/../mongo-c-driver_\${upstream_version}.orig.tar.gz ) && popd && rm -rf \$zlib_rm_files \$utf8proc_rm_files" diff -pruN 1.30.4-1/debian/libbson-1.0-0t64.dirs 2.0.2-1/debian/libbson-1.0-0t64.dirs --- 1.30.4-1/debian/libbson-1.0-0t64.dirs 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libbson-1.0-0t64.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib diff -pruN 1.30.4-1/debian/libbson-1.0-0t64.install 2.0.2-1/debian/libbson-1.0-0t64.install --- 1.30.4-1/debian/libbson-1.0-0t64.install 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libbson-1.0-0t64.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libbson*.so.* diff -pruN 1.30.4-1/debian/libbson-1.0-0t64.lintian-overrides 2.0.2-1/debian/libbson-1.0-0t64.lintian-overrides --- 1.30.4-1/debian/libbson-1.0-0t64.lintian-overrides 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libbson-1.0-0t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# Chosen not to maintain a symbols file, we'll check ABI stability with other -# tools. -libbson-1.0-0t64: no-symbols-control-file -libbson-1.0-0t64: package-name-doesnt-match-sonames libbson-1.0-0 diff -pruN 1.30.4-1/debian/libbson-dev.install 2.0.2-1/debian/libbson-dev.install --- 1.30.4-1/debian/libbson-dev.install 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libbson-dev.install 2025-06-17 21:04:34.000000000 +0000 @@ -1,6 +1,5 @@ -usr/include/libbson* +usr/include/bson* usr/lib/*/libbson*.a usr/lib/*/libbson*.so -usr/lib/*/pkgconfig/libbson* -usr/lib/*/cmake/libbson* +usr/lib/*/pkgconfig/bson* usr/lib/*/cmake/bson* diff -pruN 1.30.4-1/debian/libbson2-2.dirs 2.0.2-1/debian/libbson2-2.dirs --- 1.30.4-1/debian/libbson2-2.dirs 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/debian/libbson2-2.dirs 2025-06-17 21:04:34.000000000 +0000 @@ -0,0 +1 @@ +usr/lib diff -pruN 1.30.4-1/debian/libbson2-2.install 2.0.2-1/debian/libbson2-2.install --- 1.30.4-1/debian/libbson2-2.install 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/debian/libbson2-2.install 2025-06-17 21:04:34.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libbson*.so.* diff -pruN 1.30.4-1/debian/libbson2-2.lintian-overrides 2.0.2-1/debian/libbson2-2.lintian-overrides --- 1.30.4-1/debian/libbson2-2.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/debian/libbson2-2.lintian-overrides 2025-06-17 21:04:34.000000000 +0000 @@ -0,0 +1,3 @@ +# Chosen not to maintain a symbols file, we'll check ABI stability with other +# tools. +libbson2-2: no-symbols-control-file diff -pruN 1.30.4-1/debian/libmongoc-1.0-0t64.docs 2.0.2-1/debian/libmongoc-1.0-0t64.docs --- 1.30.4-1/debian/libmongoc-1.0-0t64.docs 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libmongoc-1.0-0t64.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -debian/tmp/usr/share/mongo-c-driver/NEWS -debian/tmp/usr/share/mongo-c-driver/README.rst -debian/tmp/usr/share/mongo-c-driver/THIRD_PARTY_NOTICES diff -pruN 1.30.4-1/debian/libmongoc-1.0-0t64.install 2.0.2-1/debian/libmongoc-1.0-0t64.install --- 1.30.4-1/debian/libmongoc-1.0-0t64.install 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libmongoc-1.0-0t64.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libmongoc-[0-9]*.so.* diff -pruN 1.30.4-1/debian/libmongoc-1.0-0t64.lintian-overrides 2.0.2-1/debian/libmongoc-1.0-0t64.lintian-overrides --- 1.30.4-1/debian/libmongoc-1.0-0t64.lintian-overrides 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libmongoc-1.0-0t64.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -# Chosen not to maintain a symbols file, we'll check ABI stability with other -# tools. -libmongoc-1.0-0t64: no-symbols-control-file -libmongoc-1.0-0t64: package-name-doesnt-match-sonames libmongoc-1.0-0 diff -pruN 1.30.4-1/debian/libmongoc-dev.install 2.0.2-1/debian/libmongoc-dev.install --- 1.30.4-1/debian/libmongoc-dev.install 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/libmongoc-dev.install 2025-06-17 21:04:34.000000000 +0000 @@ -1,7 +1,4 @@ -usr/include/libmongoc* -usr/lib/*/libmongoc-static-[0-9]*.a -usr/lib/*/libmongoc-[0-9]*.so -usr/lib/*/pkgconfig/libmongoc-[0-9]* -usr/lib/*/pkgconfig/libmongoc-ssl-[0-9]* -usr/lib/*/cmake/libmongoc* +usr/include/mongoc* +usr/lib/*/libmongoc*.so +usr/lib/*/pkgconfig/mongoc* usr/lib/*/cmake/mongoc* diff -pruN 1.30.4-1/debian/libmongoc2-2.docs 2.0.2-1/debian/libmongoc2-2.docs --- 1.30.4-1/debian/libmongoc2-2.docs 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/debian/libmongoc2-2.docs 2025-06-17 21:04:34.000000000 +0000 @@ -0,0 +1,3 @@ +debian/tmp/usr/share/mongo-c-driver/*/NEWS +debian/tmp/usr/share/mongo-c-driver/*/README.rst +debian/tmp/usr/share/mongo-c-driver/*/THIRD_PARTY_NOTICES diff -pruN 1.30.4-1/debian/libmongoc2-2.install 2.0.2-1/debian/libmongoc2-2.install --- 1.30.4-1/debian/libmongoc2-2.install 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/debian/libmongoc2-2.install 2025-06-17 21:04:34.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libmongoc*.so.* diff -pruN 1.30.4-1/debian/libmongoc2-2.lintian-overrides 2.0.2-1/debian/libmongoc2-2.lintian-overrides --- 1.30.4-1/debian/libmongoc2-2.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/debian/libmongoc2-2.lintian-overrides 2025-06-17 21:04:34.000000000 +0000 @@ -0,0 +1,3 @@ +# Chosen not to maintain a symbols file, we'll check ABI stability with other +# tools. +libmongoc2-2: no-symbols-control-file diff -pruN 1.30.4-1/debian/rules 2.0.2-1/debian/rules --- 1.30.4-1/debian/rules 2025-05-07 19:11:43.000000000 +0000 +++ 2.0.2-1/debian/rules 2025-06-17 21:04:34.000000000 +0000 @@ -35,11 +35,11 @@ override_dh_auto_configure: [ "$(DOCS)" = "ON" ] || echo "Found 'nodoc' in 'DEB_BUILD_OPTIONS'; not building documentation" echo $(DEB_VERSION_UPSTREAM) > VERSION_CURRENT dh_auto_configure -- \ - -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \ -DENABLE_MONGOC=ON \ -DENABLE_MAN_PAGES=$(DOCS) \ -DENABLE_HTML_DOCS=$(DOCS) \ -DENABLE_MAINTAINER_FLAGS=ON \ + -DENABLE_PIC=OFF \ -DENABLE_TESTS=OFF \ -DENABLE_ZLIB=SYSTEM \ -DUSE_BUNDLED_UTF8PROC=OFF diff -pruN 1.30.4-1/docs/dev/deps.rst 2.0.2-1/docs/dev/deps.rst --- 1.30.4-1/docs/dev/deps.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/docs/dev/deps.rst 2025-06-19 15:42:22.000000000 +0000 @@ -47,10 +47,9 @@ copyright statements, URLs, and license .. file:: etc/cyclonedx.sbom.json - The `SBOM-lite`_ for the C driver project. This is injested automatically and - asynchronously by Silk to produce the `augmented SBOM`_. This file is - generated semi-automatically from `etc/purls.txt` and the `+sbom-generate` - Earthly target. + The `SBOM-lite`_ for the C driver project. This file is generated + semi-automatically from `etc/purls.txt` and the `+sbom-generate` Earthly + target. This file is used by SilkBomb to produce an `augmented SBOM`_. .. warning:: This file is **partially generated**! Prefer to edit `etc/purls.txt`! Refer to: `sbom-lite-updating` @@ -98,38 +97,10 @@ The augmented SBOM contains extra data a `SBOM-lite `, including vulnerabilities known at the time of the augmented SBOM's generation. [#asbom-vulns]_ -The augmented SBOM is produced automatically and asynchronously as part of an -external process that is not contained within the repository itself. The -augmented SBOM is downloaded from an internal service using the `+sbom-download` -Earthly target, which is automatically included in the release archive for the -`+release-archive` target. - -.. _silk-asset-group: - -Silk Asset Groups -***************** - -.. note:: A Silk asset group will be created automatically for each branch that - is executed in CI. - -We use Silk's *asset groups* to allow tracking of multiple versions of the -SBOM-lite_ simultaneously (i.e. one for each release branch). These asset groups -correspond to branches within the repository, and are created automatically when -CI executes for the first time on a particular branch. If you need an asset -group for a branch that has not run in CI, use the `+create-silk-asset-group` -Earthly target to create the asset group on-demand. - -Note that Silk pulls from the upstream Git repository for an asset group, so -creating an asset group for a branch that does not exist in the main upstream -repository will not work. - -.. file:: tools/create-silk-asset-group.py - - A Python script that will create an `asset group ` in Silk - based on a set of parameters. Execute with ``--help`` for more information. - For the C driver, it is easier to use the `+create-silk-asset-group` Earthly - target. - +The augmented SBOM is produced by an external process that is not contained +within the repository itself. The augmented SBOM must be downloaded from a +recent execution of the ``sbom`` task in an Evergreen patch or commit build. +This file is included in the release archive for the `+release-archive` target. .. _snyk scanning: @@ -152,8 +123,7 @@ detect the other dependencies within the target is written to avoid this issue and allow Snyk to accurately detect other dependencies within the project. -Due to difficulty coordinating the behavior of Snyk and Silk at time of -writing, vulnerability collection is partially a manual process. This is +For now, vulnerability collection is partially a manual process. This is especially viable as the native code contains a very small number of dependencies and it is trivial to validate the output of Snyk by hand. diff -pruN 1.30.4-1/docs/dev/earthly.rst 2.0.2-1/docs/dev/earthly.rst --- 1.30.4-1/docs/dev/earthly.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/docs/dev/earthly.rst 2025-06-19 15:42:22.000000000 +0000 @@ -90,11 +90,6 @@ enumerated using ``earthly ls`` or ``ear `+sign-file/signature.asc` for the release. The exported filenames are based on the `--version` argument. - .. rubric:: Parameters - .. option:: --sbom_branch - - Forwarded to `+release-archive --sbom_branch` - .. option:: --version Affects the output filename and archive prefix paths in @@ -108,22 +103,22 @@ enumerated using ``earthly ls`` or ``ear .. rubric:: Secrets - Secrets for the `+sbom-download`, `+snyk-test`, and `+sign-file` targets are - required for this target. + Secrets for the `+snyk-test` and `+sign-file` targets are required for this + target. .. program:: +release-archive .. earthly-target:: +release-archive - Generate a source release archive of the repository at a specifiy branch. - Requires the secrets for `+sbom-download` and `+snyk-test`. + Generate a source release archive of the repository for the specified branch. + Requires the secrets for `+snyk-test`. + Requires ``etc/augmented-sbom.json`` is present (obtained from Evergreen). .. earthly-artifact:: +release-archive/release.tar.gz The resulting source distribution archive for the specified branch. The generated archive includes the source tree, but also includes other - release artifacts that are generated on-the-fly when invoked e.g. the - `+sbom-download/augmented-sbom.json` artifact. + release artifacts that are generated on-the-fly when invoked. .. earthly-artifact:: +release-archive/ssdlc_compliance_report.md @@ -131,11 +126,6 @@ enumerated using ``earthly ls`` or ``ear content of ``etc/ssdlc.md``, which has certain substrings replaced based on attributes of the release. - .. rubric:: Parameters - .. option:: --sbom_branch - - Forwarded as `+sbom-download --branch` to download the augmented SBOM. - .. option:: --ref Specifies the Git revision that is used when we use ``git archive`` to @@ -150,38 +140,10 @@ enumerated using ``earthly ls`` or ``ear no effect on the files archived, which is selected by `+release-archive --ref`. +.. program:: +sbom-validate +.. earthly-target:: +sbom-validate -.. program:: +sbom-download -.. earthly-target:: +sbom-download - - Download an `augmented SBOM ` from Silk for a given project - branch. This target explicitly disables caching, because the upstream SBOM - file can change arbitrarily. - - .. earthly-artifact:: +sbom-download/augmented-sbom.json - - The `augmented SBOM ` downloaded from Silk for the requested branch. - - .. rubric:: Parameters - .. option:: --branch - - **Required**. Specifies the branch of the repository from which we are - requesting an SBOM. - - .. note:: - - It is *required* that the `Silk asset group ` has - been created for the given branch before the `+sbom-download` target - can succeed. See: `+create-silk-asset-group` - - .. rubric:: Secrets - .. envvar:: - SILK_CLIENT_ID - SILK_CLIENT_SECRET - - **Required**. [#creds]_ - - .. seealso:: `earthly.secrets` + Validate the `etc/cyclonedx.sbom.json`. .. program:: +sign-file .. earthly-target:: +sign-file @@ -241,32 +203,15 @@ enumerated using ``earthly ls`` or ``ear .. seealso:: `sbom-lite` and `sbom-lite-updating` +.. earthly-target:: +sbom-generate-new-serial-number -.. program:: +create-silk-asset-group -.. earthly-target:: +create-silk-asset-group - - Creates a new `Silk asset group ` for a branch in the - repository. This target executes the `tools/create-silk-asset-group.py` - script with the appropriate arguments. - - .. note:: For branches that execute in CI, running this target manually is - not necessary, as it is run automatically for every build. - - .. rubric:: Parameters - .. option:: --branch - - The repository branch for which to create the new asset group. If not - specified, the branch name will be inferred by asking Git. + Equivalent to `+sbom-generate` but uses the ``--generate-new-serial-number`` + flag to generate a new unique serial number and reset the SBOM version to 1. - .. rubric:: Secrets - .. envvar:: - SILK_CLIENT_ID - SILK_CLIENT_SECRET - :noindex: - - **Required**. [#creds]_ + After running this target, the contents of the `etc/cyclonedx.sbom.json` file + may change. - .. seealso:: `earthly.secrets` + .. seealso:: `sbom-lite` and `sbom-lite-updating` .. program:: +snyk-monitor-snapshot .. earthly-target:: +snyk-monitor-snapshot diff -pruN 1.30.4-1/docs/dev/releasing.rst 2.0.2-1/docs/dev/releasing.rst --- 1.30.4-1/docs/dev/releasing.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/docs/dev/releasing.rst 2025-06-19 15:42:22.000000000 +0000 @@ -381,15 +381,15 @@ running :any:`+signed-release`, one will required for it to succeed: 1. :ref:`Authenticate with Artifactory ` -2. Set the Earthly secrets required for the :any:`+sign-file` and - :any:`+sbom-download` targets. +2. Set the Earthly secrets required for the :any:`+sign-file` target. +3. Download an augmented SBOM from a recent execution of the ``sbom`` task in + an Evergreen patch or commit build and save it to ``etc/augmented-sbom.json``. Once these prerequesites are met, creating the release archive can be done using the :any:`+signed-release` target.:: - $ ./tools/earthly.sh --artifact +signed-release/dist dist --sbom_branch=$SBOM_BRANCH --version=$NEW_VERSION + $ ./tools/earthly.sh --artifact +signed-release/dist dist --version=$NEW_VERSION -.. note:: `$SBOM_BRANCH` must be ``master`` for a minor release, or ``$RELEASE_BRANCH`` for a patch release. .. note:: `$NEW_VERSION` must correspond to the Git tag created by the release. The above command will create a `dist/` directory in the working directory that @@ -638,4 +638,3 @@ updating the mongo-cxx-driver container version. `Details for this process are documented here`__ __ https://github.com/mongodb/mongo-cxx-driver/blob/5f2077f98140ea656983ea5881de31d73bb3f735/etc/releasing.md#docker-image-build-and-publish - diff -pruN 1.30.4-1/etc/cyclonedx.sbom.json 2.0.2-1/etc/cyclonedx.sbom.json --- 1.30.4-1/etc/cyclonedx.sbom.json 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/etc/cyclonedx.sbom.json 2025-06-19 15:42:22.000000000 +0000 @@ -121,7 +121,7 @@ } ], "metadata": { - "timestamp": "2025-02-24T17:36:21.321776+00:00", + "timestamp": "2025-02-19T20:15:38.178269+00:00", "tools": [ { "externalReferences": [ @@ -164,7 +164,7 @@ } ] }, - "serialNumber": "urn:uuid:1005307f-2f33-45f2-a5fb-bfa9f2bf2fc1", + "serialNumber": "urn:uuid:298714b7-1628-44c5-90a2-3c351f3626c5", "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", diff -pruN 1.30.4-1/etc/prior_version.txt 2.0.2-1/etc/prior_version.txt --- 1.30.4-1/etc/prior_version.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/etc/prior_version.txt 2025-06-19 15:42:22.000000000 +0000 @@ -1 +1 @@ -1.30.3 \ No newline at end of file +2.0.1 \ No newline at end of file diff -pruN 1.30.4-1/src/CMakeLists.txt 2.0.2-1/src/CMakeLists.txt --- 1.30.4-1/src/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -13,20 +13,20 @@ if (CMAKE_CXX_COMPILER) # Add a C++ source file that will #include the main C headers. This "library" # does nothing other than validate that the C headers are valid C++ headers. add_library (mongoc-cxx-check OBJECT cpp-check.cpp) - if (TARGET mongoc_static) - target_link_libraries (mongoc-cxx-check PRIVATE mongoc_static) + if (TARGET mongoc::static) + target_link_libraries (mongoc-cxx-check PRIVATE mongoc::static) else () - target_link_libraries (mongoc-cxx-check PRIVATE mongoc_shared) + target_link_libraries (mongoc-cxx-check PRIVATE mongoc::shared) endif () endif () # public-header-warnings add_executable(public-header-warnings EXCLUDE_FROM_ALL ${CMAKE_CURRENT_SOURCE_DIR}/c-check.c) -if (TARGET mongoc_static) - target_link_libraries(public-header-warnings PRIVATE mongoc_static) +if (TARGET mongoc::static) + target_link_libraries(public-header-warnings PRIVATE mongoc::static) else () - target_link_libraries(public-header-warnings PRIVATE mongoc_shared) + target_link_libraries(public-header-warnings PRIVATE mongoc::shared) endif () target_compile_options(public-header-warnings PRIVATE @@ -35,6 +35,9 @@ target_compile_options(public-header-war $<$:-Werror> $<$:-Wno-declaration-after-statement> $<$:-Wno-disabled-macro-expansion> + $<$:-Wno-c++98-compat-pedantic> + $<$:-Wno-pre-c2x-compat> + $<$:-Wno-unsafe-buffer-usage> $<$:-Wno-padded> $<$:-Wno-reserved-identifier> $<$:-Wno-documentation-unknown-command> diff -pruN 1.30.4-1/src/common/CMakeLists.txt 2.0.2-1/src/common/CMakeLists.txt --- 1.30.4-1/src/common/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -9,3 +9,20 @@ configure_file ( "${CMAKE_CURRENT_SOURCE_DIR}/src/common-config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/common-config.h" ) + +add_library(mongo-mlib INTERFACE) +add_library(mongo::mlib ALIAS mongo-mlib) +target_include_directories(mongo-mlib INTERFACE $) +set_property(TARGET mongo-mlib PROPERTY EXPORT_NAME mongo::mlib) + +if(CMAKE_CXX_COMPILER) + add_executable(mlib-ckdint-test src/mlib/ckdint.test.cpp) + set_target_properties(mlib-ckdint-test PROPERTIES + COMPILE_FEATURES cxx_std_11 + LINK_LIBRARIES mongo::mlib + # Enable -fPIC, required for some build configurations + POSITION_INDEPENDENT_CODE TRUE + ) + add_test(NAME mongoc/mlib/ckdint COMMAND mlib-ckdint-test) + set_property(TEST mongoc/mlib/ckdint PROPERTY SKIP_REGULAR_EXPRESSION "@@ctest-skipped@@") +endif() diff -pruN 1.30.4-1/src/common/src/bson-dsl.md 2.0.2-1/src/common/src/bson-dsl.md --- 1.30.4-1/src/common/src/bson-dsl.md 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/bson-dsl.md 2025-06-19 15:42:22.000000000 +0000 @@ -203,7 +203,7 @@ satisfies `cond` into the parent documen The *Predicate* `cond` will be evaluated for every element in `b`. Refer: [*Predicate*](#Predicate). -To copy *all* elements from `b`, simply use the bare `true` predicate. +To copy *all* elements from `b`, simply use the bare `always` predicate. #### `insertFromIter()` @@ -618,7 +618,7 @@ Each `when` is considered in the listed After any `when` clause matches an element, no subsequent `when` clauses are considered. -An `else(ops...)` clause is equivalent to `when(true, ops...)`. +An `else(ops...)` clause is equivalent to `when(always, ops...)`. If no clause matches the element, nothing happens. @@ -670,12 +670,12 @@ The `isNumeric` predicate matches if the Matches only the final element in a document. -#### `true` +#### `always` Always matches. -#### `false` +#### `never` Never matches. @@ -1032,4 +1032,3 @@ by a single `AGAIN(f)`. There are additional tricks required to make `EVAL`, `MAP`, and token pasting play nice, but those details are not necessary here. - diff -pruN 1.30.4-1/src/common/src/common-b64.c 2.0.2-1/src/common/src/common-b64.c --- 1.30.4-1/src/common/src/common-b64.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-b64.c 2025-06-19 15:42:22.000000000 +0000 @@ -42,6 +42,7 @@ #include #include +#include #define Assert(Cond) \ if (!(Cond)) \ @@ -118,21 +119,21 @@ mcommon_b64_ntop (uint8_t const *src, si size_t datalength = 0; uint8_t input[3]; uint8_t output[4]; - size_t i; if (!target) { return -1; } - while (2 < srclength) { + // While we have at least three chars to read: + while (srclength > 2) { input[0] = *src++; input[1] = *src++; input[2] = *src++; srclength -= 3; output[0] = input[0] >> 2; - output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); - output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); + output[1] = (uint8_t) (((input[0] & 0x03) << 4) + (input[1] >> 4)); + output[2] = (uint8_t) (((input[1] & 0x0f) << 2) + (input[2] >> 6)); output[3] = input[2] & 0x3f; Assert (output[0] < 64); Assert (output[1] < 64); @@ -153,12 +154,10 @@ mcommon_b64_ntop (uint8_t const *src, si /* Get what's left. */ input[0] = input[1] = input[2] = '\0'; - for (i = 0; i < srclength; i++) { - input[i] = *src++; - } + memcpy (input, src, srclength); output[0] = input[0] >> 2; - output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); - output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); + output[1] = (uint8_t) (((input[0] & 0x03) << 4) + (input[1] >> 4)); + output[2] = (uint8_t) (((input[1] & 0x0f) << 2) + (input[2] >> 6)); Assert (output[0] < 64); Assert (output[1] < 64); Assert (output[2] < 64); @@ -277,27 +276,24 @@ static const uint8_t mongoc_b64rmap_inva static MONGOC_COMMON_ONCE_FUN (bson_b64_initialize_rmap) { - int i; - unsigned char ch; - /* Null: end of string, stop parsing */ mongoc_b64rmap[0] = mongoc_b64rmap_end; - for (i = 1; i < 256; ++i) { - ch = (unsigned char) i; + mlib_foreach_urange (i, 1, 256) { + const uint8_t ch = (uint8_t) i; /* Whitespaces */ if (bson_isspace (ch)) - mongoc_b64rmap[i] = mongoc_b64rmap_space; + mongoc_b64rmap[ch] = mongoc_b64rmap_space; /* Padding: stop parsing */ else if (ch == Pad64) - mongoc_b64rmap[i] = mongoc_b64rmap_end; + mongoc_b64rmap[ch] = mongoc_b64rmap_end; /* Non-base64 char */ else - mongoc_b64rmap[i] = mongoc_b64rmap_invalid; + mongoc_b64rmap[ch] = mongoc_b64rmap_invalid; } /* Fill reverse mapping for base64 chars */ - for (i = 0; Base64[i] != '\0'; ++i) + for (uint8_t i = 0; Base64[i] != '\0'; ++i) mongoc_b64rmap[(uint8_t) Base64[i]] = i; MONGOC_COMMON_ONCE_RETURN; @@ -313,7 +309,7 @@ mongoc_b64_pton_do (char const *src, uin tarindex = 0; while (1) { - ch = *src++; + ch = (uint8_t) *src++; ofs = mongoc_b64rmap[ch]; if (ofs >= mongoc_b64rmap_special) { @@ -367,8 +363,8 @@ mongoc_b64_pton_do (char const *src, uin * on a byte boundary, and/or with erroneous trailing characters. */ - if (ch == Pad64) { /* We got a pad char. */ - ch = *src++; /* Skip it, get next. */ + if (ch == Pad64) { /* We got a pad char. */ + ch = (uint8_t) *src++; /* Skip it, get next. */ switch (state) { case 0: /* Invalid = in first position */ case 1: /* Invalid = in second position */ @@ -376,13 +372,13 @@ mongoc_b64_pton_do (char const *src, uin case 2: /* Valid, means one byte of info */ /* Skip any number of spaces. */ - for ((void) NULL; ch != '\0'; ch = *src++) + for ((void) NULL; ch != '\0'; ch = (uint8_t) *src++) if (mongoc_b64rmap[ch] != mongoc_b64rmap_space) break; /* Make sure there is another trailing = sign. */ if (ch != Pad64) return (-1); - ch = *src++; /* Skip the = */ + ch = (uint8_t) *src++; /* Skip the = */ /* Fall through to "single trailing =" case. */ /* FALLTHROUGH */ @@ -391,7 +387,7 @@ mongoc_b64_pton_do (char const *src, uin * We know this char is an =. Is there anything but * whitespace after it? */ - for ((void) NULL; ch != '\0'; ch = *src++) + for ((void) NULL; ch != '\0'; ch = (uint8_t) *src++) if (mongoc_b64rmap[ch] != mongoc_b64rmap_space) return (-1); @@ -422,14 +418,13 @@ mongoc_b64_pton_do (char const *src, uin static int mongoc_b64_pton_len (char const *src) { - int tarindex, state; - uint8_t ch, ofs; - - state = 0; - tarindex = 0; + uint8_t ch = 0; + uint8_t ofs = 0; + int state = 0; + int tarindex = 0; while (1) { - ch = *src++; + ch = (uint8_t) *src++; ofs = mongoc_b64rmap[ch]; if (ofs >= mongoc_b64rmap_special) { @@ -469,8 +464,8 @@ mongoc_b64_pton_len (char const *src) * on a byte boundary, and/or with erroneous trailing characters. */ - if (ch == Pad64) { /* We got a pad char. */ - ch = *src++; /* Skip it, get next. */ + if (ch == Pad64) { /* We got a pad char. */ + ch = (uint8_t) *src++; /* Skip it, get next. */ switch (state) { case 0: /* Invalid = in first position */ case 1: /* Invalid = in second position */ @@ -478,13 +473,13 @@ mongoc_b64_pton_len (char const *src) case 2: /* Valid, means one byte of info */ /* Skip any number of spaces. */ - for ((void) NULL; ch != '\0'; ch = *src++) + for ((void) NULL; ch != '\0'; ch = (uint8_t) *src++) if (mongoc_b64rmap[ch] != mongoc_b64rmap_space) break; /* Make sure there is another trailing = sign. */ if (ch != Pad64) return (-1); - ch = *src++; /* Skip the = */ + ch = (uint8_t) *src++; /* Skip the = */ /* Fall through to "single trailing =" case. */ /* FALLTHROUGH */ @@ -493,7 +488,7 @@ mongoc_b64_pton_len (char const *src) * We know this char is an =. Is there anything but * whitespace after it? */ - for ((void) NULL; ch != '\0'; ch = *src++) + for (; ch != '\0'; ch = (uint8_t) *src++) if (mongoc_b64rmap[ch] != mongoc_b64rmap_space) return (-1); diff -pruN 1.30.4-1/src/common/src/common-bson-dsl-private.h 2.0.2-1/src/common/src/common-bson-dsl-private.h --- 1.30.4-1/src/common/src/common-bson-dsl-private.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-bson-dsl-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -14,7 +14,7 @@ */ #include -#include +#include enum { /// Toggle this value to enable/disable debug output for all bsonDSL @@ -119,7 +119,7 @@ BSON_IF_GNU_LIKE (_Pragma ("GCC diagnost _bsonDSL_begin ("\"%s\" => [%s]", String, _bsonDSL_strElide (30, Element)); \ const char *_bbString = (String); \ const uint64_t length = (Len); \ - if (mcommon_in_range_unsigned (int, length)) { \ + if (mlib_in_range (int, length)) { \ _bbCtx.key = _bbString; \ _bbCtx.key_len = (int) length; \ _bsonValueOperation (Element); \ @@ -741,8 +741,8 @@ BSON_IF_GNU_LIKE (_Pragma ("GCC diagnost #define _bsonPredicate_Condition_1 1 #define _bsonPredicate_Condition_0 0 -#define _bsonPredicate_Condition_true true -#define _bsonPredicate_Condition_false false +#define _bsonPredicate_Condition_always true +#define _bsonPredicate_Condition_never false #define _bsonPredicate_Condition_isTrue (bson_iter_as_bool (&bsonVisitIter)) #define _bsonPredicate_Condition_isFalse (!bson_iter_as_bool (&bsonVisitIter)) diff -pruN 1.30.4-1/src/common/src/common-cmp-private.h 2.0.2-1/src/common/src/common-cmp-private.h --- 1.30.4-1/src/common/src/common-cmp-private.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-cmp-private.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,174 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#ifndef MONGO_C_DRIVER_COMMON_CMP_PRIVATE_H -#define MONGO_C_DRIVER_COMMON_CMP_PRIVATE_H - - -#include /* ssize_t, BSON_CONCAT */ - -#include -#include -#include - - -BSON_BEGIN_DECLS - - -/* Based on the "Safe Integral Comparisons" proposal merged in C++20: - * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p0586r2.html - * - * Due to lack of type deduction in C, relational comparison functions (e.g. - * `cmp_less`) are defined in sets of four "functions" according to the - * signedness of each value argument, e.g.: - * - mcommon_cmp_less_ss (signed-value, signed-value) - * - mcommon_cmp_less_uu (unsigned-value, unsigned-value) - * - mcommon_cmp_less_su (signed-value, unsigned-value) - * - mcommon_cmp_less_us (unsigned-value, signed-value) - * - * Similarly, the `in_range` function is defined as a set of two "functions" - * according to the signedness of the value argument: - * - mcommon_in_range_signed (Type, signed-value) - * - mcommon_in_range_unsigned (Type, unsigned-value) - * - * The user must take care to use the correct signedness for the provided - * argument(s). Enabling compiler warnings for implicit sign conversions is - * recommended. - */ - - -#define MCOMMON_CMP_SET(op, ss, uu, su, us) \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_cmp_, op, _ss) (int64_t t, int64_t u) \ - { \ - return (ss); \ - } \ - \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_cmp_, op, _uu) (uint64_t t, uint64_t u) \ - { \ - return (uu); \ - } \ - \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_cmp_, op, _su) (int64_t t, uint64_t u) \ - { \ - return (su); \ - } \ - \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_cmp_, op, _us) (uint64_t t, int64_t u) \ - { \ - return (us); \ - } - -MCOMMON_CMP_SET (equal, t == u, t == u, t < 0 ? false : (uint64_t) (t) == u, u < 0 ? false : t == (uint64_t) (u)) - -MCOMMON_CMP_SET (not_equal, - !mcommon_cmp_equal_ss (t, u), - !mcommon_cmp_equal_uu (t, u), - !mcommon_cmp_equal_su (t, u), - !mcommon_cmp_equal_us (t, u)) - -MCOMMON_CMP_SET (less, t < u, t < u, t < 0 ? true : (uint64_t) (t) < u, u < 0 ? false : t < (uint64_t) (u)) - -MCOMMON_CMP_SET (greater, - mcommon_cmp_less_ss (u, t), - mcommon_cmp_less_uu (u, t), - mcommon_cmp_less_us (u, t), - mcommon_cmp_less_su (u, t)) - -MCOMMON_CMP_SET (less_equal, - !mcommon_cmp_greater_ss (t, u), - !mcommon_cmp_greater_uu (t, u), - !mcommon_cmp_greater_su (t, u), - !mcommon_cmp_greater_us (t, u)) - -MCOMMON_CMP_SET (greater_equal, - !mcommon_cmp_less_ss (t, u), - !mcommon_cmp_less_uu (t, u), - !mcommon_cmp_less_su (t, u), - !mcommon_cmp_less_us (t, u)) - -#undef MCOMMON_CMP_SET - - -/* Return true if the given value is within the range of the corresponding - * signed type. The suffix must match the signedness of the given value. */ -#define MCOMMON_IN_RANGE_SET_SIGNED(Type, min, max) \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_in_range, _##Type, _signed) (int64_t value) \ - { \ - return mcommon_cmp_greater_equal_ss (value, min) && mcommon_cmp_less_equal_ss (value, max); \ - } \ - \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_in_range, _##Type, _unsigned) (uint64_t value) \ - { \ - return mcommon_cmp_greater_equal_us (value, min) && mcommon_cmp_less_equal_us (value, max); \ - } - -/* Return true if the given value is within the range of the corresponding - * unsigned type. The suffix must match the signedness of the given value. */ -#define MCOMMON_IN_RANGE_SET_UNSIGNED(Type, max) \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_in_range, _##Type, _signed) (int64_t value) \ - { \ - return mcommon_cmp_greater_equal_su (value, 0u) && mcommon_cmp_less_equal_su (value, max); \ - } \ - \ - static BSON_INLINE bool BSON_CONCAT3 (mcommon_in_range, _##Type, _unsigned) (uint64_t value) \ - { \ - return mcommon_cmp_less_equal_uu (value, max); \ - } - -MCOMMON_IN_RANGE_SET_SIGNED (signed_char, SCHAR_MIN, SCHAR_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (short, SHRT_MIN, SHRT_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (int, INT_MIN, INT_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (long, LONG_MIN, LONG_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (long_long, LLONG_MIN, LLONG_MAX) - -MCOMMON_IN_RANGE_SET_UNSIGNED (unsigned_char, UCHAR_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (unsigned_short, USHRT_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (unsigned_int, UINT_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (unsigned_long, ULONG_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (unsigned_long_long, ULLONG_MAX) - -MCOMMON_IN_RANGE_SET_SIGNED (int8_t, INT8_MIN, INT8_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (int16_t, INT16_MIN, INT16_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (int32_t, INT32_MIN, INT32_MAX) -MCOMMON_IN_RANGE_SET_SIGNED (int64_t, INT64_MIN, INT64_MAX) - -MCOMMON_IN_RANGE_SET_UNSIGNED (uint8_t, UINT8_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (uint16_t, UINT16_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (uint32_t, UINT32_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (uint64_t, UINT64_MAX) - -MCOMMON_IN_RANGE_SET_SIGNED (ssize_t, SSIZE_MIN, SSIZE_MAX) -MCOMMON_IN_RANGE_SET_UNSIGNED (size_t, SIZE_MAX) - -#undef MCOMMON_IN_RANGE_SET_SIGNED -#undef MCOMMON_IN_RANGE_SET_UNSIGNED - - -/* Return true if the value with *signed* type is in the representable range of - * Type and false otherwise. */ -#define mcommon_in_range_signed(Type, value) BSON_CONCAT3 (mcommon_in_range, _##Type, _signed) (value) - -/* Return true if the value with *unsigned* type is in the representable range - * of Type and false otherwise. */ -#define mcommon_in_range_unsigned(Type, value) BSON_CONCAT3 (mcommon_in_range, _##Type, _unsigned) (value) - - -BSON_END_DECLS - - -#endif /* MONGO_C_DRIVER_COMMON_CMP_PRIVATE_H */ diff -pruN 1.30.4-1/src/common/src/common-json.c 2.0.2-1/src/common/src/common-json.c --- 1.30.4-1/src/common/src/common-json.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-json.c 2025-06-19 15:42:22.000000000 +0000 @@ -20,7 +20,6 @@ #include #include #include -#include typedef struct { @@ -40,7 +39,7 @@ mcommon_json_append_visit_utf8 ( mcommon_json_append_visit_t *state = data; BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_utf8_len)) { + if (!mlib_in_range (uint32_t, v_utf8_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -124,7 +123,7 @@ mcommon_json_append_visit_binary (const mcommon_json_append_visit_t *state = data; BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_binary_len)) { + if (!mlib_in_range (uint32_t, v_binary_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -158,7 +157,7 @@ mcommon_json_append_visit_regex ( size_t v_options_len = strlen (v_options); BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_regex_len)) { + if (!mlib_in_range (uint32_t, v_regex_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -187,7 +186,7 @@ mcommon_json_append_visit_dbpointer (con mcommon_json_append_visit_t *state = data; BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_collection_len)) { + if (!mlib_in_range (uint32_t, v_collection_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -233,7 +232,7 @@ mcommon_json_append_visit_before (const if (state->has_keys) { size_t key_len = strlen (key); - if (!mcommon_in_range_unsigned (uint32_t, key_len)) { + if (!mlib_in_range (uint32_t, key_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -269,7 +268,7 @@ mcommon_json_append_visit_code ( mcommon_json_append_visit_t *state = data; BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_code_len)) { + if (!mlib_in_range (uint32_t, v_code_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -283,7 +282,7 @@ mcommon_json_append_visit_symbol ( mcommon_json_append_visit_t *state = data; BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_symbol_len)) { + if (!mlib_in_range (uint32_t, v_symbol_len)) { mcommon_string_append_overflow (state->append); return true; } @@ -297,7 +296,7 @@ mcommon_json_append_visit_codewscope ( mcommon_json_append_visit_t *state = data; BSON_UNUSED (iter); BSON_UNUSED (key); - if (!mcommon_in_range_unsigned (uint32_t, v_code_len)) { + if (!mlib_in_range (uint32_t, v_code_len)) { mcommon_string_append_overflow (state->append); return true; } diff -pruN 1.30.4-1/src/common/src/common-md5-private.h 2.0.2-1/src/common/src/common-md5-private.h --- 1.30.4-1/src/common/src/common-md5-private.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-md5-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -23,6 +23,12 @@ BSON_BEGIN_DECLS +typedef struct { + uint32_t count[2]; /* message length in bits, lsw first */ + uint32_t abcd[4]; /* digest buffer */ + uint8_t buf[64]; /* accumulate block */ +} bson_md5_t; + #define mcommon_md5_init COMMON_NAME (md5_init) #define mcommon_md5_append COMMON_NAME (md5_append) #define mcommon_md5_finish COMMON_NAME (md5_finish) diff -pruN 1.30.4-1/src/common/src/common-md5.c 2.0.2-1/src/common/src/common-md5.c --- 1.30.4-1/src/common/src/common-md5.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-md5.c 2025-06-19 15:42:22.000000000 +0000 @@ -338,8 +338,8 @@ void mcommon_md5_append (bson_md5_t *pms, const uint8_t *data, uint32_t nbytes) { const uint8_t *p = data; - int left = nbytes; - int offset = (pms->count[0] >> 3) & 63; + uint32_t left = nbytes; + uint8_t offset = (pms->count[0] >> 3) & 63; uint32_t nbits = (uint32_t) (nbytes << 3); if (nbytes <= 0) @@ -353,7 +353,7 @@ mcommon_md5_append (bson_md5_t *pms, con /* Process an initial partial block. */ if (offset) { - int copy = (offset + nbytes > 64 ? 64 - offset : nbytes); + uint32_t copy = (offset + nbytes > 64u ? 64u - offset : nbytes); memcpy (pms->buf + offset, p, copy); if (offset + copy < 64) diff -pruN 1.30.4-1/src/common/src/common-string-private.h 2.0.2-1/src/common/src/common-string-private.h --- 1.30.4-1/src/common/src/common-string-private.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-string-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -20,13 +20,11 @@ #define MONGO_C_DRIVER_COMMON_STRING_PRIVATE_H #include +#include #include -#include -/* Until the deprecated bson_string_t is removed, this must have the same members in the same order, so we can safely - * cast between the two types. Afterward, we are free to modify the memory layout as needed. - * +/* * In mcommon_string_t, 'str' is guaranteed to be NUL terminated and SHOULD be valid UTF-8. mcommon_string_t operations * MUST maintain the validity of valid UTF-8 strings. * @@ -111,7 +109,7 @@ mcommon_string_new (const char *str) { BSON_ASSERT_PARAM (str); size_t length = strlen (str); - BSON_ASSERT (mcommon_in_range_unsigned (uint32_t, length) && (uint32_t) length < UINT32_MAX); + BSON_ASSERT (mlib_in_range (uint32_t, length) && (uint32_t) length < UINT32_MAX); return mcommon_string_new_with_capacity (str, (uint32_t) length, 0); } @@ -181,7 +179,7 @@ mcommon_string_starts_with_str (const mc size_t substring_len = strlen (substring); uint32_t string_len = string->len; - if (mcommon_in_range_unsigned (uint32_t, substring_len) && (uint32_t) substring_len <= string_len) { + if (mlib_in_range (uint32_t, substring_len) && (uint32_t) substring_len <= string_len) { return 0 == memcmp (string->str, substring, substring_len); } else { return false; @@ -202,7 +200,7 @@ mcommon_string_ends_with_str (const mcom size_t substring_len = strlen (substring); uint32_t string_len = string->len; - if (mcommon_in_range_unsigned (uint32_t, substring_len) && (uint32_t) substring_len <= string_len) { + if (mlib_in_range (uint32_t, substring_len) && (uint32_t) substring_len <= string_len) { uint32_t offset = string_len - (uint32_t) substring_len; return 0 == memcmp (string->str + offset, substring, substring_len); } else { diff -pruN 1.30.4-1/src/common/src/common-string.c 2.0.2-1/src/common/src/common-string.c --- 1.30.4-1/src/common/src/common-string.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/src/common-string.c 2025-06-19 15:42:22.000000000 +0000 @@ -18,7 +18,7 @@ #include #include #include -#include +#include mcommon_string_t * @@ -200,9 +200,9 @@ mcommon_string_append_base64_encode (mco if (encoded_target_len <= (size_t) max_append_len) { // No truncation needed. Grow the buffer and encode directly. mcommon_string_grow_to_capacity (string, old_len + encoded_target_len); - BSON_ASSERT (encoded_target_len == - mcommon_b64_ntop (bytes, (size_t) len, string->str + old_len, encoded_target_len + 1)); - BSON_ASSERT (mcommon_in_range_unsigned (uint32_t, encoded_target_len)); + const int tgt = mcommon_b64_ntop (bytes, (size_t) len, string->str + old_len, encoded_target_len + 1); + BSON_ASSERT (mlib_cmp (encoded_target_len, ==, tgt)); + BSON_ASSERT (mlib_in_range (uint32_t, encoded_target_len)); string->len = old_len + (uint32_t) encoded_target_len; return true; } else if (max_append_len == 0) { @@ -227,18 +227,18 @@ mcommon_string_append_base64_encode (mco uint32_t direct_input_len = mcommon_b64_pton_calculate_target_size ((size_t) direct_encoded_len); BSON_ASSERT (direct_input_len % 3 == 0); BSON_ASSERT (direct_input_len < len); - BSON_ASSERT (direct_encoded_len == - mcommon_b64_ntop (bytes, (size_t) direct_input_len, string->str + old_len, direct_encoded_len + 1)); + const int tgt = + mcommon_b64_ntop (bytes, (size_t) direct_input_len, string->str + old_len, direct_encoded_len + 1); + BSON_ASSERT (mlib_cmp (direct_encoded_len, ==, tgt)); char remainder_buffer[5]; uint32_t remainder_input_len = BSON_MIN (3, len - direct_input_len); BSON_ASSERT (remainder_input_len > 0); uint32_t remainder_encoded_len = mcommon_b64_ntop_calculate_target_size ((size_t) remainder_input_len) - 1; BSON_ASSERT (remainder_encoded_len > remainder_truncated_len); - BSON_ASSERT (remainder_encoded_len == mcommon_b64_ntop (bytes + direct_input_len, - (size_t) remainder_input_len, - remainder_buffer, - sizeof remainder_buffer)); + const int t2 = mcommon_b64_ntop ( + bytes + direct_input_len, (size_t) remainder_input_len, remainder_buffer, sizeof remainder_buffer); + BSON_ASSERT (mlib_cmp (remainder_encoded_len, ==, t2)); memcpy (buffer + old_len + direct_encoded_len, remainder_buffer, remainder_encoded_len); BSON_ASSERT (old_len + direct_encoded_len + remainder_truncated_len == max_len); @@ -262,15 +262,15 @@ mcommon_string_append_oid_as_hex (mcommo bool mcommon_string_append_selected_chars (mcommon_string_append_t *append, - const char *template, + const char *tmplt, const char *selector, size_t selector_len) { BSON_ASSERT_PARAM (append); - BSON_ASSERT_PARAM (template); + BSON_ASSERT_PARAM (tmplt); BSON_ASSERT_PARAM (selector); - for (uint8_t template_char; (template_char = (uint8_t) * template); template ++) { + for (uint8_t template_char; (template_char = (uint8_t) *tmplt); tmplt++) { BSON_ASSERT (template_char <= 0x7f); if (memchr (selector, template_char, selector_len) && !mcommon_string_append_unichar (append, template_char)) { return false; @@ -331,7 +331,7 @@ mcommon_string_append_vprintf (mcommon_s int format_result = bson_vsnprintf (format_buffer, format_buffer_alloc, format, args_copy); va_end (args_copy); - if (format_result > -1 && mcommon_in_range_signed (uint32_t, format_result) && + if (format_result > -1 && mlib_in_range (uint32_t, format_result) && (uint32_t) format_result <= actual_format_buffer_capacity) { // Successful result, no truncation. format_buffer[format_result] = '\0'; @@ -344,8 +344,7 @@ mcommon_string_append_vprintf (mcommon_s if (actual_format_buffer_capacity == max_append_len) { // No more space to grow into, this must be the final result. - if (format_result > -1 && mcommon_in_range_signed (uint32_t, format_result) && - (uint32_t) format_result < UINT32_MAX) { + if (format_result > -1 && mlib_in_range (uint32_t, format_result) && (uint32_t) format_result < UINT32_MAX) { // We have truncated output from vsnprintf. Clean it up by removing // any partial UTF-8 sequences that might be left on the end. uint32_t truncated_append_len = mcommon_utf8_truncate_len ( @@ -362,8 +361,7 @@ mcommon_string_append_vprintf (mcommon_s } // Choose a larger format_buffer_len and try again. Length will be clamped to max_append_len above. - if (format_result > -1 && mcommon_in_range_signed (uint32_t, format_result) && - (uint32_t) format_result < UINT32_MAX) { + if (format_result > -1 && mlib_in_range (uint32_t, format_result) && (uint32_t) format_result < UINT32_MAX) { min_format_buffer_capacity = (uint32_t) format_result + 1u; } else if (min_format_buffer_capacity < UINT32_MAX / 2) { min_format_buffer_capacity *= 2; diff -pruN 1.30.4-1/src/common/src/mlib/ckdint.h 2.0.2-1/src/common/src/mlib/ckdint.h --- 1.30.4-1/src/common/src/mlib/ckdint.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/ckdint.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,679 @@ +/** + * @file mlib/ckdint.h + * @brief Checked integer arithmetic + * @date 2025-02-04 + * + * This file implements the C23 checked-integer-arithmetic functions as macros. + * + * The implementation is nearly perfect: The macros necessarily evaluate the + * operand expressions more than once, so callers should be aware of this caveat. + * + * The function-like macros are defined: + * + * - `mlib_add(Dst, L, R)` / `mlib_add(Dst, A)` + * - `mlib_sub(Dst, L, R)` / `mlib_sub(Dst, A)` + * - `mlib_mul(Dst, L, R)` / `mlib_mul(Dst, A)` + * - `mlib_narrow(Dst, V)` (not from stdckdint, but defined as `mlib_add(Dst, V, 0)`) + * + * Where `Dst` is a pointer to integral storage, and `L` and `R` are arbitrary + * integral expressions. The two-argument variants treat `Dst` as the the left-hand + * operand for in-place arithmetic. + * + * Each macro accepts arguments of arbitrary type at any position, and will "do + * the right thing", regardless of the parameter types. No funny integer promotion, + * sign extension, sign conversion, nor implicit narrowing. The macros return `false` + * if-and-only-if the result was lossless. They return `true` if-and-only-if the + * value written to `Dst` does not represent the true arithmetic result. + * + * The following additional macros are defined: + * + * - `mlib_assert_add(T, L, R)` + * - `mlib_assert_sub(T, L, R)` + * - `mlib_assert_mul(T, L, R)` + * + * Where `T` is an integer type. The macro will yield a value of that type, asserting + * that the operation on `L` and `R` does not overflow. If the operation overflows, + * the program will be terminated with a diagnostic to `stderr` pointing to the call site. + * + * For implementation details and a usage guide, see `ckdint.md` + * + * @copyright Copyright (c) 2025 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include + +mlib_extern_c_begin (); + +/** + * @brief Perform integer addition + * + * @param Out A non-null pointer to a modifiable integer. + * @param A The left-hand addend of addition + * @param B The right-hand addend of addition + * @retval `true` if the value written to `Out` does not represent the true arithmetic sum. + * @retval `false` Otherwise. + * + * The sum `A + B` is written to `Out`. The operation is commutative. + * + * If the argument `B` is omitted, computes `*Out + A` (performs in-place addition). + */ +#define mlib_add(...) MLIB_ARGC_PICK (_mlib_ckdint, mlib_add, __VA_ARGS__) +/** + * @brief Perform integer subtraction + * + * @param Out A non-null pointer to a modifiable integer. + * @param A The left-hand operand of the subtraction (minuend) + * @param B The right-hand operand of subtraction (subtrahend) + * @retval `true` if the value written to `Out` does not represent the true arithmetic difference. + * @retval `false` Otherwise. + * + * The difference `A - B` will be written to `Out`. + * + * If the argument `B` is omitted, computes `*Out - A` (performs in-place subtraction) + */ +#define mlib_sub(...) MLIB_ARGC_PICK (_mlib_ckdint, mlib_sub, __VA_ARGS__) +/** + * @brief Perform integer multiplication + * + * @param Out A non-null pointer to a modifiable integer. + * @param A The left-hand factor of multiplication + * @param B The right-hand factor of multiplication + * @retval `true` if the value written to `Out` does not represent the true arithmetic product. + * @retval `false` Otherwise. + * + * The product `A × B` will be written to `Out`. The operation is commutative. + * + * If the argument `B` is omitted, computes `Out × A` (performs in-place multiplication) + */ +#define mlib_mul(...) MLIB_ARGC_PICK (_mlib_ckdint, mlib_mul, __VA_ARGS__) +/** + * @brief Perform narrowing assignment from one integer value to another. + * + * @param Out A non-null pointer to a modifiable integer. + * @param A The integer value to be narrowed. + * @retval `true` if the value written to `Out` is not equivalent to the value of `A` + * @retval `false` otherwise + */ +#define mlib_narrow(O, A) mlib_add ((O), (A), 0) + +/** + * @brief Perform an asserting addition, yielding the result + * + * @param T The target type of the operation + * @param A The left-hand addend for the addition + * @param B The right-hand addend for the addition + * @return The sum `A + B` as type `T` + * + * If the true arithmetic sum is not representable in `T`, the program terminates. + */ +#define mlib_assert_add(T, A, B) \ + _mlib_assert_ckdint (T, A, B, &mlib_add, "mlib_assert_add", #T, #A, #B, mlib_this_source_location ()) +/** + * @brief Perform an asserting subtraction, yielding the result + * + * @param T The target type of the operation + * @param A The left-hand minuend for the subtraction + * @param B The right-hand subtrahend for the subtraction + * @return The difference `A - B` as type `T` + * + * If the true arithmetic difference is not representable in `T`, the program terminates. + */ +#define mlib_assert_sub(T, A, B) \ + _mlib_assert_ckdint (T, A, B, &mlib_sub, "mlib_assert_sub", #T, #A, #B, mlib_this_source_location ()) +/** + * @brief Perform an asserting multiplication, yielding the result + * + * @param T The target type of the operation + * @param A The left-hand factor for the multiplication + * @param B The right-hand factor for the multiplication + * @return The product `A × B` as type `T` + * + * If the true arithmetic product is not representable in `T`, the program terminates. + */ +#define mlib_assert_mul(T, A, B) \ + _mlib_assert_ckdint (T, A, B, &mlib_mul, "mlib_assert_mul", #T, #A, #B, mlib_this_source_location ()) + +/** + * @brief Perform a runtime-checked cast of an integral value to another type. + * + * @param T A type specifier for a target integral type for the cast. + * @param Operand The integral value to be converted. + * + * If the cast would result in the operand value chaning, the program will be + * terminated with a diagnostic. + */ +#define mlib_assert_narrow(T, Operand) \ + (T) _mlib_checked_cast ( \ + mlib_minof (T), mlib_maxof (T), mlib_upsize_integer (Operand), #T, #Operand, mlib_this_source_location ()) + +#define _mlib_ckdint_argc_3(Fn, Out, Arg) _mlib_ckdint_argc_4 (Fn, Out, *(Out), Arg) +#define _mlib_ckdint_argc_4(Fn, O, A, B) \ + _mlib_ckdint (O, \ + sizeof (*(O)), \ + _mlibClobberIsSigned (*(O), 0) ? (intmax_t) _mlibMinofSigned (*(O)) : _mlibMinofUnsigned (*(O)), \ + _mlibClobberIsSigned (*(O), 1) ? _mlibMaxofSigned (*(O)) : _mlibMaxofUnsigned (*(O)), \ + mlib_upsize_integer (A), \ + mlib_upsize_integer (B), \ + &Fn) + +// Impl macro for the asserting checked arithmetic functions +#define _mlib_assert_ckdint(T, A, B, Fn, F_str, T_str, A_str, B_str, Here) \ + ((T) _mlib_assert_ckdint (sizeof (T), \ + mlib_minof (T), \ + mlib_maxof (T), \ + mlib_upsize_integer (A), \ + mlib_upsize_integer (B), \ + Fn, \ + F_str, \ + T_str, \ + A_str, \ + B_str, \ + Here)) + +// clang-format off +// Generates an 0b11111 bit pattern for appropriate size: +#define _mlibMaxofUnsigned(V) \ + (sizeof(V) == sizeof(uintmax_t) \ + ? UINTMAX_MAX /* No funny bit math, just return the max of the max int */ \ + /* Generate an 0b11111... bit pattern */ \ + : (UINTMAX_C(1) << ( \ + /* Guard against an over-shift if V is uintmax_t: */ \ + (sizeof(V) < sizeof(uintmax_t)) \ + * (sizeof(V) * CHAR_BIT)) \ + ) - 1) + +// Generates an 0b01111 bit pattern for the two's complement max value: +#define _mlibMaxofSigned(V) (_mlibMaxofUnsigned (V) >> 1ull) +// Generates an 0b10000... bit pattern for the two's complement min value: +#define _mlibMinofSigned(V) ((0 & (V)) - (UINTMAX_C (1) << ((sizeof (V) * CHAR_BIT) - 1))) +// For completeness: +#define _mlibMinofUnsigned(V) 0 +// Yields true iff the operand expression has a signed type, but requires that +// the operand is a modifiable l-value. The `N` must be 0 or 1, arbitrarily (see below). +#define _mlibClobberIsSigned(V, N) \ + MLIB_IF_ELSE(mlib_have_typeof()) \ + /* Prefer using typeof(), if we can. */ \ + (mlib_is_signed(mlib_typeof(V))) \ + /* Otherwise, do a dance: */ \ + (( \ + /* Save the value of V */ \ + _mlibSignCheckTmp[N] = 0ull | (uintmax_t) (V), \ + /* Set V to zero, and check whether decrementing results in a negative value */ \ + (V) = 0, \ + _mlibSignCheckResult[N] = (--(V) < 0), \ + /* Restore the value of V (bit hacks to prevent conversion warnings) */ \ + (V) = 0, \ + (V) |= _mlibSignCheckTmp[N], \ + /* Yield the sign-check result */ \ + _mlibSignCheckResult[N] \ + )) +// Storage for `_mlibClobberIsSigned`. We use more than one storage space to prevent +// unsequenced-operation warnings when we use `_mlibClobberIsSigned` multiple times +// in a function argument list. GCC and Clang are able to easily elide these from +// an optimized TU. MSVC has trouble, but is still able to constant-fold where it matters. +static mlib_maybe_unused mlib_thread_local uintmax_t _mlibSignCheckTmp[2]; +static mlib_maybe_unused mlib_thread_local bool _mlibSignCheckResult[2]; +// clang-format on + +// Compile-time assert that the compiler's integer conversions obey two's complement encoding +mlib_static_assert ((intmax_t) UINTMAX_MAX == -1 // + && (intmax_t) (UINTMAX_MAX - 5) == -6, + "This file requires two's complement signed integers"); + +/** + * @brief Function signature for checked arithmetic support functions + * + * The function operates on max-precision integers of either sign, and should + * return true iff the arithmetic operation overflows for the given sign configuration. + * + * @param dst The output parameter for the operation. Never a null pointer. + * @param dst_signed Whether to treat the result as a signed integer + * @param a_signed Whether to treat the `a` operand as signed + * @param a The left-hand operand of the operation + * @param b_signed Whether to treat the `b` operand as signed + * @param b The right-hand operand of the operation + * + * @note This was original written to use `mlib_upscaled_integer` for `a/b/dst`, but + * this defeats MSVC's ability to inline an indirect call through a constant-folded function + * pointer with this signature. GCC and Clang handle this fine, but for MSVC performance + * the more verbose signature is used. + */ +typedef bool (*_mlib_ckdint_arith_fn) ( + uintmax_t *dst, bool dst_signed, bool a_signed, uintmax_t a, bool b_signed, uintmax_t b); + +// Support function for the `mlib_add` macro +static inline bool (mlib_add) (uintmax_t *dst, bool dst_signed, bool a_signed, uintmax_t a, bool b_signed, uintmax_t b) + mlib_noexcept +{ + // Perform regular wrapping arithmetic on the unsigned value. The bit pattern + // is equivalent if there is two's complement signed arithmetic. + const uintmax_t sum = *dst = a + b; + const uintmax_t signbit = (UINTMAX_C (1) << ((sizeof (intmax_t) * CHAR_BIT) - 1)); + // Now we check whether that overflowed according to the sign configuration. + // We use some bit fiddling magic that treat the signbit as a boolean for + // "is this number negative?" or "is this number “large” (i.e. bigger than signed-max)?" + // The expanded verbose form of each bit-magic is written below the more esoteric cases + if (dst_signed) { + if (a_signed) { + if (b_signed) { // S = S + S + return signbit & (sum ^ a) & (sum ^ b); + // Expanded: + // Test whether the product sign is unequal to both input signs + // X ^ Y yields a negative value if the signs are unequal + const bool a_signflipped = (intmax_t) (sum ^ a) < 0; + const bool b_signflipped = (intmax_t) (sum ^ b) < 0; + return a_signflipped && b_signflipped; + } else { // S = S + U + // Flip the sign bit of a, test whether that sum overflows + a ^= signbit; + return a + b < a; + } + } else { + if (b_signed) { // S = U + S + // Flip the sign bit of `b`, test whether that sum overflows + b ^= signbit; + return a + b < b; + } else { // S = U + U + // The signed sum must not be less than the addend, and not negative + return sum < a || (signbit & sum); + } + } + } else { + if (a_signed) { + if (b_signed) { // U = S + S + return signbit & (((sum | a) & b) | ((sum & a) & ~b)); + // Expanded: + const bool a_is_negative = (intmax_t) a < 0; + const bool b_is_negative = (intmax_t) b < 0; + const bool sum_is_large = sum > INTMAX_MAX; + if (b_is_negative) { + if (a_is_negative) { + // The sum must be negative, and therefore cannot be stored in an unsigned + return true; + } else if (sum_is_large) { + // We added a negative value B to a positive value A, but the sum + // ended up larger than the max signed value, so we wrapped + return true; + } + } else if (a_is_negative) { + if (sum_is_large) { + // Same as above case with sum_is_large + return true; + } + } + return false; + } else { // U = S + U + return signbit & (sum ^ a ^ signbit) & (sum ^ b); + // Expanded: + const bool sum_is_large = sum > INTMAX_MAX; + const bool b_is_large = b > INTMAX_MAX; + const bool a_is_negative = (intmax_t) a < 0; + + if (!a_is_negative && b_is_large) { + // We are adding a non-negative value to a large number, so the + // sum must also be large + if (!sum_is_large) { + // We ended up with a smaller value, meaning that we must have wrapped + return true; + } + } + if (a_is_negative && !b_is_large) { + // We subtracted a non-negative value from a non-large number, so + // the result should not be large + if (sum_is_large) { + // We ended up with a large value, so we must have wrapped + return true; + } + } + return false; + } + } else { + if (b_signed) { // U = U + S --- (See [U = S + U] for an explanation) + return signbit & (sum ^ a) & (sum ^ b ^ signbit); + } else { // U = U + U (simple case) + return sum < a; + } + } + } +} + +// Support for the `mlib_sub` macro +static inline bool (mlib_sub) (uintmax_t *dst, bool dst_signed, bool a_signed, uintmax_t a, bool b_signed, uintmax_t b) + mlib_noexcept +{ + // Perform the subtraction using regular wrapping arithmetic + const uintmax_t diff = *dst = a - b; + const uintmax_t signbit = (UINTMAX_C (1) << ((sizeof (intmax_t) * CHAR_BIT) - 1)); + // Test whether the operation overflowed for the given sign configuration + // (See mlib_add for more details on why we do this bit fiddling) + if (dst_signed) { + const bool diff_is_negative = signbit & diff; + if (a_signed) { + if (b_signed) { // S = S - S + return signbit & (a ^ b) & (diff ^ a); + // Explain: + const bool a_is_negative = (intmax_t) a < 0; + const bool b_is_negative = (intmax_t) b < 0; + if (a_is_negative != b_is_negative) { + // Given: Pos - Neg = Pos + // ∧ Neg - Pos = Neg + // We expect that the difference preserves the sign of the minuend + if (diff_is_negative != a_is_negative) { + return true; + } + } + // Otherwise, `Pos - Pos` and `Neg - Neg` cannot possibly overflow + return false; + } else { // S = S - U + // The diff overflows if the sign-bit-flipped minuend is smaller than the subtrahend + return (a ^ signbit) < b; + } + } else { + if (b_signed) { // S = U - S + // The diff overflows if the sign-bit-flipped subtrahend is greater than or equal to the minuend + return a >= (b ^ signbit); + } else { // S = U - U + const bool expect_negative = a < b; + return expect_negative != diff_is_negative; + } + } + } else { + if (a_signed) { + if (b_signed) { // U = S - S + return signbit & (((diff & a) & b) | ((diff | a) & ~b)); + // Expanded: + const bool a_is_negative = (intmax_t) a < 0; + const bool b_is_negative = (intmax_t) b < 0; + const bool diff_is_large = diff > INTMAX_MAX; + if (!b_is_negative) { + if (a_is_negative) { + // We subtracted a non-negative from a negative value, so the difference + // must be negative and cannot be stored as unsigned + return true; + } + if (diff_is_large) { + // We subtracted a positive value from a signed value, so we must not + // end up with a large value + return true; + } + } + if (a_is_negative) { + if (diff_is_large) { + // A is negative, and there is no possible value that we can subtract + // from it to obtain this large integer, so we must have overflowed + return true; + } + } + return false; + } else { // + return (b > a) || (signbit & a); + } + } else { + if (b_signed) { // U = U - S + return signbit & (a ^ b ^ signbit) & (diff ^ a); + // Explain: + const bool a_is_large = a > INTMAX_MAX; + const bool b_is_negative = (intmax_t) b < 0; + const bool diff_is_large = diff > INTMAX_MAX; + if (a_is_large && b_is_negative) { + // The difference between a large value and a negative + // value must also be a large value + if (!diff_is_large) { + // We expected another large value to appear. + return true; + } + } + if (!a_is_large && !b_is_negative) { + // The difference between a non-large positive value and a non-negative value + // must not be a large value + if (diff_is_large) { + // We did not expect a large difference + return true; + } + } + return false; + } else { + return a < b; + } + } + } +} + +// Support for the `mlib_mul` macro +static inline bool (mlib_mul) (uintmax_t *dst, bool dst_signed, bool a_signed, uintmax_t a, bool b_signed, uintmax_t b) + mlib_noexcept +{ + // Multiplication is a lot more subtle + const uintmax_t signbit = (UINTMAX_C (1) << ((sizeof (intmax_t) * CHAR_BIT) - 1)); + if (dst_signed) { + if (a_signed) { + if (b_signed) { + // S = S × S + *dst = a * b; + if (((intmax_t) b == -1 && (intmax_t) a == INTMAX_MIN) || + ((intmax_t) a == -1 && (intmax_t) b == INTMAX_MIN)) { + // MIN × -1 is undefined + return true; + } + if (a && (intmax_t) *dst / (intmax_t) a != (intmax_t) b) { + // Mult did not preserve the arithmetic identity + return true; + } + return false; + } else { + // S = S × U + *dst = a * b; + const bool a_is_negative = signbit & a; + const uintmax_t positive_a = a_is_negative ? (0 - a) : a; + const uintmax_t positive_prod = positive_a * b; + const bool did_overflow = positive_a && positive_prod / positive_a != b; + if (did_overflow) { + return true; + } + if (positive_prod > (uintmax_t) INTMAX_MAX + (unsigned) a_is_negative) { + return true; + } + return false; + } + } else { + if (b_signed) { + // S = U × S + // Swap args: [S = S × U] + return (mlib_mul) (dst, dst_signed, b_signed, b, a_signed, a); + } else { + // S = U × U + *dst = a * b; + const bool did_overflow = a && *dst / a != b; + if (did_overflow) { + return true; + } + if (signbit & *dst) { + // A negative product indicates wrapping + return true; + } + return false; + } + } + } else { + if (a_signed) { + if (b_signed) { + // U = S × S + // Is either operand the min? + bool either_min = false; + if (signbit & a & b) { + // Both negative: Flip the signs + a = 0 - a; + b = 0 - b; + // MIN is pathological: 0 - MIN = MIN, so we need to check that: + either_min = (intmax_t) a == INTMAX_MIN || (intmax_t) b == INTMAX_MIN; + } + // Check if the product would be a negative number + const bool neg_prod = (signbit & (a ^ b)) && a && b && !either_min; + *dst = a * b; + return neg_prod || (a && *dst / a != b); + } else { + // U = S × U + *dst = a * b; + const bool did_ovr = a && *dst / a != b; + const bool a_is_negative = signbit & a; + if (did_ovr || (a_is_negative && b)) { + return true; + } + return false; + } + } else { + if (b_signed) { + // U = U × S + // Swap to [U = S × U] + return (mlib_mul) (dst, dst_signed, b_signed, b, a_signed, a); + } else { + // U = U × U: Simple: + *dst = a * b; + return a && *dst / a != b; + } + } + } +} + +/** + * @private + * @brief This function performs the narrowing checks around a ckdint funciton + * + * @param dst Pointer to the target interger + * @param dst_sz The size of the target integer, in bytes + * @param minval The minimum value for the result. If negative, the target is treated as signed + * @param maxval The maximum value for the result + * @param a The left-hand operand for the operation + * @param b The right-hand operand for the operation + * @param fn The arithmetic function that performs arithmetic on the max-precision integer + * @return true If the resulting value DOES NOT equal the true arithmetic result + * @return false If the resulting value represents the true arithmetic results + */ +static inline bool +_mlib_ckdint (void *dst, + int dst_sz, + intmax_t minval, + uintmax_t maxval, + struct mlib_upsized_integer a, + struct mlib_upsized_integer b, + _mlib_ckdint_arith_fn fn) mlib_noexcept +{ + // Perform the arithmetic on uintmax_t, for wrapping behavior + uintmax_t tmp; + bool ovr = fn (&tmp, minval < 0, a.is_signed, a.i.u, b.is_signed, b.i.u); + // Endian-adjusting for writing the result + const char *copy_from = (const char *) &tmp; + if (!mlib_is_little_endian ()) { + // We need to adjust the copy src in order to truncate the integer for big-endian encoding. + // Number of high bytes that we need to drop: + const int n_drop = (int) sizeof (tmp) - dst_sz; + // Adjust the copy pointer to so that we copy from the most significant byte that + // we wish to keep + copy_from += n_drop; + } else { + // For little-endian native, we don't need to adjust the bytes, since we can just + // truncate using the memcpy() + } + // Send the result to the destination + memcpy (dst, copy_from, (size_t) dst_sz); + // Final range check: + if (minval < 0) { + // Treat the target as signed: + intmax_t idst = (intmax_t) tmp; + return ovr || idst < minval || (idst > 0 && (uintmax_t) idst > maxval); + } else { + return ovr || tmp > maxval; + } +} + +/** + * @internal + * @brief Implementation function for the asserting arithmetic functions + */ +static inline uintmax_t (_mlib_assert_ckdint) (size_t dst_sz, + intmax_t minval, + uintmax_t maxval, + struct mlib_upsized_integer a, + struct mlib_upsized_integer b, + _mlib_ckdint_arith_fn arith, + const char *fn_str, + const char *type_str, + const char *a_str, + const char *b_str, + struct mlib_source_location here) mlib_noexcept +{ + uintmax_t tmp; + bool did_overflow = _mlib_ckdint (&tmp, dst_sz, minval, maxval, a, b, arith); + if (did_overflow) { + fprintf (stderr, + "%s:%d: [in %s]: Call of %s(%s, %s, %s) resulted in arithmetic overflow\n", + here.file, + here.lineno, + here.func, + fn_str, + type_str, + a_str, + b_str); + abort (); + } + return tmp; +} + +static inline uintmax_t +_mlib_checked_cast (intmax_t min_, + uintmax_t max_, + struct mlib_upsized_integer val, + const char *typename_, + const char *expr, + struct mlib_source_location here) mlib_noexcept +{ + if (!(mlib_in_range) (min_, max_, val)) { + if (val.is_signed) { + fprintf (stderr, + "%s:%d: in [%s]: Checked integer cast of “%s” (value = %lld) to “%s” loses information\n", + here.file, + here.lineno, + here.func, + expr, + (long long) val.i.s, + typename_); + } else { + fprintf (stderr, + "%s:%d: in [%s]: Checked integer cast of “%s” (value = %llu) to “%s” loses information\n", + here.file, + here.lineno, + here.func, + expr, + (unsigned long long) val.i.u, + typename_); + } + fflush (stderr); + abort (); + } + if (val.is_signed) { + return (uintmax_t) val.i.s; + } + return val.i.u; +} + +mlib_extern_c_end (); diff -pruN 1.30.4-1/src/common/src/mlib/ckdint.md 2.0.2-1/src/common/src/mlib/ckdint.md --- 1.30.4-1/src/common/src/mlib/ckdint.md 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/ckdint.md 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,283 @@ +# `mlib/ckdint.h` C23 `stdckdint.h` for C99 + +The `mlib/ckdint.h` header implements the [C23 checked arithmetic][stdckdint] +functionality in a C99-compatible manner. There are only three caveats to keep +in mind: + +[stdckdint]: https://en.cppreference.com/w/c/numeric#Checked_integer_arithmetic + +- The backport relies assumes two's complement signed integer encoding. +- The operand expressions of a call to the ckdint function-like macros may be + evaluated more than once. +- The output parameter is read-from before the operation begins, meaning that it + must be initialized to some value to prevent an uninitialized-read from being + seen by the compiler. (The value isn't used, and the compiler will easily + elide the dead store/read.) + +Implementing this correctly, especially without the aide of `_Generic`, requires +quite a few tricks, but the results are correct (tested against GCC's +`__builtin__overflow` intrinsic, which is how `glibc` implements C23 +[stdckdint][]). + + +# How to Use + +The following function-like macros are defined: + +- Regular: `mlib_add`, `mlib_sub`, and `mlib_mul`, with an additional + `mlib_narrow` macro. +- Asserting: `mlib_assert_add`, `mlib_assert_sub`, `mlib_assert_mul`, and + `mlib_assert_narrow` + + +## Regular Macros + +The "regular" macros have the same API as [stdckdint][], with an additional +feature: If called with two arguments, the output parameter is used as the +left-hand operand of the operation: + +```c +int foo = 42; +mlib_add(&foo, n); // Equivalent to `foo += n` +``` + +`mlib_narrow(Dst, I)` is not from [stdckdint][], but is useful to check that an +integral cast operation does not modify the value: + +```c +void foo(size_t N) { + int a = 0; + if (mlib_narrow(&a, N)) { + fprintf(stderr, "Invalid operand: N is too large\n"); + abort(); + } + // … +} +``` + +All of the "regular" macros return a boolean. If they return `true`, then the +result written to the destination DOES NOT represent the true arithmetic result +(i.e. the operation overflowed or narrowed). If it returns `false`, then the +operation succeeded without issue. + +This allows one to chain arithmetic operations together with the logical-or +operator, short-circuiting when the operation fails: + +```c +ssize_t grow_size(size_t sz, size_t elem_size, size_t count) { + ssize_t ret = 0; + // Compute: ret = sz + (elem_size × count) + if (mlib_mul(&elem_size, count) || // elem_size *= count + mlib_add(&ret, sz, elem_size)) { // ret = sz + elem_size + // Overflow. Indicate an error. + return SSIZE_MIN; + } + return ret; +} +``` + + +## Asserting Macros + +The `mlib_assert_…` macros take a type as their first argument instead of a +destination pointer. The macro yields the result of the operation as a value of +the specified type, asserting at runtime that no overflow or narrowing occurs. +If the operation results in information loss, the program terminates at the call +site. + + +# How it Works + +This section details how it works, since it isn't straightforward from reading. + + +## Max-Precision Arithmetic + +The basis of the checked arithmetic is to do the math in the maximum width +unsigned integer type, which is well-defined. We can then treat the unsigned bit +pattern as a signed or unsigned integer as appropriate to perform the arithmetic +correctly and check for overflow. This arithmetic is implemented in the +`mlib_add`, `mlib_sub`, and `mlib_mul` *functions* (not the macros). The bit +fiddling tricks are a combination of straightforward arithmetic checks and more +esoteric algorithms. The checks for addition and subtraction are fairly +straightforward, while the multiplication implementation is substantially more +complicated since its overflow semantics are much more pernicious. + +The bit hacks are described within each function. They are split between each +combination of signed/unsigned treatment for the dest/left/right operands. The +basis of the bit checks is in treating the high bit as a special boolean: For +unsigned types, a set high bit represents a value outside the bounds of the +signed equivalent. For signed types, a set high bit indicates a negative value +that cannot be stored in an unsigned integer. Thus, logical-bit operations on +integers and then comparing the result as less-than-zero effectively treats the +high bit as a boolean, e.g.: + +- For signed X and Y, `(X ^ Y) < 0` yield `true` iff `X` and `Y` have different + sign. +- `(X & Y) < 0` tests that both X and Y are negative. +- `(X | Y) < 0` tests that either X or Y are negative. + +The very terse bit-manipulation expressions are difficult to parse at first, and +have been expanded below each occurrence to explain what they are actually +testing. The terse bit-manip tests are left as the main condition for overflow +checking, as they generate significantly better machine code, even with the +optimizer enabled. + +If the arithmetic overflows in the max precision integer, then we can assume +that it overflows for any smaller integer types. + +For this integer promotion at macro sites, we use `mlib_upscale_integer`, +defined in `mlib/intutil.h`. + + +## Final Narrowing + +While it is simple enough to perform arithmetic in the max precision, we need +to narrow the result to the target type, and that requires knowing the min/max +bounds of that type. This was the most difficult challenge, because it requires +the following: + +1. Given a pointer to an integer type $T$, what is the minimum value of $T$? +2. ... what is the maximum value of $T$? +3. How do we cast from a `uintmax_t` to $T$ through a generic `void*`? + +Point (3) is fairly simple: If we know the byte-size of $T$, we can bit-copy the +integer representation from `uintmax_t` into the `void*`, preserving +endian-encoding. For little-endian encoding, this is as simple as copying the first +$N$ bytes from the `uintmax_t` into the target, truncating to the target size. +For big-endian encoding, we just adjust a pointer into the object representation +of the `uintmax_t` to drop the high bytes that we don't need. + +Points (1) and (2) are more subtle. We need a way to obtain a bit pattern that +respects the "min" and "max" two's complement values. While one can easily form +an aribtrary bit pattern using bit-shifts and `sizeof(*ptr)`, the trouble is +that the min/max values depend on whether the target is signed, and it is *not +possible* in C99 to ask whether an arbitrary integer expression is +signed/unsigned. + + +### Things that Don't Work™ + +Given a type `T`, we can check whether it is signed with a simple macro: + +```c +#define IS_SIGNED(T) ((T)-1 < 0) +``` + +Unfortunately, we don't have a type `T`. We have an expression `V`: + +```c +#define IS_SIGNED_TYPEOF(V) ??? +``` + +With C23 or GNU's `__typeof__`, we could do this easily (see below). + +There is one close call, that allows us to grab a zero and subtract one: + +```c +#define IS_SIGNED_TYPEOF(V) ((0 & V) - 1 < 0) +``` + +This seems promising, but this **doesn't work**, because of C's awful, +horrible, no-good, very-bad integer promotion rules. The expression `0 & V` +*will* yield zero, but if `V` is smaller than `int`, it will be immediately +promoted to `signed int` beforehand, regardless of the sign of `V`. This macro +gives the correct answer for `(unsigned) int` and larger, but `(unsigned) short` +and `(unsigned) char` will always yield `true`. + + +### How `mlib/ckdint.h` Does It + +There is one set of C operators that *don't* perform integer promotion: +assignment and in-place arithmetic. This macro *does* work: + +```c +#define IS_SIGNED_TYPEOF(V) (((V) = -1) < 0) +``` + +But this obviously can't be used, because we're modifying the operand! Right...? + +Except: We're only needing to do this check on the *destination* of the +arithmetic function. We already know that it's modifiable and that we're going +to reassign to it, so it doesn't matter that we temporarily write a garbage `-1` +into it! + +With this, we can write our needed support macros: + +```c +#define MINOF_TYPEOF(V) \ + IS_SIGNED_TYPEOF(V) \ + ? MIN_TYPEOF_SIGNED(V) \ + : MIN_TYPEOF_UNSIGNED(V) +``` + +With this, a call-site of our checked arithmetic macros can inject the +appropriate min/max values of the destination operand, and the checked +arithmetic functions can do the final bounds check. + +Almost + + +### Big Problem, Though + +Suppose the following: + +```c +int a = 42; +mlib_add(&a, a, 5); // 42 + 5 ? +``` + +The correct result of `a` is `47`, but the value is unspecified: It is either +`4` or `47`, depending on argument evaluation order, because we are silently +overwriting the value in `a` to `-1` before doing the operation. We need to save +the value of `a`, do the check, and then restore the value of `a`, all in a +single go. Thus we have a much hairier macro: + +```c +static thread_local uintmax_t P; +static thread_local bool S; +#define IS_SIGNED_TYPEOF(V) \ + (( \ + P = 0ull | (uintmax_t) V, \ + V = 0, \ + S = (--V < 0), \ + V = 0, \ + V |= P, \ + S \ + )) +``` + +This uses the comma-operator the enforce evaluation of each sub-expression: + +1. Save the bit pattern of `V` in a global static temporary $P$. +2. Set `V` to zero. +3. Decrement `V` and check if the result is negative. Save that value in a + separate global $S$. +4. Restore the value of `V` by writing the bit pattern stored in $P$ back into + `V`. (The use of `= 0` + `|= P` prevents compilers from emitting any + integer conversion warnings) +5. Yield the bool we saved in $S$. + +$P$ and $S$ are `thread_local` to allow multiple threads to evaluate the macro +simultaneously without interfering. The `static` allows the optimizer to delete +$P$ and $S$ from the translation unit when it can statically determine that the +values written into these variables are never read from after constant folding +(usually: MSVC is currently unable to elide the writes, but is still able to +constant-fold across these assignments, which is the most important optimization +we need to ensure works to eliminate redundant branches after inlining). + +With this modified roundabout definition, we can perform in-place checked +arithmetic where the output can also be used as an input of the operation. + + +### Optimize: Use `__typeof__` + +If we have `__typeof__` (available in GCC, Clang, and MSVC 19.39+) or C23 +`typeof` , we can simplify our macro to a trivial one: + +```c +#define IS_SIGNED_TYPEOF(V) IS_SIGNED(__typeof__(V)) +``` + +This will yield an equivalent result, but improves debug codegen and gives the +optimizer an easier time doing constant folding across function calls. diff -pruN 1.30.4-1/src/common/src/mlib/ckdint.test.cpp 2.0.2-1/src/common/src/mlib/ckdint.test.cpp --- 1.30.4-1/src/common/src/mlib/ckdint.test.cpp 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/ckdint.test.cpp 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,177 @@ +#include +#include + +#include +#include +#include + +#define have_ckdint_builtins() 0 +// Check for the stdckdint builtins, but don't use Clang, as it has bugs on some platforms. +#if defined(__has_builtin) && !defined(__clang__) +#if __has_builtin(__builtin_add_overflow) +#undef have_ckdint_builtins +#define have_ckdint_builtins() 1 +#endif // __has_builtin +#endif + +template struct typelist { +}; +using integer_types = typelist; + +/** + * @brief For every "interesting" value of integer type `T`, call `F` + * + * @tparam T An integer type to be inspected + * @param fn A function to be called with every "interesting value" + */ +template +void +with_interesting_values (F &&fn) +{ + using lim = std::numeric_limits; + // A list of the values of T that are potentially problematic + // when combined in various ways. + const T interesting_values[] = { + 0, + (T) (-1), + (T) (-2), + (T) (-10), + 1, + 2, + 10, + // Min value + lim::min (), + // Half min + (T) (lim::min () / 2), + (T) (lim::min () / 2 + 1), + (T) (lim::min () / 2 - 1), + // Max value + lim::max (), + // Half max + (T) (lim::max () / 2), + (T) (lim::max () / 2 + 1), + (T) (lim::max () / 2 - 1), + }; + // Call with each value: + for (T v : interesting_values) { + fn (v); + } +} + +/** + * @brief Perform one set of tests with the given integer values + * + * @tparam Dst The target type for the operation + * @param lhs The left-hand operand + * @param rhs The right-hand operand + * + * If you identify a problematic combination, you can call this + * directly in `main` with the known-bad values for easier debugging. + * + * This function is a no-op if the compiler does not provide the checked-arithmetic + * builtins. + */ +template +void +test_case (L lhs, R rhs) +{ + (void) lhs; + (void) rhs; +#if have_ckdint_builtins() + Dst mres, gres; + // Test addition: + mlib_check (mlib_add (&mres, lhs, rhs), eq, __builtin_add_overflow (lhs, rhs, &gres)); + mlib_check (mres, eq, gres); + + // Test subtraction: + mlib_check (mlib_sub (&mres, lhs, rhs), eq, __builtin_sub_overflow (lhs, rhs, &gres)); + mlib_check (mres, eq, gres); + + // Test multiplication + mlib_check (mlib_mul (&mres, lhs, rhs), eq, __builtin_mul_overflow (lhs, rhs, &gres)); + mlib_check (mres, eq, gres); + + // Test narrowing (both operands) + mlib_check (mlib_narrow (&mres, lhs), eq, __builtin_add_overflow (lhs, 0, &gres)); + mlib_check (mres, eq, gres); + mlib_check (mlib_narrow (&mres, rhs), eq, __builtin_add_overflow (rhs, 0, &gres)); + mlib_check (mres, eq, gres); +#endif +} + +template +int +test_arithmetic () +{ + with_interesting_values ([&] (L lhs) { // + with_interesting_values ([&] (R rhs) { // + test_case (lhs, rhs); + }); + }); + return 0; +} + +template +int +test_rhs (typelist) +{ + // Call with every Rhs type + auto arr = {test_arithmetic ()...}; + (void) arr; + return 0; +} + +template +int +test_lhs (typelist) +{ + // Expand to a call of test_rhs for every Lhs type + auto arr = {test_rhs (integer_types{})...}; + (void) arr; + return 0; +} + +template +void +test_dst_types (typelist) +{ + // Expand to a call of test_lhs for each Dst type + auto arr = {test_lhs (integer_types{})...}; + (void) arr; +} + +int +main () +{ + // Test that the dest can be used as an operand simultaneously: + int a = 42; + mlib_add (&a, a, 5); // `a` is both an addend and the dst + mlib_check (a, eq, 47); // Check that the addition respected the `42` + + // The `check` arithmetic functions should abort the process immediately + mlib_assert_aborts () { + mlib_assert_add (size_t, 41, -42); + } + mlib_assert_aborts () { + mlib_assert_add (ptrdiff_t, 41, SIZE_MAX); + } + // Does not abort: + const size_t sum = mlib_assert_add (size_t, -32, 33); + mlib_check (sum, eq, 1); + + // Test all integer types: + test_dst_types (integer_types{}); + if (!have_ckdint_builtins ()) { + puts ("@@ctest-skipped@@ - No __builtin__overflow builtins to test against"); + } +} diff -pruN 1.30.4-1/src/common/src/mlib/cmp.h 2.0.2-1/src/common/src/mlib/cmp.h --- 1.30.4-1/src/common/src/mlib/cmp.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/cmp.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,135 @@ +/** + * @file mlib/cmp.h + * @brief Safe integer comparison and range checking + * @date 2024-08-29 + * + * This file provides safe and intuitive integer comparison macros that behave + * appropriately, regardless of the sign or precision of the integer operands. + * + * @copyright Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MLIB_CMP_H_INCLUDED +#define MLIB_CMP_H_INCLUDED + +#include +#include + +#include +#include + +/** + * @brief Result type of comparing two integral values with `mlib_cmp` + * + * The enumerator values are chosen such that they can be compared with zero + */ +enum mlib_cmp_result { + // The two values are equivalent + mlib_equal = 0, + // The left-hand operand is less than the right-hand + mlib_less = -1, + // The left-hand operand is greater than the right-hand + mlib_greater = 1, +}; + +/** + * @brief Compare two integral values safely. + * + * NOTE: This macro may evaluate the operand expressions more than once! Do not + * use expressions that are expensive or have side effects! + * + * This function can be called with two arguments or with three: + * + * - `mlib_cmp(a, b)` Returns a value of type `mlib_cmp_result` + * - `mlib_cmp(a, Op, b)` where `Op` is a relational operator. Evaluates to a boolean value. + */ +#define mlib_cmp(...) MLIB_ARGC_PICK (_mlib_cmp, __VA_ARGS__) +// Compare two integers, and return the result of that comparison: +#define _mlib_cmp_argc_2(L, R) mlib_cmp (mlib_upsize_integer ((L)), mlib_upsize_integer ((R)), 0) +// Compare two integers, but with an infix operator: +#define _mlib_cmp_argc_3(L, Op, R) (mlib_cmp (mlib_upsize_integer ((L)), mlib_upsize_integer ((R)), 0) Op 0) +// Impl for mlib_cmp +mlib_always_inline static enum mlib_cmp_result (mlib_cmp) (struct mlib_upsized_integer x, + struct mlib_upsized_integer y, + int always_zero) mlib_noexcept +{ + (void) always_zero; +#if mlib_is_optimized_build() && !mlib_is_msvc() && \ + !(defined(MLIB_DISABLE_INLINING_ASSERTIONS) && MLIB_DISABLE_INLINING_ASSERTIONS) + if (always_zero != 0) { + // All calls must pass zero for `always_zero`. In optimized builds, we assert that this function + // is always inlined, and that dead-code-elim triggers to delete this branch that calls + // a never-defined function. + extern void __assert_that_mlib_cmp_was_inlined (void); + // If you see a call to this function ↑ produce a link error here ↓, it means + // that inlining or DCE failed within the relevant translation unit. + __assert_that_mlib_cmp_was_inlined (); + } +#endif + if (x.is_signed) { + if (y.is_signed) { + // Both signed + if (x.i.s < y.i.s) { + return mlib_less; + } else if (x.i.s > y.i.s) { + return mlib_greater; + } + } else { + // X signed, Y unsigned + if (x.i.s < 0 || (uintmax_t) x.i.s < y.i.u) { + return mlib_less; + } else if ((uintmax_t) x.i.s > y.i.u) { + return mlib_greater; + } + } + } else { + if (!y.is_signed) { + // Both unsigned + if (x.i.u < y.i.u) { + return mlib_less; + } else if (x.i.u > y.i.u) { + return mlib_greater; + } + } else { + // X unsigned, Y signed + if (y.i.s < 0 || x.i.u > (uintmax_t) y.i.s) { + return mlib_greater; + } else if (x.i.u < (uintmax_t) y.i.s) { + return mlib_less; + } + } + } + return mlib_equal; +} + +/** + * @brief Test whether the given operand is within the range of some other integral type + * + * @param T A type specifier of the target integral type + * @param Operand the expression that is being inspected. + * + * @note This macro may evaluate the operand more than once + */ +#define mlib_in_range(T, Operand) \ + mlib_in_range ((intmax_t) mlib_minof (T), (uintmax_t) mlib_maxof (T), mlib_upsize_integer (Operand)) +static inline bool (mlib_in_range) (intmax_t min_, uintmax_t max_, struct mlib_upsized_integer val) mlib_noexcept +{ + if (val.is_signed) { + return mlib_cmp (val.i.s, >=, min_) && mlib_cmp (val.i.s, <=, max_); + } else { + return mlib_cmp (val.i.u, >=, min_) && mlib_cmp (val.i.u, <=, max_); + } +} + +#endif // MLIB_CMP_H_INCLUDED diff -pruN 1.30.4-1/src/common/src/mlib/config.h 2.0.2-1/src/common/src/mlib/config.h --- 1.30.4-1/src/common/src/mlib/config.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/config.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,353 @@ +/** + * @file mlib/config.h + * @brief Provides utility macros + * @date 2024-08-29 + * + * @note This file is intented to be standalone-includable, with no dependencies + * other than the standard library and platform headers. This file (and other + * `mlib` files), are for internal use only, and should not be used in any public + * headers. + * + * @copyright Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MLIB_CONFIG_H_INCLUDED +#define MLIB_CONFIG_H_INCLUDED + +#ifndef _WIN32 +#include // Endian detection +#endif + +/** + * @brief A function-like macro that always expands to nothing + */ +#define MLIB_NOTHING(...) + +/** + * @brief A function macro that simply expands to its arguments unchanged + */ +#define MLIB_JUST(...) __VA_ARGS__ + +// Paste two tokens +#ifndef _MSC_VER +#define MLIB_PASTE(A, ...) _mlibPaste1 (A, __VA_ARGS__) +#else +#define MLIB_PASTE(A, ...) MLIB_JUST (_mlibPaste1 (A, __VA_ARGS__)) +#endif +// Paste three tokens +#define MLIB_PASTE_3(A, B, ...) MLIB_PASTE (A, MLIB_PASTE (B, __VA_ARGS__)) +// Paste four tokens +#define MLIB_PASTE_4(A, B, C, ...) MLIB_PASTE (A, MLIB_PASTE_3 (B, C, __VA_ARGS__)) +// Paste five tokens +#define MLIB_PASTE_5(A, B, C, D, ...) MLIB_PASTE (A, MLIB_PASTE_4 (B, C, D, __VA_ARGS__)) +#define _mlibPaste1(A, ...) A##__VA_ARGS__ + +/** + * @brief Convert the token sequence into a string after macro expansion + */ +#define MLIB_STR(...) _mlibStr (__VA_ARGS__) +#define _mlibStr(...) #__VA_ARGS__ + +#define MLIB_EVAL_32(...) MLIB_EVAL_16 (MLIB_EVAL_16 (__VA_ARGS__)) +#define MLIB_EVAL_16(...) MLIB_EVAL_8 (MLIB_EVAL_8 (__VA_ARGS__)) +#define MLIB_EVAL_8(...) MLIB_EVAL_4 (MLIB_EVAL_4 (__VA_ARGS__)) +#define MLIB_EVAL_4(...) MLIB_EVAL_2 (MLIB_EVAL_2 (__VA_ARGS__)) +#define MLIB_EVAL_2(...) MLIB_EVAL_1 (MLIB_EVAL_1 (__VA_ARGS__)) +#define MLIB_EVAL_1(...) __VA_ARGS__ + +// clang-format off +/** + * @brief Expand to 1 if given no arguments, otherwise 0. + * + * This could be done trivially using __VA_OPT__, but we need to work on + * older compilers. + */ +#define MLIB_IS_EMPTY(...) \ + _mlibIsEmpty_1( \ + /* Expands to '1' if __VA_ARGS__ contains any top-level commas */ \ + _mlibHasComma(__VA_ARGS__), \ + /* Expands to '1' if __VA_ARGS__ begins with a parenthesis, because \ + * that will cause an "invocation" of _mlibCommaIfParens, \ + * which immediately expands to a single comma. */ \ + _mlibHasComma(_mlibCommaIfParens __VA_ARGS__), \ + /* Expands to '1' if __VA_ARGS__ expands to a function-like macro name \ + * that then expands to anything containing a top-level comma */ \ + _mlibHasComma(__VA_ARGS__ ()), \ + /* Expands to '1' if __VA_ARGS__ expands to nothing. */ \ + _mlibHasComma(_mlibCommaIfParens __VA_ARGS__ ())) +// Expand to 1 if the argument list has a comma. The weird definition is to support +// old MSVC's bad preprocessor +#define _mlibHasComma(...) \ + MLIB_JUST(_mlibPickSixteenth \ + MLIB_NOTHING("MSVC workaround") \ + (__VA_ARGS__, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, ~)) +#define _mlibCommaIfParens(...) , + +/** + * A helper for isEmpty(): If given (0, 0, 0, 1), expands as: + * - first: _mlibHasComma(_mlibIsEmptyCase_0001) + * - then: _mlibHasComma(,) + * - then: 1 + * Given any other aruments: + * - first: _mlibHasComma(_mlibIsEmptyCase_) + * - then: 0 + */ +#define _mlibIsEmpty_1(_1, _2, _3, _4) \ + _mlibHasComma(MLIB_PASTE_5(_mlibIsEmptyCase_, _1, _2, _3, _4)) +#define _mlibIsEmptyCase_0001 , + +#define MLIB_IS_NOT_EMPTY(...) MLIB_PASTE (_mlibNotEmpty_, MLIB_IS_EMPTY (__VA_ARGS__)) +#define _mlibNotEmpty_1 0 +#define _mlibNotEmpty_0 1 +// clang-format on + +/** + * @brief If the argument expands to `0`, `false`, or nothing, expands to `0`. + * Otherwise expands to `1`. + */ +#define MLIB_BOOLEAN(...) MLIB_IS_NOT_EMPTY (MLIB_PASTE_3 (_mlib, Bool_, __VA_ARGS__)) +#define _mlibBool_0 +#define _mlibBool_false +#define _mlibBool_ + +/** + * @brief A ternary macro. Expects three parenthesized argument lists in + * sequence. + * + * If the first argument list is a truthy value, expands to the second argument + * list. Otherwise, expands to the third argument list. The unused argument list + * is not expanded and is discarded. + */ +#define MLIB_IF_ELSE(...) MLIB_PASTE (_mlibIfElseBranch_, MLIB_BOOLEAN (__VA_ARGS__)) +#define _mlibIfElseBranch_1(...) __VA_ARGS__ _mlibNoExpandNothing +#define _mlibIfElseBranch_0(...) MLIB_NOTHING (#__VA_ARGS__) MLIB_JUST +#define _mlibNoExpandNothing(...) MLIB_NOTHING (#__VA_ARGS__) + +/** + * @brief Expands to an integer literal corresponding to the number of macro + * arguments. Supports up to fifteen arguments. + */ +#define MLIB_ARG_COUNT(...) \ + MLIB_IF_ELSE (MLIB_IS_EMPTY (__VA_ARGS__)) \ + (0) (_mlibPickSixteenth (__VA_ARGS__, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)) +#define _mlibPickSixteenth(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, ...) _16 + +/** + * @brief Expand to a call expression `Prefix##_argc_N(...)`, where `N` is the + * number of macro arguments. + */ +#define MLIB_ARGC_PICK(Prefix, ...) \ + MLIB_JUST (MLIB_PASTE_3 (Prefix, _argc_, MLIB_ARG_COUNT (__VA_ARGS__)) (__VA_ARGS__)) + +#ifdef __cplusplus +#define mlib_is_cxx() 1 +#define mlib_is_not_cxx() 0 +#define MLIB_IF_CXX(...) __VA_ARGS__ +#define MLIB_IF_NOT_CXX(...) +#else +#define mlib_is_cxx() 0 +#define mlib_is_not_cxx() 1 +#define MLIB_IF_CXX(...) +#define MLIB_IF_NOT_CXX(...) __VA_ARGS__ +#endif + +#define MLIB_LANG_PICK MLIB_IF_ELSE (mlib_is_not_cxx ()) + +/** + * @brief Use as the prefix of a braced initializer within C headers, allowing + * the initializer to appear as a compound-init in C and an equivalent braced + * aggregate-init in C++ + */ +#define mlib_init(T) MLIB_LANG_PICK ((T)) (T) + +/** + * @brief Expands to `noexcept` when compiled as C++, otherwise expands to + * nothing + */ +#define mlib_noexcept MLIB_IF_CXX (noexcept) + +#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) +#define mlib_is_little_endian() (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) +#elif defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) +#define mlib_is_little_endian() (__BYTE_ORDER == __LITTLE_ENDIAN) +#elif defined(_WIN32) +#define mlib_is_little_endian() 1 +#else +#error "Do not know how to detect endianness on this platform." +#endif + +// clang-format off +/** + * @brief Expands to a static assertion declaration. + * + * When supported, this can be replaced with `_Static_assert` or `static_assert` + */ +#define mlib_static_assert(...) MLIB_ARGC_PICK (_mlib_static_assert, __VA_ARGS__) +#define _mlib_static_assert_argc_1(Expr) \ + _mlib_static_assert_argc_2 ((Expr), "Static assertion failed") +#define _mlib_static_assert_argc_2(Expr, Msg) \ + extern int \ + MLIB_PASTE (_mlib_static_assert_placeholder, __COUNTER__)[(Expr) ? 2 : -1] \ + MLIB_IF_GNU_LIKE (__attribute__ ((unused))) +// clang-format on + +#define mlib_extern_c_begin() MLIB_IF_CXX(extern "C" {) mlib_static_assert(1, "") +#define mlib_extern_c_end() MLIB_IF_CXX( \ + }) mlib_static_assert(1, "") + +#ifdef __GNUC__ +#define mlib_is_gnu_like() 1 +#ifdef __clang__ +#define mlib_is_gcc() 0 +#define mlib_is_clang() 1 +#else +#define mlib_is_gcc() 1 +#define mlib_is_clang() 0 +#endif +#define mlib_is_msvc() 0 +#elif defined(_MSC_VER) +#define mlib_is_gnu_like() 0 +#define mlib_is_clang() 0 +#define mlib_is_gcc() 0 +#define mlib_is_msvc() 1 +#endif + +#if defined(_WIN32) +#define mlib_is_win32() 1 +#define mlib_is_unix() 0 +#else +#define mlib_is_unix() 1 +#define mlib_is_win32() 0 +#endif + +#define MLIB_IF_CLANG(...) MLIB_IF_ELSE (mlib_is_clang ()) (__VA_ARGS__) (MLIB_NOTHING (#__VA_ARGS__)) +#define MLIB_IF_GCC(...) MLIB_IF_ELSE (mlib_is_gcc ()) (__VA_ARGS__) (MLIB_NOTHING (#__VA_ARGS__)) +#define MLIB_IF_GNU_LIKE(...) MLIB_IF_GCC (__VA_ARGS__) MLIB_IF_CLANG (__VA_ARGS__) MLIB_NOTHING (#__VA_ARGS__) +#define MLIB_IF_UNIX_LIKE(...) MLIB_IF_ELSE (mlib_is_unix ()) (__VA_ARGS__) (MLIB_NOTHING (#__VA_ARGS__)) + +// note: Bug on GCC preprocessor prevents us from using if/else trick to omit MSVC code +#if mlib_is_msvc() +#define MLIB_IF_MSVC(...) __VA_ARGS__ +#define mlib_pragma(...) __pragma (__VA_ARGS__) mlib_static_assert (1, "") +#else +#define MLIB_IF_MSVC(...) MLIB_NOTHING (#__VA_ARGS__) +#define mlib_pragma(...) _Pragma (#__VA_ARGS__) mlib_static_assert (1, "") +#endif + +#define MLIB_FUNC MLIB_IF_GNU_LIKE (__func__) MLIB_IF_MSVC (__FUNCTION__) + +#define mlib_diagnostic_push() \ + MLIB_IF_GNU_LIKE (mlib_pragma (GCC diagnostic push);) \ + MLIB_IF_MSVC (mlib_pragma (warning (push));) \ + mlib_static_assert (true, "") + +#define mlib_diagnostic_pop() \ + MLIB_IF_GNU_LIKE (mlib_pragma (GCC diagnostic pop);) \ + MLIB_IF_MSVC (mlib_pragma (warning (pop));) \ + mlib_static_assert (true, "") + +#define mlib_gcc_warning_disable(Warning) \ + MLIB_IF_GCC (mlib_pragma (GCC diagnostic ignored Warning);) \ + mlib_static_assert (true, "") + +#define mlib_gnu_warning_disable(Warning) \ + MLIB_IF_GNU_LIKE (mlib_pragma (GCC diagnostic ignored Warning);) \ + mlib_static_assert (true, "") + +#define mlib_msvc_warning(...) \ + MLIB_IF_MSVC (mlib_pragma (warning (__VA_ARGS__));) \ + mlib_static_assert (true, "") + +/** + * @brief Attribute macro that forces the function to be inlined at all call sites. + * + * Don't use this unless you really know that you need it, lest you generate code + * bloat when the compiler's heuristics would do a better job. + */ +#define mlib_always_inline MLIB_IF_GNU_LIKE (__attribute__ ((always_inline)) inline) MLIB_IF_MSVC (__forceinline) + +// Annotate a variable as thread-local +#define mlib_thread_local MLIB_IF_GNU_LIKE (__thread) MLIB_IF_MSVC (__declspec (thread)) + +// Annotate an entiry that might be unused +#define mlib_maybe_unused MLIB_IF_GNU_LIKE (__attribute__ ((unused))) + +// clang-format off +/** + * @brief Expand to `1` if the current build configuration matches the given token. + * + * If the token is not a known valid build configuration, generates a compilation + * error (check your spelling!) + * + * Requires that `_MLIB_BUILD_CONFIG` is defined, otherwise always expands to `0` + */ +#define mlib_build_config_is(Config) \ + /* If `Config` is a recognized config, this line will disappear, */ \ + /* other wise it will be a "call to undefined macro": */ \ + MLIB_PASTE_4 (_mlibTestBuildConfig_, Config, _, Config) () \ + /* If `Config` is the same token as `_MLIB_BUILD_CONFIG`, this will */ \ + /* expand to `1`, otherwise it will expand to `0` */ \ + MLIB_IS_EMPTY (MLIB_PASTE_4 (_mlibTestBuildConfig_, Config, _, _MLIB_BUILD_CONFIG) ()) +// clang-format on +// Known build configurations: +#define _mlibTestBuildConfig_Release_Release() +#define _mlibTestBuildConfig_Debug_Debug() +#define _mlibTestBuildConfig_RelWithDebInfo_RelWithDebInfo() +#define _mlibTestBuildConfig_MinSizeRel_MinSizeRel() + +/** + * @brief Emit a _Pragma that will disable warnings about the use of deprecated entities. + */ +#define mlib_disable_deprecation_warnings() \ + mlib_gnu_warning_disable ("-Wdeprecated-declarations"); \ + mlib_msvc_warning (disable : 4996) + +/** + * @brief Function-like macro that expands to `1` if we are certain that we are + * compiling with optimizations enabled. + * + * This may yield `0` if we cannot determine whether optimization is turned on. + * + * This macro should be used with care, as different translation units can see different values, + * but still be linked together in the final program. Beware generating ODR violations. + */ +#define mlib_is_optimized_build() _mlibIsOptimizedBuild () + +#if mlib_build_config_is(Release) || mlib_build_config_is(RelWithDebInfo) || mlib_build_config_is(MinSizeRel) || \ + (defined(__OPTIMIZE__) && __OPTIMIZE__) +// Preproc definition __OPTIMIZE__set by GCC ang Clang when the optimizer is enabled. +// MSVC has no such definition, so we rely on CMake to tell us when we are compiling in release mode +#define _mlibIsOptimizedBuild() 1 +#else +#define _mlibIsOptimizedBuild() 0 +#endif + +#if mlib_is_gnu_like() +#define mlib_have_typeof() 1 +#elif defined _MSC_VER && _MSC_VER >= 1939 && !__cplusplus +// We can __typeof__ in MSVC 19.39+ +#define mlib_have_typeof() 1 +#else +#define mlib_have_typeof() 0 +#endif + +/** + * @brief Equivalent to C23's `typeof()`, if it is supported by the current compiler. + * + * This expands to `__typeof__`, which is supported even on newer MSVC compilers, + * even when not in C23 mode. + */ +#define mlib_typeof(...) MLIB_IF_ELSE (mlib_have_typeof ()) (__typeof__) (__mlib_typeof_is_not_supported) (__VA_ARGS__) + +#endif // MLIB_CONFIG_H_INCLUDED diff -pruN 1.30.4-1/src/common/src/mlib/intencode.h 2.0.2-1/src/common/src/mlib/intencode.h --- 1.30.4-1/src/common/src/mlib/intencode.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/intencode.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,167 @@ +/** + * @file mlib/intencode.h + * @brief Integer encoding functions + * @date 2025-01-31 + * + * @copyright Copyright (c) 2025 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#pragma once + +#include +#include + +#include +#include + +/** + * @brief Decode an unsigned 32-bit little-endian integer from a memory buffer + */ +static inline uint32_t +mlib_read_u32le (const void *buf) +{ + uint32_t ret = 0; + if (mlib_is_little_endian ()) { + // Optimize: The platform uses a LE encoding already + memcpy (&ret, buf, sizeof ret); + } else { + // Portable decode of an LE integer + const uint8_t *cptr = (const uint8_t *) buf; + mlib_foreach_urange (i, sizeof ret) { + ret <<= 8; + ret |= cptr[(sizeof ret) - i - 1]; + } + } + return ret; +} + +/** + * @brief Decode an signed 32-bit little-endian integer from a memory buffer + */ +static inline int32_t +mlib_read_i32le (const void *buf) +{ + const uint32_t u = mlib_read_u32le (buf); + int32_t r; + memcpy (&r, &u, sizeof r); + return r; +} + +/** + * @brief Decode an unsigned 64-bit little-endian integer from a memory buffer + */ +static inline uint64_t +mlib_read_u64le (const void *buf) +{ + uint64_t ret = 0; + if (mlib_is_little_endian ()) { + // Optimize: The platform uses a LE encoding already + memcpy (&ret, buf, sizeof ret); + } else { + // Portable decode of an LE integer + const uint8_t *cptr = (const uint8_t *) buf; + mlib_foreach_urange (i, sizeof ret) { + ret <<= 8; + ret |= cptr[(sizeof ret) - i - 1]; + } + } + return ret; +} + +/** + * @brief Decode an signed 64-bit little-endian integer from a memory buffer + */ +static inline int64_t +mlib_read_i64le (const void *buf) +{ + const uint64_t u = mlib_read_u64le (buf); + int64_t r; + memcpy (&r, &u, sizeof r); + return r; +} + +/** + * @brief Write an unsigned 32-bit little-endian integer into a destination + * + * @return void* The address after the written value + */ +static inline void * +mlib_write_u32le (void *out, const uint32_t value) +{ + uint8_t *o = (uint8_t *) out; + if (mlib_is_little_endian ()) { + memcpy (o, &value, sizeof value); + return o + sizeof value; + } + mlib_foreach_urange (i, sizeof value) { + *o++ = (value >> (8u * i)) & 0xffu; + } + return o; +} + +/** + * @brief Write a signed 32-bit little-endian integer into a destination + * + * @return void* The address after the written value + */ +static inline void * +mlib_write_i32le (void *out, int32_t value) +{ + return mlib_write_u32le (out, (uint32_t) value); +} + +/** + * @brief Write an unsigned 64-bit little-endian integer into a destination + * + * @return void* The address after the written value + */ +static inline void * +mlib_write_u64le (void *out, const uint64_t value) +{ + uint8_t *o = (uint8_t *) out; + if (mlib_is_little_endian ()) { + memcpy (o, &value, sizeof value); + return o + sizeof value; + } + mlib_foreach_urange (i, sizeof value) { + *o++ = (value >> (8u * i)) & 0xffu; + } + return o; +} + +/** + * @brief Write an signed 64-bit little-endian integer into a destination + * + * @return void* The address after the written value + */ +static inline void * +mlib_write_i64le (void *out, int64_t value) +{ + return mlib_write_u64le (out, (uint64_t) value); +} + +/** + * @brief Write a little-endian 64-bit floating point (double) to the given + * memory location + * + * @return void* The address after the written value. + */ +static inline void * +mlib_write_f64le (void *out, double d) +{ + mlib_static_assert (sizeof (double) == sizeof (uint64_t)); + uint64_t bits; + memcpy (&bits, &d, sizeof d); + return mlib_write_u64le (out, bits); +} diff -pruN 1.30.4-1/src/common/src/mlib/intutil.h 2.0.2-1/src/common/src/mlib/intutil.h --- 1.30.4-1/src/common/src/mlib/intutil.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/intutil.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,93 @@ +/** + * @file mlib/intutil.h + * @brief Integer utilities + * @date 2025-01-28 + * + * @copyright Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MLIB_INTUTIL_H_INCLUDED +#define MLIB_INTUTIL_H_INCLUDED + +#include +#include +#include + +/** + * @brief Given an integral type, evaluates to `true` if that type is signed, + * otherwise `false` + */ +#define mlib_is_signed(T) (!((T) (-1) > 0)) + +// clang-format off +/** + * @brief Given an integral type, yield an integral constant value representing + * the maximal value of that type. + */ +#define mlib_maxof(T) \ + ((T) (mlib_is_signed (T) \ + ? ((T) ((((T) 1 << (sizeof (T) * CHAR_BIT - 2)) - 1) * 2 + 1)) \ + : ((T) ~(T) 0))) + +/** + * @brief Given an integral type, yield an integral constant value for the + * minimal value of that type. + */ +#define mlib_minof(T) \ + ((T) (!mlib_is_signed (T) \ + ? (T) 0 \ + : (T) (-((((T) 1 << (sizeof (T) * CHAR_BIT - 2)) - 1) * 2 + 1) - 1))) +// clang-format on + +/** + * @brief A container for an integer that has been "scaled up" to maximum precision + * + * Don't create this manually. Instead, use `mlib_upsize_integer` to do it automatically + */ +typedef struct mlib_upsized_integer { + union { + // The signed value of the integer + intmax_t s; + // The unsigned value of the integer + uintmax_t u; + } i; + // Whether the upscaled integer is stored in the signed field or the unsigned field + bool is_signed; +} mlib_upsized_integer; + +// clang-format off +/** + * @brief Create an "upsized" version of an integer, normalizing all integral + * values into a single type so that we can deduplicate functions that operate + * on disparate integer types. + * + * Details: The integer is upcast into the maximum precision integer type (intmax_t). If + * the operand is smaller than `intmax_t`, we assume that casting to the signed `intmax_t` + * is always safe, even if the operand is unsigned, since e.g. a u32 can always be cast to + * an i64 losslessly. + * + * If the integer to upcast is the same size as `intmax_t`, we need to decide whether to store + * it as unsigned. The expression `(0 & Value) - 1 < 0` will be `true` iff the operand is signed, + * otherwise false. If the operand is signed, we can safely cast to `intmax_t` (it probably already + * is of that type), otherwise, we can to `uintmax_t` and the returned `mlib_upsized_integer` will + * indicate that the stored value is unsigned. + */ +#define mlib_upsize_integer(Value) \ + /* NOLINTNEXTLINE(bugprone-sizeof-expression) */ \ + ((sizeof ((Value)) < sizeof (intmax_t) || ((0 & (Value)) - 1) < 0) \ + ? mlib_init(mlib_upsized_integer) {{(intmax_t) (Value)}, true} \ + : mlib_init(mlib_upsized_integer) {{(intmax_t) (uintmax_t) (Value)}}) +// clang-format on + +#endif // MLIB_INTUTIL_H_INCLUDED diff -pruN 1.30.4-1/src/common/src/mlib/loop.h 2.0.2-1/src/common/src/mlib/loop.h --- 1.30.4-1/src/common/src/mlib/loop.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/loop.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,165 @@ +/** + * @file mlib/loop.h + * @brief Looping utility macros + * @date 2025-01-29 + * + * @copyright Copyright (c) 2025 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#ifndef MLIB_LOOP_H_INCLUDED +#define MLIB_LOOP_H_INCLUDED + +#include + +#include +#include // u/intmax_t + +/** + * @brief Begin a loop over a range of integer values. Supports: + * + * - `mlib_foreach_{u,i}range(Var, Stop)` + * - `mlib_foreach_{u,i}range(Var, Start, Stop)` + * + * If omitted, starts at zero. The loop does not include the `Stop` value. The `Var` + * variable cannot be modified within the loop. The loop variable is declared as the maximum + * precision type for the requested signedness. + */ +#define mlib_foreach_urange(...) MLIB_ARGC_PICK (_mlib_foreach_urange, __VA_ARGS__) +#define mlib_foreach_irange(...) MLIB_ARGC_PICK (_mlib_foreach_irange, __VA_ARGS__) +#define _mlib_foreach_urange_argc_2(VarName, Stop) _mlib_foreach_urange_argc_3 (VarName, 0, Stop) +#define _mlib_foreach_urange_argc_3(VarName, Start, Stop) \ + _mlibForeachRange (uintmax_t, \ + VarName, \ + Start, \ + Stop, \ + MLIB_PASTE (VarName, _start), \ + MLIB_PASTE (VarName, _stop), \ + MLIB_PASTE (VarName, _counter)) +#define _mlib_foreach_irange_argc_2(VarName, Stop) _mlib_foreach_irange_argc_3 (VarName, 0, Stop) +#define _mlib_foreach_irange_argc_3(VarName, Start, Stop) \ + _mlibForeachRange (intmax_t, \ + VarName, \ + Start, \ + Stop, \ + MLIB_PASTE (VarName, _start), \ + MLIB_PASTE (VarName, _stop), \ + MLIB_PASTE (VarName, _counter)) + +/** + * @brief Loop over a pointed-to array + * + * @param T The type of the array elements + * @param Var Identifier to declare as the pointer to the current element + * @param ArrayPtr A pointer to the beginning of the array + * @param Count The number of elements in the array + */ +#define mlib_foreach(T, Var, ArrayPtr, Count) \ + _mlibForeach (T, Var, ArrayPtr, Count, MLIB_PASTE (Var, _start), MLIB_PASTE (Var, _stop), MLIB_PASTE (Var, _iter)) +/** + * @brief Loop over the elements of a C array + * + * @param T the type of the array elements + * @param Var Identifier to declare as the pointer to the current element + * @param Array An expression of array type (not a pointer) + */ +#define mlib_foreach_arr(T, Var, Array) mlib_foreach (T, Var, Array, (sizeof Array / sizeof Array[0])) + +// clang-format off +#define _mlibForeachRange(VarType, VarName, StartValue, StopValue, StartVar, StopVar, Counter) \ + _mlibLoopMagicBegin() \ + /* Capture the starting and stopping value first */ \ + for (VarType StartVar = (StartValue), StopVar = (StopValue); !_mlibLoopIsDone;) \ + _mlibLoopMagicEnd( \ + /* Init counter to the start value */ \ + VarType Counter = StartVar, \ + /* Stop when the counter is not less than the stop value */ \ + (_mlibLoopState.first = Counter == StartVar, \ + _mlibLoopState.last = Counter + 1 == StopVar, \ + Counter < StopVar), \ + /* Increment the counter at loop end */ \ + ++Counter, \ + /* Declare the loop variable as const at the start of each iteraiton */ \ + const VarType VarName = Counter) + +#define _mlibForeach(T, VarName, ArrayPtr, Count, StartVar, StopVar, Iter) \ + _mlibLoopMagicBegin() \ + /* Capture the starting and stopping position so we only evaluate them once */ \ + for (T* const StartVar = (ArrayPtr) + 0; !_mlibLoopIsDone;) \ + for (T* const StopVar = StartVar + (Count); !_mlibLoopIsDone;) \ + _mlibLoopMagicEnd( \ + /* Init the iteration pointer to the array start */ \ + T* Iter = StartVar, \ + /* Stop when the iterator points to the stop position */ \ + (_mlibLoopState.first = Iter == StartVar, \ + _mlibLoopState.last = Iter + 1 == StopVar, \ + Iter != StopVar), \ + /* Advance the iterator on each loop */ \ + ++Iter, \ + /* Declare a constant pointer to the current element at the top of the loop */ \ + T* const VarName = Iter) + + +#define _mlibLoopDidBreak MLIB_PASTE(_mlibLoopDidBreak_lno_, __LINE__) +#define _mlibLoopOnce MLIB_PASTE(_mlibLoopOnce_lno_, __LINE__) +#define _mlibLoopIsDone MLIB_PASTE(_mlibLoopIsDone_lno_, __LINE__) +#define _mlibLoopIsState MLIB_PASTE(_mlibLoopIsState_lno_, __LINE__) +#define _mlibLoopMagicBegin() \ + /* Loop stop condition */ \ + for (int _mlibLoopIsDone = 0; !_mlibLoopIsDone;) \ + /* Track if the user broke out of the inner loop */ \ + for (int _mlibLoopDidBreak = 0; !_mlibLoopIsDone;) \ + /* Loop variables */ \ + for (struct mlib_loop_state _mlibLoopState = {0, 0, 0}; !_mlibLoopIsDone;) + +/** + * @brief Struct type declared within the scope of an `mlib_foreach` loop, which + * contains information about the running loop. + */ +struct mlib_loop_state { + // The current zero-based index of the loop + size_t index; + // Whether the current iteration is the first in the loop + bool first; + // Whether the current iteration will be the last in the loop + bool last; +}; + +/// InitStmt: Statement that executes once at the top of the loop +/// ContinueCond: Condition at which the loop will stop +/// StepExpr: Expression for the loop step +/// HeadStmt: A statement that appears at the head of the loop, executed once on each iteration +#define _mlibLoopMagicEnd(InitStmt, ContinueCond, StepExpr, HeadStmt) \ + for (\ + /* Run the init statement */ \ + InitStmt; \ + /* Test the loop condition, unless we `break` out of the loop */ \ + !(_mlibLoopIsDone = _mlibLoopIsDone || !(ContinueCond)); \ + /* Run the step expression, unless we `break` from the loop */ \ + (void)(_mlibLoopIsDone || ((void)(StepExpr), 1))) \ + /* `break` detection: */ \ + for (int _mlibLoopOnce = 0; !_mlibLoopOnce; _mlibLoopOnce = 1, _mlibLoopIsDone = _mlibLoopDidBreak) \ + /* Loop state information */ \ + for (const struct mlib_loop_state loop = _mlibLoopState; \ + !_mlibLoopOnce; \ + ((void)loop, _mlibLoopOnce = 1, ++_mlibLoopState.index)) \ + for (HeadStmt; \ + /* Set `_mlibLoopDidBreak` to true at the start of the loop: */ \ + !_mlibLoopOnce && (_mlibLoopDidBreak = 1); \ + /* If loop exits normally, set `_mlibLoopDidBreak` to false */ \ + _mlibLoopDidBreak = 0, _mlibLoopOnce = 1) + + +// clang-format on + +#endif // MLIB_LOOP_H_INCLUDED diff -pruN 1.30.4-1/src/common/src/mlib/test.h 2.0.2-1/src/common/src/mlib/test.h --- 1.30.4-1/src/common/src/mlib/test.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/src/mlib/test.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,247 @@ +/** + * @file mlib/test.h + * @brief Testing utilities + * @date 2025-01-30 + * + * @copyright Copyright (c) 2025 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#pragma once + +#include +#include +#include + +#include +#include +#include +#include + +/** + * @brief Place this macro at the head of a (compound) statement to assert that + * executing that statement aborts the program with SIGABRT. + * + * Internally, this will fork the calling process and wait for the child process + * to terminate. It asserts that the child exits abnormally with SIGABRT. This + * test assertion is a no-op on Win32, since it does not have a suitable `fork` + * API. + * + * Beware that the child process runs in a forked environment, so it is not + * safe to use any non-fork-safe functionality, and any modifications to program + * state will not be visible in the parent. Behavior of attempting to escape the + * statement (goto/return) is undefined. + * + * If the child process does not abort, it will call `_Exit(71)` to indicate + * to the parent that it did not terminate (the number 71 is chosen arbitrarily) + * + * If the token `debug` is passed as a macro argument, then the forking behavior + * is suppressed, allowing for easier debugging of the statement. + */ +#define mlib_assert_aborts(...) MLIB_PASTE_3 (_mlibAssertAbortsStmt, _, __VA_ARGS__) () + +#ifndef _WIN32 +#include +#include +#define _mlibAssertAbortsStmt_() \ + for (int once = 1, other_pid = fork (); once; once = 0) \ + for (; once; once = 0) \ + if (other_pid != 0) { \ + /* We are the parent */ \ + int wstatus; \ + waitpid (other_pid, &wstatus, 0); \ + if (WIFEXITED (wstatus)) { \ + /* Normal exit! */ \ + _mlib_stmt_did_not_abort (__FILE__, MLIB_FUNC, __LINE__, WEXITSTATUS (wstatus)); \ + } else if (WIFSIGNALED (wstatus)) { \ + /* Signalled */ \ + if (WTERMSIG (wstatus) != SIGABRT) { \ + fprintf (stderr, \ + "%s:%d: [%s]: Child process did not exit with SIGABRT! (Exited %d)\n", \ + __FILE__, \ + __LINE__, \ + MLIB_FUNC, \ + WTERMSIG (wstatus)); \ + fflush (stderr); \ + abort (); \ + } \ + } \ + } else /* We are the child */ \ + if ((fclose (stderr), 1)) \ + for (;; _Exit (71)) \ + for (;; _Exit (71)) /* Double loop to prevent the block from `break`ing out */ + +#else +#define _mlibAssertAbortsStmt_() \ + if (1) { \ + } else +#endif + +// Called when an assert-aborts statement does not terminate +static inline void +_mlib_stmt_did_not_abort (const char *file, const char *func, int line, int rc) +{ + /* Normal exit! */ + if (rc == 71) { + fprintf (stderr, "%s:%d: [%s]: Test case did not abort. The statement completed normally.\n", file, line, func); + } else { + fprintf (stderr, "%s:%d: [%s]: Test case did not abort (Exited %d)\n", file, line, func, rc); + } + fflush (stderr); + abort (); +} + +#define _mlibAssertAbortsStmt_debug() \ + for (;; _mlib_stmt_did_not_abort (__FILE__, MLIB_FUNC, __LINE__, -1)) \ + for (;; _mlib_stmt_did_not_abort (__FILE__, MLIB_FUNC, __LINE__, -1)) + +/** + * @brief Aggregate type that holds information about a source location + */ +typedef struct mlib_source_location { + const char *file; + int lineno; + const char *func; +} mlib_source_location; + +/** + * @brief Expands to an `mlib_source_location` for the location in which the macro is expanded + */ +#define mlib_this_source_location() (mlib_init (mlib_source_location){(__FILE__), (__LINE__), (MLIB_FUNC)}) +// ↑ The paren wrapping is required on VS2017 to prevent it from deleting the preceding comma (?!) + +/** + * @brief Evaluate a check, aborting with a diagnostic if that check fails + * + * Can be called with one argument to test a single boolean condition, or three + * arguments for more useful diagnostics with an infix operator. + */ +#define mlib_check(...) MLIB_ARGC_PICK (_mlib_check, #__VA_ARGS__, __VA_ARGS__) +// One arg: +#define _mlib_check_argc_2(ArgString, Condition) \ + _mlibCheckConditionSimple (Condition, ArgString, mlib_this_source_location ()) +// Three args: +#define _mlib_check_argc_4(ArgString, A, Operator, B) \ + MLIB_NOTHING (#A, #B) MLIB_PASTE (_mlibCheckCondition_, Operator) (A, B) +// String-compare: +#define _mlibCheckCondition_str_eq(A, B) _mlibCheckStrEq (A, B, #A, #B, mlib_this_source_location ()) +// Pointer-compare: +#define _mlibCheckCondition_ptr_eq(A, B) _mlibCheckPtrEq (A, B, #A, #B, mlib_this_source_location ()) +// Integer-equal: +#define _mlibCheckCondition_eq(A, B) \ + _mlibCheckIntCmp ( \ + mlib_equal, true, "==", mlib_upsize_integer (A), mlib_upsize_integer (B), #A, #B, mlib_this_source_location ()) +// Integer not-equal: +#define _mlibCheckCondition_neq(A, B) \ + _mlibCheckIntCmp ( \ + mlib_equal, false, "!=", mlib_upsize_integer (A), mlib_upsize_integer (B), #A, #B, mlib_this_source_location ()) + +/// Check evaluator when given a single boolean +static inline void +_mlibCheckConditionSimple (bool c, const char *expr, struct mlib_source_location here) +{ + if (!c) { + fprintf (stderr, "%s:%d: in [%s]: Check condition ⟨%s⟩ failed\n", here.file, here.lineno, here.func, expr); + fflush (stderr); + abort (); + } +} + +// Implement integer comparison checks +static inline void +_mlibCheckIntCmp (enum mlib_cmp_result cres, // The cmp result to check + bool cond, // Whether we expect the cmp result to match `cres` + const char *operator_str, + struct mlib_upsized_integer left, + struct mlib_upsized_integer right, + const char *left_expr, + const char *right_expr, + struct mlib_source_location here) +{ + if (((mlib_cmp) (left, right, 0) == cres) != cond) { + fprintf (stderr, + "%s:%d: in [%s]: Check [⟨%s⟩ %s ⟨%s⟩] failed:\n", + here.file, + here.lineno, + here.func, + left_expr, + operator_str, + right_expr); + fprintf (stderr, " "); + if (left.is_signed) { + fprintf (stderr, "%lld", (long long) left.i.s); + } else { + fprintf (stderr, "%llu", (unsigned long long) left.i.u); + } + fprintf (stderr, " ⟨%s⟩\n", left_expr); + fprintf (stderr, " "); + if (right.is_signed) { + fprintf (stderr, "%lld", (long long) right.i.s); + } else { + fprintf (stderr, "%llu", (unsigned long long) right.i.u); + } + fprintf (stderr, " ⟨%s⟩\n", right_expr); + fflush (stderr); + abort (); + } +} + +// Pointer-comparison +static inline void +_mlibCheckPtrEq ( + const void *left, const void *right, const char *left_expr, const char *right_expr, struct mlib_source_location here) +{ + if (left != right) { + fprintf (stderr, + "%s:%d: in [%s]: Check [⟨%s⟩ pointer-equal ⟨%s⟩] failed:\n", + here.file, + here.lineno, + here.func, + left_expr, + right_expr); + fprintf (stderr, + " %p ⟨%s⟩\n" + " ≠ %p ⟨%s⟩\n", + left, + left_expr, + right, + right_expr); + fflush (stderr); + abort (); + } +} + +// String-comparison +static inline void +_mlibCheckStrEq ( + const char *left, const char *right, const char *left_expr, const char *right_expr, struct mlib_source_location here) +{ + if (strcmp (left, right)) { + fprintf (stderr, + "%s:%d: in [%s]: Check [⟨%s⟩ str-equal ⟨%s⟩] failed:\n", + here.file, + here.lineno, + here.func, + left_expr, + right_expr); + fprintf (stderr, + " “%s” ⟨%s⟩\n" + " ≠ “%s” ⟨%s⟩\n", + left, + left_expr, + right, + right_expr); + fflush (stderr); + abort (); + } +} diff -pruN 1.30.4-1/src/common/tests/test-common-cmp.c 2.0.2-1/src/common/tests/test-common-cmp.c --- 1.30.4-1/src/common/tests/test-common-cmp.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/common/tests/test-common-cmp.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,308 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "TestSuite.h" - -#include - -static void -test_mcommon_cmp_equal (void) -{ - ASSERT (mcommon_cmp_equal_ss (0, 0)); - ASSERT (!mcommon_cmp_equal_ss (0, -1)); - ASSERT (!mcommon_cmp_equal_ss (0, 1)); - ASSERT (!mcommon_cmp_equal_ss (-1, 0)); - ASSERT (mcommon_cmp_equal_ss (-1, -1)); - ASSERT (!mcommon_cmp_equal_ss (-1, 1)); - ASSERT (!mcommon_cmp_equal_ss (1, 0)); - ASSERT (!mcommon_cmp_equal_ss (1, -1)); - ASSERT (mcommon_cmp_equal_ss (1, 1)); - - ASSERT (mcommon_cmp_equal_uu (0u, 0u)); - ASSERT (!mcommon_cmp_equal_uu (0u, 1u)); - ASSERT (!mcommon_cmp_equal_uu (1u, 0u)); - ASSERT (mcommon_cmp_equal_uu (1u, 1u)); - - ASSERT (mcommon_cmp_equal_su (0, 0u)); - ASSERT (!mcommon_cmp_equal_su (0, 1u)); - ASSERT (!mcommon_cmp_equal_su (-1, 0u)); - ASSERT (!mcommon_cmp_equal_su (-1, 1u)); - ASSERT (!mcommon_cmp_equal_su (1, 0u)); - ASSERT (mcommon_cmp_equal_su (1, 1u)); - - ASSERT (mcommon_cmp_equal_us (0u, 0)); - ASSERT (!mcommon_cmp_equal_us (0u, -1)); - ASSERT (!mcommon_cmp_equal_us (0u, 1)); - ASSERT (!mcommon_cmp_equal_us (1u, 0)); - ASSERT (!mcommon_cmp_equal_us (1u, -1)); - ASSERT (mcommon_cmp_equal_us (1u, 1)); -} - -static void -test_mcommon_cmp_not_equal (void) -{ - ASSERT (!mcommon_cmp_not_equal_ss (0, 0)); - ASSERT (mcommon_cmp_not_equal_ss (0, -1)); - ASSERT (mcommon_cmp_not_equal_ss (0, 1)); - ASSERT (mcommon_cmp_not_equal_ss (-1, 0)); - ASSERT (!mcommon_cmp_not_equal_ss (-1, -1)); - ASSERT (mcommon_cmp_not_equal_ss (-1, 1)); - ASSERT (mcommon_cmp_not_equal_ss (1, 0)); - ASSERT (mcommon_cmp_not_equal_ss (1, -1)); - ASSERT (!mcommon_cmp_not_equal_ss (1, 1)); - - ASSERT (!mcommon_cmp_not_equal_uu (0u, 0u)); - ASSERT (mcommon_cmp_not_equal_uu (0u, 1u)); - ASSERT (mcommon_cmp_not_equal_uu (1u, 0u)); - ASSERT (!mcommon_cmp_not_equal_uu (1u, 1u)); - - ASSERT (!mcommon_cmp_not_equal_su (0, 0u)); - ASSERT (mcommon_cmp_not_equal_su (0, 1u)); - ASSERT (mcommon_cmp_not_equal_su (-1, 0u)); - ASSERT (mcommon_cmp_not_equal_su (-1, 1u)); - ASSERT (mcommon_cmp_not_equal_su (1, 0u)); - ASSERT (!mcommon_cmp_not_equal_su (1, 1u)); - - ASSERT (!mcommon_cmp_not_equal_us (0u, 0)); - ASSERT (mcommon_cmp_not_equal_us (0u, -1)); - ASSERT (mcommon_cmp_not_equal_us (0u, 1)); - ASSERT (mcommon_cmp_not_equal_us (1u, 0)); - ASSERT (mcommon_cmp_not_equal_us (1u, -1)); - ASSERT (!mcommon_cmp_not_equal_us (1u, 1)); -} - -static void -test_mcommon_cmp_less (void) -{ - ASSERT (!mcommon_cmp_less_ss (0, 0)); - ASSERT (!mcommon_cmp_less_ss (0, -1)); - ASSERT (mcommon_cmp_less_ss (0, 1)); - ASSERT (mcommon_cmp_less_ss (-1, 0)); - ASSERT (!mcommon_cmp_less_ss (-1, -1)); - ASSERT (mcommon_cmp_less_ss (-1, 1)); - ASSERT (!mcommon_cmp_less_ss (1, 0)); - ASSERT (!mcommon_cmp_less_ss (1, -1)); - ASSERT (!mcommon_cmp_less_ss (1, 1)); - - ASSERT (!mcommon_cmp_less_uu (0u, 0u)); - ASSERT (mcommon_cmp_less_uu (0u, 1u)); - ASSERT (!mcommon_cmp_less_uu (1u, 0u)); - ASSERT (!mcommon_cmp_less_uu (1u, 1u)); - - ASSERT (!mcommon_cmp_less_su (0, 0u)); - ASSERT (mcommon_cmp_less_su (0, 1u)); - ASSERT (mcommon_cmp_less_su (-1, 0u)); - ASSERT (mcommon_cmp_less_su (-1, 1u)); - ASSERT (!mcommon_cmp_less_su (1, 0u)); - ASSERT (!mcommon_cmp_less_su (1, 1u)); - - ASSERT (!mcommon_cmp_less_us (0u, 0)); - ASSERT (!mcommon_cmp_less_us (0u, -1)); - ASSERT (mcommon_cmp_less_us (0u, 1)); - ASSERT (!mcommon_cmp_less_us (1u, 0)); - ASSERT (!mcommon_cmp_less_us (1u, -1)); - ASSERT (!mcommon_cmp_less_us (1u, 1)); -} - -static void -test_mcommon_cmp_greater (void) -{ - ASSERT (!mcommon_cmp_greater_ss (0, 0)); - ASSERT (mcommon_cmp_greater_ss (0, -1)); - ASSERT (!mcommon_cmp_greater_ss (0, 1)); - ASSERT (!mcommon_cmp_greater_ss (-1, 0)); - ASSERT (!mcommon_cmp_greater_ss (-1, -1)); - ASSERT (!mcommon_cmp_greater_ss (-1, 1)); - ASSERT (mcommon_cmp_greater_ss (1, 0)); - ASSERT (mcommon_cmp_greater_ss (1, -1)); - ASSERT (!mcommon_cmp_greater_ss (1, 1)); - - ASSERT (!mcommon_cmp_greater_uu (0u, 0u)); - ASSERT (!mcommon_cmp_greater_uu (0u, 1u)); - ASSERT (mcommon_cmp_greater_uu (1u, 0u)); - ASSERT (!mcommon_cmp_greater_uu (1u, 1u)); - - ASSERT (!mcommon_cmp_greater_su (0, 0u)); - ASSERT (!mcommon_cmp_greater_su (0, 1u)); - ASSERT (!mcommon_cmp_greater_su (-1, 0u)); - ASSERT (!mcommon_cmp_greater_su (-1, 1u)); - ASSERT (mcommon_cmp_greater_su (1, 0u)); - ASSERT (!mcommon_cmp_greater_su (1, 1u)); - - ASSERT (!mcommon_cmp_greater_us (0u, 0)); - ASSERT (mcommon_cmp_greater_us (0u, -1)); - ASSERT (!mcommon_cmp_greater_us (0u, 1)); - ASSERT (mcommon_cmp_greater_us (1u, 0)); - ASSERT (mcommon_cmp_greater_us (1u, -1)); - ASSERT (!mcommon_cmp_greater_us (1u, 1)); -} - -static void -test_mcommon_cmp_less_equal (void) -{ - ASSERT (mcommon_cmp_less_equal_ss (0, 0)); - ASSERT (!mcommon_cmp_less_equal_ss (0, -1)); - ASSERT (mcommon_cmp_less_equal_ss (0, 1)); - ASSERT (mcommon_cmp_less_equal_ss (-1, 0)); - ASSERT (mcommon_cmp_less_equal_ss (-1, -1)); - ASSERT (mcommon_cmp_less_equal_ss (-1, 1)); - ASSERT (!mcommon_cmp_less_equal_ss (1, 0)); - ASSERT (!mcommon_cmp_less_equal_ss (1, -1)); - ASSERT (mcommon_cmp_less_equal_ss (1, 1)); - - ASSERT (mcommon_cmp_less_equal_uu (0u, 0u)); - ASSERT (mcommon_cmp_less_equal_uu (0u, 1u)); - ASSERT (!mcommon_cmp_less_equal_uu (1u, 0u)); - ASSERT (mcommon_cmp_less_equal_uu (1u, 1u)); - - ASSERT (mcommon_cmp_less_equal_su (0, 0u)); - ASSERT (mcommon_cmp_less_equal_su (0, 1u)); - ASSERT (mcommon_cmp_less_equal_su (-1, 0u)); - ASSERT (mcommon_cmp_less_equal_su (-1, 1u)); - ASSERT (!mcommon_cmp_less_equal_su (1, 0u)); - ASSERT (mcommon_cmp_less_equal_su (1, 1u)); - - ASSERT (mcommon_cmp_less_equal_us (0u, 0)); - ASSERT (!mcommon_cmp_less_equal_us (0u, -1)); - ASSERT (mcommon_cmp_less_equal_us (0u, 1)); - ASSERT (!mcommon_cmp_less_equal_us (1u, 0)); - ASSERT (!mcommon_cmp_less_equal_us (1u, -1)); - ASSERT (mcommon_cmp_less_equal_us (1u, 1)); -} - -static void -test_mcommon_cmp_greater_equal (void) -{ - ASSERT (mcommon_cmp_greater_equal_ss (0, 0)); - ASSERT (mcommon_cmp_greater_equal_ss (0, -1)); - ASSERT (!mcommon_cmp_greater_equal_ss (0, 1)); - ASSERT (!mcommon_cmp_greater_equal_ss (-1, 0)); - ASSERT (mcommon_cmp_greater_equal_ss (-1, -1)); - ASSERT (!mcommon_cmp_greater_equal_ss (-1, 1)); - ASSERT (mcommon_cmp_greater_equal_ss (1, 0)); - ASSERT (mcommon_cmp_greater_equal_ss (1, -1)); - ASSERT (mcommon_cmp_greater_equal_ss (1, 1)); - - ASSERT (mcommon_cmp_greater_equal_uu (0u, 0u)); - ASSERT (!mcommon_cmp_greater_equal_uu (0u, 1u)); - ASSERT (mcommon_cmp_greater_equal_uu (1u, 0u)); - ASSERT (mcommon_cmp_greater_equal_uu (1u, 1u)); - - ASSERT (mcommon_cmp_greater_equal_su (0, 0u)); - ASSERT (!mcommon_cmp_greater_equal_su (0, 1u)); - ASSERT (!mcommon_cmp_greater_equal_su (-1, 0u)); - ASSERT (!mcommon_cmp_greater_equal_su (-1, 1u)); - ASSERT (mcommon_cmp_greater_equal_su (1, 0u)); - ASSERT (mcommon_cmp_greater_equal_su (1, 1u)); - - ASSERT (mcommon_cmp_greater_equal_us (0u, 0)); - ASSERT (mcommon_cmp_greater_equal_us (0u, -1)); - ASSERT (!mcommon_cmp_greater_equal_us (0u, 1)); - ASSERT (mcommon_cmp_greater_equal_us (1u, 0)); - ASSERT (mcommon_cmp_greater_equal_us (1u, -1)); - ASSERT (mcommon_cmp_greater_equal_us (1u, 1)); -} - -/* Sanity check: ensure ssize_t limits are as expected relative to size_t. */ -BSON_STATIC_ASSERT2 (ssize_t_size_min_check, SSIZE_MIN + 1 == -SSIZE_MAX); -BSON_STATIC_ASSERT2 (ssize_t_size_max_check, (size_t) SSIZE_MAX <= SIZE_MAX); - -static void -test_mcommon_in_range (void) -{ - const int64_t int8_min = INT8_MIN; - const int64_t int8_max = INT8_MAX; - const int64_t int32_min = INT32_MIN; - const int64_t int32_max = INT32_MAX; - - const uint64_t uint8_max = UINT8_MAX; - const uint64_t uint32_max = UINT32_MAX; - - const ssize_t ssize_min = SSIZE_MIN; - const ssize_t ssize_max = SSIZE_MAX; - - ASSERT (!mcommon_in_range_signed (int8_t, int8_min - 1)); - ASSERT (mcommon_in_range_signed (int8_t, int8_min)); - ASSERT (mcommon_in_range_signed (int8_t, 0)); - ASSERT (mcommon_in_range_signed (int8_t, int8_max)); - ASSERT (!mcommon_in_range_signed (int8_t, int8_max + 1)); - - ASSERT (mcommon_in_range_unsigned (int8_t, 0u)); - ASSERT (mcommon_in_range_unsigned (int8_t, (uint64_t) int8_max)); - ASSERT (!mcommon_in_range_unsigned (int8_t, (uint64_t) (int8_max + 1))); - - ASSERT (!mcommon_in_range_signed (uint8_t, int8_min - 1)); - ASSERT (!mcommon_in_range_signed (uint8_t, int8_min)); - ASSERT (mcommon_in_range_signed (uint8_t, 0)); - ASSERT (mcommon_in_range_signed (uint8_t, int8_max)); - ASSERT (mcommon_in_range_signed (uint8_t, int8_max + 1)); - ASSERT (mcommon_in_range_signed (uint8_t, (int64_t) uint8_max)); - ASSERT (!mcommon_in_range_signed (uint8_t, (int64_t) uint8_max + 1)); - - ASSERT (mcommon_in_range_unsigned (uint8_t, 0u)); - ASSERT (mcommon_in_range_unsigned (uint8_t, uint8_max)); - ASSERT (!mcommon_in_range_unsigned (uint8_t, uint8_max + 1u)); - - ASSERT (!mcommon_in_range_signed (int32_t, int32_min - 1)); - ASSERT (mcommon_in_range_signed (int32_t, int32_min)); - ASSERT (mcommon_in_range_signed (int32_t, 0)); - ASSERT (mcommon_in_range_signed (int32_t, int32_max)); - ASSERT (!mcommon_in_range_signed (int32_t, int32_max + 1)); - - ASSERT (mcommon_in_range_unsigned (int32_t, 0u)); - ASSERT (mcommon_in_range_unsigned (int32_t, (uint64_t) int32_max)); - ASSERT (!mcommon_in_range_unsigned (int32_t, (uint64_t) (int32_max + 1))); - - ASSERT (!mcommon_in_range_signed (uint32_t, int32_min - 1)); - ASSERT (!mcommon_in_range_signed (uint32_t, int32_min)); - ASSERT (mcommon_in_range_signed (uint32_t, 0)); - ASSERT (mcommon_in_range_signed (uint32_t, int32_max)); - ASSERT (mcommon_in_range_signed (uint32_t, int32_max + 1)); - ASSERT (mcommon_in_range_signed (uint32_t, (int64_t) uint32_max)); - ASSERT (!mcommon_in_range_signed (uint32_t, (int64_t) uint32_max + 1)); - - ASSERT (mcommon_in_range_unsigned (uint32_t, 0u)); - ASSERT (mcommon_in_range_unsigned (uint32_t, uint32_max)); - ASSERT (!mcommon_in_range_unsigned (uint32_t, uint32_max + 1u)); - - ASSERT (mcommon_in_range_signed (ssize_t, ssize_min)); - ASSERT (mcommon_in_range_signed (ssize_t, 0)); - ASSERT (mcommon_in_range_signed (ssize_t, ssize_max)); - - ASSERT (mcommon_in_range_unsigned (ssize_t, 0u)); - ASSERT (mcommon_in_range_unsigned (ssize_t, (size_t) ssize_max)); - ASSERT (!mcommon_in_range_unsigned (ssize_t, (size_t) ssize_max + 1u)); - - ASSERT (!mcommon_in_range_signed (size_t, ssize_min)); - ASSERT (mcommon_in_range_signed (size_t, 0)); - ASSERT (mcommon_in_range_signed (size_t, ssize_max)); - - ASSERT (mcommon_in_range_unsigned (size_t, 0u)); - ASSERT (mcommon_in_range_unsigned (size_t, (size_t) ssize_max)); - ASSERT (mcommon_in_range_unsigned (size_t, (size_t) ssize_max + 1u)); -} - -void -test_mcommon_cmp_install (TestSuite *suite) -{ - TestSuite_Add (suite, "/mcommon/cmp/equal", test_mcommon_cmp_equal); - TestSuite_Add (suite, "/mcommon/cmp/not_equal", test_mcommon_cmp_not_equal); - TestSuite_Add (suite, "/mcommon/cmp/less", test_mcommon_cmp_less); - TestSuite_Add (suite, "/mcommon/cmp/greater", test_mcommon_cmp_greater); - TestSuite_Add (suite, "/mcommon/cmp/less_equal", test_mcommon_cmp_less_equal); - TestSuite_Add (suite, "/mcommon/cmp/greater_equal", test_mcommon_cmp_greater_equal); - TestSuite_Add (suite, "/mcommon/cmp/in_range", test_mcommon_in_range); -} diff -pruN 1.30.4-1/src/common/tests/test-mlib.c 2.0.2-1/src/common/tests/test-mlib.c --- 1.30.4-1/src/common/tests/test-mlib.c 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/common/tests/test-mlib.c 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,662 @@ +#include "TestSuite.h" + +#include +#include +#include +#include +#include +#include +#include + +#include + +mlib_diagnostic_push (); // We don't set any diagnostics, we just want to make sure it compiles + +// Not relevant, we just want to test that it compiles: +mlib_msvc_warning (disable : 4507); + +static void +_test_checks (void) +{ + // Simple condiion + mlib_check (true); + mlib_assert_aborts () { + mlib_check (false); + } + // str_eq + mlib_check ("foo", str_eq, "foo"); + mlib_assert_aborts () { + mlib_check ("foo", str_eq, "bar"); + } + // ptr_eq + const char *s = "foo"; + mlib_check (s, ptr_eq, s); + mlib_assert_aborts () { + mlib_check (s, ptr_eq, NULL); + } + // eq + mlib_check (4, eq, 4); + mlib_assert_aborts () { + mlib_check (1, eq, 4); + } + // neq + mlib_check (1, neq, 4); + mlib_assert_aborts () { + mlib_check (1, neq, 1); + } +} + +static void +_test_minmax (void) +{ + mlib_static_assert (mlib_minof (unsigned) == 0); + // Ambiguous signedness, still works: + mlib_static_assert (mlib_minof (char) == CHAR_MIN); + mlib_static_assert (mlib_maxof (char) == CHAR_MAX); + + mlib_static_assert (mlib_minof (uint8_t) == 0); + mlib_static_assert (mlib_maxof (uint8_t) == UINT8_MAX); + mlib_static_assert (mlib_minof (uint16_t) == 0); + mlib_static_assert (mlib_maxof (uint16_t) == UINT16_MAX); + mlib_static_assert (mlib_minof (uint32_t) == 0); + mlib_static_assert (mlib_maxof (uint32_t) == UINT32_MAX); + mlib_static_assert (mlib_minof (uint64_t) == 0); + mlib_static_assert (mlib_maxof (uint64_t) == UINT64_MAX); + + mlib_static_assert (mlib_maxof (size_t) == SIZE_MAX); + mlib_static_assert (mlib_maxof (ptrdiff_t) == PTRDIFF_MAX); + + mlib_static_assert (mlib_minof (int) == INT_MIN); + mlib_static_assert (mlib_maxof (int) == INT_MAX); + mlib_static_assert (mlib_maxof (unsigned) == UINT_MAX); + + mlib_static_assert (mlib_is_signed (int)); + mlib_static_assert (mlib_is_signed (signed char)); + mlib_static_assert (mlib_is_signed (int8_t)); + mlib_static_assert (!mlib_is_signed (uint8_t)); + mlib_static_assert (mlib_is_signed (int16_t)); + mlib_static_assert (!mlib_is_signed (uint16_t)); + mlib_static_assert (mlib_is_signed (int32_t)); + mlib_static_assert (!mlib_is_signed (uint32_t)); + mlib_static_assert (mlib_is_signed (int64_t)); + mlib_static_assert (!mlib_is_signed (uint64_t)); + // Ambiguous signedness: + mlib_static_assert (mlib_is_signed (char) || !mlib_is_signed (char)); +} + +static void +_test_upsize (void) +{ + struct mlib_upsized_integer up; + up = mlib_upsize_integer (31); + ASSERT (up.is_signed); + ASSERT (up.i.s == 31); + + // Casting from the max unsigned integer generates an unsigned upsized integer: + up = mlib_upsize_integer ((uintmax_t) 1729); + ASSERT (!up.is_signed); + ASSERT (up.i.u == 1729); + + // Max signed integer makes a signed upsized integer: + up = mlib_upsize_integer ((intmax_t) 1729); + ASSERT (up.is_signed); + ASSERT (up.i.s == 1729); + + // From a literal: + up = mlib_upsize_integer (UINTMAX_MAX); + ASSERT (!up.is_signed); + ASSERT (up.i.u == UINTMAX_MAX); +} + +static void +_test_cmp (void) +{ + mlib_check (mlib_cmp (1, 2) == mlib_less); + mlib_check (mlib_cmp (1, 2) < 0); + mlib_check (mlib_cmp (1, <, 2)); + mlib_check (mlib_cmp (2, 1) == mlib_greater); + mlib_check (mlib_cmp (2, 1) > 0); + mlib_check (mlib_cmp (2, >, 1)); + mlib_check (mlib_cmp (1, 1) == mlib_equal); + mlib_check (mlib_cmp (1, 1) == 0); + mlib_check (mlib_cmp (1, ==, 1)); + + ASSERT (mlib_cmp (0, ==, 0)); + ASSERT (!mlib_cmp (0, ==, -1)); + ASSERT (!mlib_cmp (0, ==, 1)); + ASSERT (!mlib_cmp (-1, ==, 0)); + ASSERT (mlib_cmp (-1, ==, -1)); + ASSERT (!mlib_cmp (-1, ==, 1)); + ASSERT (!mlib_cmp (1, ==, 0)); + ASSERT (!mlib_cmp (1, ==, -1)); + ASSERT (mlib_cmp (1, ==, 1)); + + ASSERT (mlib_cmp (0u, ==, 0u)); + ASSERT (!mlib_cmp (0u, ==, 1u)); + ASSERT (!mlib_cmp (1u, ==, 0u)); + ASSERT (mlib_cmp (1u, ==, 1u)); + + ASSERT (mlib_cmp (0, ==, 0u)); + ASSERT (!mlib_cmp (0, ==, 1u)); + ASSERT (!mlib_cmp (-1, ==, 0u)); + ASSERT (!mlib_cmp (-1, ==, 1u)); + ASSERT (!mlib_cmp (1, ==, 0u)); + ASSERT (mlib_cmp (1, ==, 1u)); + + ASSERT (mlib_cmp (0u, ==, 0)); + ASSERT (!mlib_cmp (0u, ==, -1)); + ASSERT (!mlib_cmp (0u, ==, 1)); + ASSERT (!mlib_cmp (1u, ==, 0)); + ASSERT (!mlib_cmp (1u, ==, -1)); + ASSERT (mlib_cmp (1u, ==, 1)); + + ASSERT (!mlib_cmp (0, !=, 0)); + ASSERT (mlib_cmp (0, !=, -1)); + ASSERT (mlib_cmp (0, !=, 1)); + ASSERT (mlib_cmp (-1, !=, 0)); + ASSERT (!mlib_cmp (-1, !=, -1)); + ASSERT (mlib_cmp (-1, !=, 1)); + ASSERT (mlib_cmp (1, !=, 0)); + ASSERT (mlib_cmp (1, !=, -1)); + ASSERT (!mlib_cmp (1, !=, 1)); + + ASSERT (!mlib_cmp (0u, !=, 0u)); + ASSERT (mlib_cmp (0u, !=, 1u)); + ASSERT (mlib_cmp (1u, !=, 0u)); + ASSERT (!mlib_cmp (1u, !=, 1u)); + + ASSERT (!mlib_cmp (0, !=, 0u)); + ASSERT (mlib_cmp (0, !=, 1u)); + ASSERT (mlib_cmp (-1, !=, 0u)); + ASSERT (mlib_cmp (-1, !=, 1u)); + ASSERT (mlib_cmp (1, !=, 0u)); + ASSERT (!mlib_cmp (1, !=, 1u)); + + ASSERT (!mlib_cmp (0u, !=, 0)); + ASSERT (mlib_cmp (0u, !=, -1)); + ASSERT (mlib_cmp (0u, !=, 1)); + ASSERT (mlib_cmp (1u, !=, 0)); + ASSERT (mlib_cmp (1u, !=, -1)); + ASSERT (!mlib_cmp (1u, !=, 1)); + + ASSERT (!mlib_cmp (0, <, 0)); + ASSERT (!mlib_cmp (0, <, -1)); + ASSERT (mlib_cmp (0, <, 1)); + ASSERT (mlib_cmp (-1, <, 0)); + ASSERT (!mlib_cmp (-1, <, -1)); + ASSERT (mlib_cmp (-1, <, 1)); + ASSERT (!mlib_cmp (1, <, 0)); + ASSERT (!mlib_cmp (1, <, -1)); + ASSERT (!mlib_cmp (1, <, 1)); + + ASSERT (!mlib_cmp (0u, <, 0u)); + ASSERT (mlib_cmp (0u, <, 1u)); + ASSERT (!mlib_cmp (1u, <, 0u)); + ASSERT (!mlib_cmp (1u, <, 1u)); + + ASSERT (!mlib_cmp (0, <, 0u)); + ASSERT (mlib_cmp (0, <, 1u)); + ASSERT (mlib_cmp (-1, <, 0u)); + ASSERT (mlib_cmp (-1, <, 1u)); + ASSERT (!mlib_cmp (1, <, 0u)); + ASSERT (!mlib_cmp (1, <, 1u)); + + ASSERT (!mlib_cmp (0u, <, 0)); + ASSERT (!mlib_cmp (0u, <, -1)); + ASSERT (mlib_cmp (0u, <, 1)); + ASSERT (!mlib_cmp (1u, <, 0)); + ASSERT (!mlib_cmp (1u, <, -1)); + ASSERT (!mlib_cmp (1u, <, 1)); + + ASSERT (!mlib_cmp (0, >, 0)); + ASSERT (mlib_cmp (0, >, -1)); + ASSERT (!mlib_cmp (0, >, 1)); + ASSERT (!mlib_cmp (-1, >, 0)); + ASSERT (!mlib_cmp (-1, >, -1)); + ASSERT (!mlib_cmp (-1, >, 1)); + ASSERT (mlib_cmp (1, >, 0)); + ASSERT (mlib_cmp (1, >, -1)); + ASSERT (!mlib_cmp (1, >, 1)); + + ASSERT (!mlib_cmp (0u, >, 0u)); + ASSERT (!mlib_cmp (0u, >, 1u)); + ASSERT (mlib_cmp (1u, >, 0u)); + ASSERT (!mlib_cmp (1u, >, 1u)); + + ASSERT (!mlib_cmp (0, >, 0u)); + ASSERT (!mlib_cmp (0, >, 1u)); + ASSERT (!mlib_cmp (-1, >, 0u)); + ASSERT (!mlib_cmp (-1, >, 1u)); + ASSERT (mlib_cmp (1, >, 0u)); + ASSERT (!mlib_cmp (1, >, 1u)); + + ASSERT (!mlib_cmp (0u, >, 0)); + ASSERT (mlib_cmp (0u, >, -1)); + ASSERT (!mlib_cmp (0u, >, 1)); + ASSERT (mlib_cmp (1u, >, 0)); + ASSERT (mlib_cmp (1u, >, -1)); + ASSERT (!mlib_cmp (1u, >, 1)); + + ASSERT (mlib_cmp (0, <=, 0)); + ASSERT (!mlib_cmp (0, <=, -1)); + ASSERT (mlib_cmp (0, <=, 1)); + ASSERT (mlib_cmp (-1, <=, 0)); + ASSERT (mlib_cmp (-1, <=, -1)); + ASSERT (mlib_cmp (-1, <=, 1)); + ASSERT (!mlib_cmp (1, <=, 0)); + ASSERT (!mlib_cmp (1, <=, -1)); + ASSERT (mlib_cmp (1, <=, 1)); + + ASSERT (mlib_cmp (0u, <=, 0u)); + ASSERT (mlib_cmp (0u, <=, 1u)); + ASSERT (!mlib_cmp (1u, <=, 0u)); + ASSERT (mlib_cmp (1u, <=, 1u)); + + ASSERT (mlib_cmp (0, <=, 0u)); + ASSERT (mlib_cmp (0, <=, 1u)); + ASSERT (mlib_cmp (-1, <=, 0u)); + ASSERT (mlib_cmp (-1, <=, 1u)); + ASSERT (!mlib_cmp (1, <=, 0u)); + ASSERT (mlib_cmp (1, <=, 1u)); + + ASSERT (mlib_cmp (0u, <=, 0)); + ASSERT (!mlib_cmp (0u, <=, -1)); + ASSERT (mlib_cmp (0u, <=, 1)); + ASSERT (!mlib_cmp (1u, <=, 0)); + ASSERT (!mlib_cmp (1u, <=, -1)); + ASSERT (mlib_cmp (1u, <=, 1)); + + ASSERT (mlib_cmp (0, >=, 0)); + ASSERT (mlib_cmp (0, >=, -1)); + ASSERT (!mlib_cmp (0, >=, 1)); + ASSERT (!mlib_cmp (-1, >=, 0)); + ASSERT (mlib_cmp (-1, >=, -1)); + ASSERT (!mlib_cmp (-1, >=, 1)); + ASSERT (mlib_cmp (1, >=, 0)); + ASSERT (mlib_cmp (1, >=, -1)); + ASSERT (mlib_cmp (1, >=, 1)); + + ASSERT (mlib_cmp (0u, >=, 0u)); + ASSERT (!mlib_cmp (0u, >=, 1u)); + ASSERT (mlib_cmp (1u, >=, 0u)); + ASSERT (mlib_cmp (1u, >=, 1u)); + + ASSERT (mlib_cmp (0, >=, 0u)); + ASSERT (!mlib_cmp (0, >=, 1u)); + ASSERT (!mlib_cmp (-1, >=, 0u)); + ASSERT (!mlib_cmp (-1, >=, 1u)); + ASSERT (mlib_cmp (1, >=, 0u)); + ASSERT (mlib_cmp (1, >=, 1u)); + + ASSERT (mlib_cmp (0u, >=, 0)); + ASSERT (mlib_cmp (0u, >=, -1)); + ASSERT (!mlib_cmp (0u, >=, 1)); + ASSERT (mlib_cmp (1u, >=, 0)); + ASSERT (mlib_cmp (1u, >=, -1)); + ASSERT (mlib_cmp (1u, >=, 1)); + + size_t big_size = SIZE_MAX; + ASSERT (mlib_cmp (42, big_size) == mlib_less); + ASSERT (mlib_cmp (big_size, big_size) == mlib_equal); + ASSERT (mlib_cmp (big_size, SSIZE_MIN) == mlib_greater); + uint8_t smol = 7; + ASSERT (mlib_cmp (smol, SIZE_MAX) == mlib_less); + int8_t ismol = -4; + ASSERT (mlib_cmp (ismol, big_size) == mlib_less); + + /// Example: Getting the correct answer: + // Unintuitive result due to integer promotion: + mlib_diagnostic_push (); + mlib_gnu_warning_disable ("-Wsign-compare"); + ASSERT (-27 > 20u); + mlib_diagnostic_pop (); + // mlib_cmp produces the correct answer: + ASSERT (mlib_cmp (-27, <, 20u)); +} + +static void +_test_in_range (void) +{ + const int64_t int8_min = INT8_MIN; + const int64_t int8_max = INT8_MAX; + const int64_t int32_min = INT32_MIN; + const int64_t int32_max = INT32_MAX; + + const uint64_t uint8_max = UINT8_MAX; + const uint64_t uint32_max = UINT32_MAX; + + const ssize_t ssize_min = SSIZE_MIN; + const ssize_t ssize_max = SSIZE_MAX; + + ASSERT (!mlib_in_range (int8_t, 1729)); + ASSERT (!mlib_in_range (int, SIZE_MAX)); + ASSERT (mlib_in_range (size_t, SIZE_MAX)); + ASSERT (!mlib_in_range (size_t, -42)); + ASSERT (mlib_in_range (int8_t, -42)); + ASSERT (mlib_in_range (int8_t, -128)); + ASSERT (!mlib_in_range (int8_t, -129)); + + ASSERT (!mlib_in_range (int8_t, int8_min - 1)); + ASSERT (mlib_in_range (int8_t, int8_min)); + ASSERT (mlib_in_range (int8_t, 0)); + ASSERT (mlib_in_range (int8_t, int8_max)); + ASSERT (!mlib_in_range (int8_t, int8_max + 1)); + + ASSERT (mlib_in_range (int8_t, 0u)); + ASSERT (mlib_in_range (int8_t, (uint64_t) int8_max)); + ASSERT (!mlib_in_range (int8_t, (uint64_t) (int8_max + 1))); + + ASSERT (!mlib_in_range (uint8_t, int8_min - 1)); + ASSERT (!mlib_in_range (uint8_t, int8_min)); + ASSERT (mlib_in_range (uint8_t, 0)); + ASSERT (mlib_in_range (uint8_t, int8_max)); + ASSERT (mlib_in_range (uint8_t, int8_max + 1)); + ASSERT (mlib_in_range (uint8_t, (int64_t) uint8_max)); + ASSERT (!mlib_in_range (uint8_t, (int64_t) uint8_max + 1)); + + ASSERT (mlib_in_range (uint8_t, 0u)); + ASSERT (mlib_in_range (uint8_t, uint8_max)); + ASSERT (!mlib_in_range (uint8_t, uint8_max + 1u)); + + ASSERT (!mlib_in_range (int32_t, int32_min - 1)); + ASSERT (mlib_in_range (int32_t, int32_min)); + ASSERT (mlib_in_range (int32_t, 0)); + ASSERT (mlib_in_range (int32_t, int32_max)); + ASSERT (!mlib_in_range (int32_t, int32_max + 1)); + + ASSERT (mlib_in_range (int32_t, 0u)); + ASSERT (mlib_in_range (int32_t, (uint64_t) int32_max)); + ASSERT (!mlib_in_range (int32_t, (uint64_t) (int32_max + 1))); + + ASSERT (!mlib_in_range (uint32_t, int32_min - 1)); + ASSERT (!mlib_in_range (uint32_t, int32_min)); + ASSERT (mlib_in_range (uint32_t, 0)); + ASSERT (mlib_in_range (uint32_t, int32_max)); + ASSERT (mlib_in_range (uint32_t, int32_max + 1)); + ASSERT (mlib_in_range (uint32_t, (int64_t) uint32_max)); + ASSERT (!mlib_in_range (uint32_t, (int64_t) uint32_max + 1)); + + ASSERT (mlib_in_range (uint32_t, 0u)); + ASSERT (mlib_in_range (uint32_t, uint32_max)); + ASSERT (!mlib_in_range (uint32_t, uint32_max + 1u)); + + ASSERT (mlib_in_range (ssize_t, ssize_min)); + ASSERT (mlib_in_range (ssize_t, 0)); + ASSERT (mlib_in_range (ssize_t, ssize_max)); + + ASSERT (mlib_in_range (ssize_t, 0u)); + ASSERT (mlib_in_range (ssize_t, (size_t) ssize_max)); + ASSERT (!mlib_in_range (ssize_t, (size_t) ssize_max + 1u)); + + ASSERT (!mlib_in_range (size_t, ssize_min)); + ASSERT (mlib_in_range (size_t, 0)); + ASSERT (mlib_in_range (size_t, ssize_max)); + + ASSERT (mlib_in_range (size_t, 0u)); + ASSERT (mlib_in_range (size_t, (size_t) ssize_max)); + ASSERT (mlib_in_range (size_t, (size_t) ssize_max + 1u)); +} + +static void +_test_assert_aborts (void) +{ + int a = 0; + mlib_assert_aborts () { + a = 4; + abort (); + } + // Parent process is unaffected: + ASSERT (a == 0); +} + +static void +_test_int_encoding (void) +{ + { + const char *buf = "\x01\x02\x03\x04"; + const uint32_t val = mlib_read_u32le (buf); + mlib_check (val, eq, 0x04030201); + } + + { + char buf[9] = {0}; + char *o = mlib_write_i32le (buf, 0x01020304); + mlib_check (o, ptr_eq, buf + 4); + mlib_check (buf, str_eq, "\x04\x03\x02\x01"); + + o = mlib_write_i32le (o, 42); + mlib_check (o, ptr_eq, buf + 8); + mlib_check (buf, str_eq, "\x04\x03\x02\x01*"); + + o = mlib_write_i64le (buf, 0x0102030405060708); + mlib_check (o, ptr_eq, buf + 8); + mlib_check (buf, str_eq, "\x08\x07\x06\x05\x04\x03\x02\x01"); + } +} + +static void +_test_foreach (void) +{ + int n_loops = 0; + mlib_foreach_urange (i, 10) { + fprintf (stderr, "i: %zu\n", i); + fprintf (stderr, "counter: %zu\n", i_counter); + ASSERT (i == loop.index); + ASSERT (loop.first == (i == 0)); + ASSERT (loop.last == (i == 9)); + ++n_loops; + (void) i; + ASSERT (n_loops <= 10); + }; + ASSERT (n_loops == 10); + + n_loops = 0; + mlib_foreach_urange (i, 100) { + if (i == 42) { + break; + } + ++n_loops; + } + ASSERT (n_loops == 42); + + n_loops = 0; + mlib_foreach_urange (i, 1729) { + (void) i; + ++n_loops; + } + ASSERT (n_loops == 1729); + + mlib_foreach_urange (i, 0) { + (void) i; + ASSERT (false); // Shouldn't ever enter the loop + } + + n_loops = 0; + mlib_foreach_urange (i, 4, 7) { + ++n_loops; + ASSERT (i >= 4); + ASSERT (i < 7); + } + ASSERT (n_loops == 3); + + int arr[] = {1, 2, 3}; + int sum = 0; + n_loops = 0; + mlib_foreach_arr (int, n, arr) { + mlib_check (n_loops, eq, loop.index); + n_loops++; + sum += *n; + ASSERT (loop.first == (n == arr + 0)); + ASSERT (loop.last == (n == arr + 2)); + } + ASSERT (sum == 6); + ASSERT (n_loops == 3); +} + +static void +_test_cast (void) +{ + int a = 1729; + // Fine: + int16_t i16 = mlib_assert_narrow (int16_t, a); + ASSERT (i16 == 1729); + // Fine: + a = -6; + i16 = mlib_assert_narrow (int16_t, a); + ASSERT (i16 == -6); + // Boundary: + size_t sz = mlib_assert_narrow (size_t, SIZE_MAX); + ASSERT (sz == SIZE_MAX); + sz = mlib_assert_narrow (size_t, 0); + ASSERT (sz == 0); + // Boundary: + sz = mlib_assert_narrow (size_t, SSIZE_MAX); + ASSERT (sz == SSIZE_MAX); + + mlib_assert_aborts () { + (void) mlib_assert_narrow (size_t, -4); + } + mlib_assert_aborts () { + (void) mlib_assert_narrow (ssize_t, SIZE_MAX); + } +} + +// This is a "partial" test of the ckdint APIs. A fully exhaustive test set is defined +// in `mlib/ckdint.test.cpp` +static void +_test_ckdint_partial (void) +{ + // Small signed + { + int a = 42; + mlib_check (!mlib_add (&a, a, 5)); // a = a + 5 + mlib_check (a, eq, 47); + + mlib_check (!mlib_add (&a, 5)); // a += 5 + mlib_check (a, eq, 52); + + // The `check` arithmetic functions should abort the process immediately + mlib_assert_aborts () { + mlib_assert_add (size_t, 41, -42); + } + mlib_assert_aborts () { + mlib_assert_add (ptrdiff_t, 41, SIZE_MAX); + } + // Does not abort: + const size_t sum = mlib_assert_add (size_t, -32, 33); + mlib_check (sum, eq, 1); + + mlib_check (!mlib_add (&a, a, (size_t) 123456)); + mlib_check (a, eq, 123508); + + a = 4; + mlib_check (mlib_add (&a, a, INT_MAX)); // Indicates overflow + mlib_check (a, eq, INT_MIN + 3); // Result is wrapped + + a = -1; + mlib_check (!mlib_add (&a, a, INT_MAX)); + mlib_check (a, eq, INT_MAX - 1); + } + + // Small unsigned + { + unsigned a = 42; + mlib_check (!mlib_add (&a, a, 5)); + mlib_check (a, eq, 47); + + mlib_check (!mlib_add (&a, a, INT_MAX)); + mlib_check (a, eq, (unsigned) INT_MAX + 47); + } + + // Sub with small signed + { + int a = -1; + mlib_check (mlib_sub (&a, INT_MAX, a)); // MAX - (-1) → MAX + 1 + mlib_check (a, eq, INT_MIN); + + a = -1; + mlib_check (!mlib_sub (&a, INT_MIN, a)); // MIN - (-1) → MIN + 1 + mlib_check (a, eq, INT_MIN + 1); + } + + // Max precision tests are more interesting, because they excercise the bit-manipulation + // tricks in the arithmetic functions, while smaller ints are simple bounds checks + // ============== + // Maximum precision signed + { + intmax_t a = 42; + mlib_check (!mlib_add (&a, a, 5)); + mlib_check (a, eq, 47); + + mlib_check (mlib_add (&a, 42, INTMAX_MAX)); // Overflows + mlib_check (a, eq, INTMAX_MIN + 41); // Wraps + + mlib_check (!mlib_sub (&a, -1, INTMAX_MIN)); // (-N) - (-M) is always well-defined + mlib_check (a, eq, INTMAX_MAX); + + mlib_check (mlib_sub (&a, -2, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MAX); + + mlib_check (!mlib_sub (&a, 1, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MIN + 2); + + mlib_check (!mlib_mul (&a, 1, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MAX); + + mlib_check (mlib_mul (&a, 2, INTMAX_MAX)); + mlib_check (a, eq, -2); + mlib_check (mlib_mul (&a, 3, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MAX - 2); + } + + // Maximum precision unsigned + { + uintmax_t a = 42; + mlib_check (!mlib_add (&a, a, 5)); + mlib_check (a, eq, 47); + + a = 42; + mlib_check (mlib_add (&a, a, UINTMAX_MAX)); // Overflows + mlib_check (a, eq, 41); // Wraps + + a = 1; + mlib_check (mlib_sub (&a, a, INTMAX_MAX)); // Overflows (result is negative) + mlib_check (a, eq, (uintmax_t) INTMAX_MAX + 3); + + mlib_check (!mlib_sub (&a, -1, INTMAX_MIN)); // (-N) - (-M) is always well-defined + mlib_check (a, eq, INTMAX_MAX); + + mlib_check (mlib_sub (&a, -2, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MAX); + + mlib_check (mlib_sub (&a, 1, INTMAX_MAX)); + mlib_check (a, eq, (uintmax_t) INTMAX_MAX + 3); + + mlib_check (!mlib_mul (&a, 1, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MAX); + + // Just barely enough room: + mlib_check (!mlib_mul (&a, 2, INTMAX_MAX)); + mlib_check (a, eq, UINTMAX_MAX - 1); + // Too big: + mlib_check (mlib_mul (&a, 3, INTMAX_MAX)); + mlib_check (a, eq, INTMAX_MAX - 2); + } +} + +void +test_mlib_install (TestSuite *suite) +{ + TestSuite_Add (suite, "/mlib/checks", _test_checks); + TestSuite_Add (suite, "/mlib/intutil/minmax", _test_minmax); + TestSuite_Add (suite, "/mlib/intutil/upsize", _test_upsize); + TestSuite_Add (suite, "/mlib/cmp", _test_cmp); + TestSuite_Add (suite, "/mlib/in-range", _test_in_range); + TestSuite_Add (suite, "/mlib/assert-aborts", _test_assert_aborts); + TestSuite_Add (suite, "/mlib/int-encoding", _test_int_encoding); + TestSuite_Add (suite, "/mlib/foreach", _test_foreach); + TestSuite_Add (suite, "/mlib/check-cast", _test_cast); + TestSuite_Add (suite, "/mlib/ckdint-partial", _test_ckdint_partial); +} + +mlib_diagnostic_pop (); diff -pruN 1.30.4-1/src/libbson/CMakeLists.txt 2.0.2-1/src/libbson/CMakeLists.txt --- 1.30.4-1/src/libbson/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -29,11 +29,6 @@ set(libbson_VERSION_FULL ${mongo-c-drive set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) -# A tag attached to libbson artifacts, denoting the *major* API version, used to -# potentially co-locate additional future major versions. -set (BSON_API_VERSION 1.0) - - # .d8888b. 888 888 d8b # d88P Y88b 888 888 Y8P # Y88b. 888 888 @@ -130,13 +125,6 @@ configure_file ( "${PROJECT_BINARY_DIR}/src/bson/bson-version.h" ) -if (ENABLE_APPLE_FRAMEWORK) - configure_file ( - "${PROJECT_SOURCE_DIR}/src/bson/modules/module.modulemap.in" - "${PROJECT_BINARY_DIR}/src/bson/modules/module.modulemap" - ) -endif () - # 8888888b. .d888 d8b d8b 888 d8b # 888 "Y88b d88P" Y8P Y8P 888 Y8P # 888 888 888 888 @@ -174,13 +162,12 @@ set(bson_libs) if(ENABLE_STATIC) add_library(bson_static STATIC ${all_sources}) + add_library(bson::static ALIAS bson_static) + set_property(TARGET bson_static PROPERTY EXPORT_NAME bson::static) list(APPEND bson_libs bson_static) - # Define `BSON_STATIC` when building to suppress the annotation __declspec(dllexport). - # This prevents consumers of bson_static from exporting the symbols. - target_compile_definitions(bson_static PRIVATE BSON_STATIC) - # When consumers link against bson_static, suppress the annotation __declspec(dllimport), - # since those symbols will be available immediately at the link step: - target_compile_definitions(bson_static INTERFACE BSON_STATIC) + # Define `BSON_STATIC` to suppress __declspec(dllexport/dllimport) when compiling + # and consuming the static library + target_compile_definitions(bson_static PUBLIC BSON_STATIC) if(ENABLE_PIC) # User wants static libs to use PIC code. @@ -189,7 +176,9 @@ if(ENABLE_STATIC) endif() if(ENABLE_SHARED) - add_library(bson_shared SHARED ${all_sources}) + add_library(bson_shared SHARED ${all_sources}) + add_library(bson::shared ALIAS bson_shared) + set_property(TARGET bson_shared PROPERTY EXPORT_NAME bson::shared) if(WIN32) # Add resource-definition script for Windows shared library (.dll). configure_file(libbson.rc.in libbson.rc) @@ -231,25 +220,10 @@ mongo_target_requirements( ) set_target_properties(${bson_libs} PROPERTIES - VERSION "0.0.0" - SOVERSION "0" - OUTPUT_NAME "${BSON_OUTPUT_BASENAME}-${BSON_API_VERSION}" + VERSION "${PROJECT_VERSION}" + SOVERSION "${PROJECT_VERSION_MAJOR}" + OUTPUT_NAME "${BSON_OUTPUT_BASENAME}${PROJECT_VERSION_MAJOR}" ) -if(TARGET bson_static) - set_property(TARGET bson_static PROPERTY OUTPUT_NAME "${BSON_OUTPUT_BASENAME}-static-${BSON_API_VERSION}") -endif() - -if (ENABLE_APPLE_FRAMEWORK) - set_target_properties(bson_shared PROPERTIES - FRAMEWORK TRUE - MACOSX_FRAMEWORK_BUNDLE_VERSION ${MONGOC_VERSION} - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MONGOC_VERSION} - MACOSX_FRAMEWORK_IDENTIFIER org.mongodb.bson - OUTPUT_NAME "${BSON_OUTPUT_BASENAME}" - PUBLIC_HEADER "${HEADERS}" - ) -endif () - # 8888888888 888 # 888 888 @@ -306,12 +280,22 @@ endif () # ENABLE_EXAMPLES # 888 888 888 X88 Y88b. 888 888 888 888 # 8888888 888 888 88888P' "Y888 "Y888888 888 888 -set (BSON_HEADER_INSTALL_DIR - "${CMAKE_INSTALL_INCLUDEDIR}/libbson-${BSON_API_VERSION}" +# Infix directory for all libbson headers. +if(NOT DEFINED BSON_INSTALL_INCLUDEDIR) + set(BSON_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/bson-${PROJECT_VERSION}") +endif() +# Infix directory for all libbson CMake package files +if(NOT DEFINED BSON_INSTALL_CMAKEDIR) + set(BSON_INSTALL_CMAKEDIR "${MONGO_C_DRIVER_INSTALL_CMAKEDIR}/bson-${PROJECT_VERSION}") +endif() + +# pkg-config properties: +set_directory_properties(PROPERTIES + pkg_config_INCLUDE_DIRECTORIES "${BSON_INSTALL_INCLUDEDIR}" + pkg_config_NAME "bson" ) + function(install_export_target target) - # Tell pkg-config where the headers are going: - set_property(TARGET ${target} APPEND PROPERTY pkg_config_INCLUDE_DIRECTORIES "${BSON_HEADER_INSTALL_DIR}") # Install the target: install( TARGETS "${target}" @@ -320,88 +304,53 @@ function(install_export_target target) LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - INCLUDES DESTINATION "${BSON_HEADER_INSTALL_DIR}" - FRAMEWORK DESTINATION "${CMAKE_INSTALL_BINDIR}" + INCLUDES DESTINATION "${BSON_INSTALL_INCLUDEDIR}" ) # Install the unique export set into a file that is qualified by the name of # the target itself. The main config-file package will search for the - # possibly-installed exported targets for the known targets. See: bson-config.cmake + # possibly-installed exported targets for the known targets. install( EXPORT "${target}-targets" - NAMESPACE mongo:: FILE "${target}-targets.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bson-${BSON_API_VERSION}" + DESTINATION "${BSON_INSTALL_CMAKEDIR}" ) endfunction() if(ENABLE_STATIC_LIBBSON_INSTALL AND TARGET bson_static) install_export_target(bson_static) - mongo_generate_pkg_config(bson_static FILENAME libbson-static-1.0.pc INSTALL) + mongo_generate_pkg_config(bson_static FILENAME bson${PROJECT_VERSION_MAJOR}-static.pc INSTALL) endif() if(ENABLE_SHARED_LIBBSON_INSTALL AND TARGET bson_shared) install_export_target(bson_shared) - mongo_generate_pkg_config(bson_shared FILENAME libbson-1.0.pc INSTALL) + mongo_generate_pkg_config(bson_shared FILENAME bson${PROJECT_VERSION_MAJOR}.pc INSTALL) endif() -# Install all headers by doing a recursive directory-install. +# Install all headers by doing a recursive directory-install. In the future, this +# can be better handled by installing the headers as a file set via target_sources() install( DIRECTORY # Trailing "/" requests directory contents, not the dir itself: - src/bson/ + src/ # Also get the generated dir: - ${PROJECT_BINARY_DIR}/src/bson/ - DESTINATION "${BSON_HEADER_INSTALL_DIR}/bson" + ${PROJECT_BINARY_DIR}/src/ + DESTINATION "${BSON_INSTALL_INCLUDEDIR}" # Only grab the *public* headers. FILES_MATCHING PATTERN "*.h" PATTERN "*-private.h" EXCLUDE - # Installed separately below: - PATTERN "forwarding" EXCLUDE - # Don't generate an empty "modules" directory - PATTERN "modules" EXCLUDE - ) - -# The forwarding header is for compatibility with `#include `, so it goes at the top-level: -install(FILES src/bson/forwarding/bson.h DESTINATION "${BSON_HEADER_INSTALL_DIR}") - -if (ENABLE_APPLE_FRAMEWORK) - install ( - FILES "${PROJECT_BINARY_DIR}/src/bson/modules/module.modulemap" - DESTINATION "${CMAKE_INSTALL_BINDIR}/bson.framework/Modules/" + # Don't install jsonsl headers + PATTERN "jsonsl" EXCLUDE ) -endif () - -# Generate the config-file package -include (CMakePackageConfigHelpers) -write_basic_package_version_file ( - "${CMAKE_CURRENT_BINARY_DIR}/bson/bson-${BSON_API_VERSION}-config-version.cmake" - VERSION ${BSON_VERSION} - COMPATIBILITY AnyNewerVersion -) - -configure_file (src/bson-config.cmake - "${CMAKE_CURRENT_BINARY_DIR}/bson/bson-${BSON_API_VERSION}-config.cmake" - COPYONLY -) - -install ( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/bson/bson-${BSON_API_VERSION}-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/bson/bson-${BSON_API_VERSION}-config-version.cmake" - DESTINATION - ${CMAKE_INSTALL_LIBDIR}/cmake/bson-${BSON_API_VERSION} - COMPONENT - Devel -) -# Install the base targets. (Prior targets were installed above) -install (EXPORT bson-targets - NAMESPACE mongo:: - FILE bson-targets.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/bson-${BSON_API_VERSION} +# Install the platform libraries from MongoPlatform.cmake. Search: PLATFORM-EXPORT-TARGET-INSTALL +install(EXPORT mongo-platform-targets + # The "00" prefix forces the file to sort to the top during globbing, because + # we want it to be included first before the libbson targets + FILE 00-mongo-platform-targets.cmake + DESTINATION "${BSON_INSTALL_CMAKEDIR}" ) -set(bson_cmake_prefix "${MONGO_C_DRIVER_INSTALL_CMAKEDIR}/bson-${PROJECT_VERSION}") +# Install the CMake config-mode package configure_file( ${mongo-c-driver_SOURCE_DIR}/build/cmake/packageConfigVersion.cmake.in bsonConfigVersion.cmake @@ -409,10 +358,9 @@ configure_file( ) install( FILES etc/bsonConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/bsonConfigVersion.cmake" - DESTINATION "${bson_cmake_prefix}" + DESTINATION "${BSON_INSTALL_CMAKEDIR}" ) -include (LegacyPackage) include (CPack) if (MONGO_FUZZ) @@ -434,7 +382,7 @@ if (ENABLE_MAN_PAGES OR ENABLE_HTML_DOCS add_custom_target (bson-doc ALL DEPENDS - $<$:bson-man> - $<$:bson-html> + $ + $ ) endif () diff -pruN 1.30.4-1/src/libbson/NEWS 2.0.2-1/src/libbson/NEWS --- 1.30.4-1/src/libbson/NEWS 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/NEWS 2025-06-19 15:42:22.000000000 +0000 @@ -1,36 +1,83 @@ -libbson 1.30.4 -============== +libbson 2.0.2 +============= -No changes since 1.30.3. Version incremented to match the libmongoc version. +Fixes: +* Various fixes have been applied to the `bson_validate` family of functions, + with some minor behavioral changes. + * Previously accepted invalid UTF-8 will be rejected when `BSON_VALIDATE_UTF8` + is specified. + * The scope document in a deprecated "code with scope" element is now + validated with a fixed set of rules and is treated as an opaque JavaScript + object. + * A document nesting limit is now enforced during validation. +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + * Colby Pike -libbson 1.30.3 -============== + +libbson 2.0.1 +============= Fixes: * Fix CMake configure error on macOS with CMake 4. -New Features: +Thanks to everyone who contributed to the development of this release. + + * Kevin Albertson + + + +libbson 2.0.0 +============= -* In anticipation of the 2.0 release of mongo-c-driver, new CMake packages and - imported targets have been defined (for both `bson` and `mongoc`). To import - `bson` with the new names, call `find_package` for the `bson` package. The new - imported targets are named `bson::static`, `bson::shared`, and `bson::bson` - (which points to either the static or the shared library, depending on an - import-time configuration option). - - The new package and target names will remain unchanged when upgrading to the - 2.0 release, allowing consumers to support both major versions without - modifying their CMake project. The current imported target names will be - removed from the 2.0 release, and should not be used for - forward-compatibility. +## Changes + +* `BSON_ERROR_BUFFER_SIZE` is reduced from `504` to `503` to reserve the final byte for internal use. + * The data layout of `bson_error_t` remains otherwise unchanged: the size is still 512 bytes and the offset of the `.code`, `.domain`, and `.message` data members remain unchanged. +* The pkg-config files `libbson-1.0`, have been renamed to `bson2`, and `bson2-static`, respectively. + +### CMake Packages and Imported Targets + +The `bson-1.0` CMake package have been removed. Instead, use or `bson`, and +specify a version or version range to be imported: + +```cmake +find_package(bson 1.30...2.0) +``` + +The new package imports different target names: + +- `mongo::bson_static` → `bson::static` +- `mongo::bson_shared` → `bson::shared` +- The target `bson::bson` is a shim target that points to either the shared + library or the static library. + + +## Removals + +* `bson_as_json` and `bson_array_as_json` are removed due to producing non-portable Legacy Extended JSON. Prefer Canonical Extended JSON or Relaxed Extended JSON for portability. To continue using Legacy Extended JSON, use `bson_as_legacy_extended_json` and `bson_array_as_legacy_extended_json`. +* Compiling with `BSON_MEMCHECK` defined now has no effect. +* Remove deprecated integral comparison interfaces: `bson_in_range_*` and `bson_cmp_*`. +* Remove deprecated atomic and threading interfaces: `bson_atomic_*` and `bson_thrd_yield`. +* The deprecated `ENABLE_EXTRA_ALIGNMENT` CMake option is removed. + * `bson_t` and `bson_iter_t` are now aligned to the size of a pointer instead of `128`. + * `bson_error_t`, `bson_value_t`, and `bson_visitor_t` are now aligned to the size of a pointer instead of `8`. + * `BSON_ALIGNED_BEGIN` and `BSON_ALIGNED_END` now unconditionally apply their requested alignment. +* Remove deprecated `bson_copy_to_excluding`. Use `bson_copy_to_excluding_noinit` instead. + +## Contributors Thanks to everyone who contributed to the development of this release. * Kevin Albertson + * Micah Scott * Colby Pike + * Ezra Chung + * Lin Raymond libbson 1.30.2 ============== @@ -85,7 +132,6 @@ Thanks to everyone who contributed to th * Jeremy Mikola * Colby Pike - libbson 1.29.2 ============== diff -pruN 1.30.4-1/src/libbson/doc/api.rst 2.0.2-1/src/libbson/doc/api.rst --- 1.30.4-1/src/libbson/doc/api.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/api.rst 2025-06-19 15:42:22.000000000 +0000 @@ -15,7 +15,6 @@ API Reference bson_oid_t bson_reader_t character_and_string_routines - bson_string_t bson_subtype_t bson_type_t bson_unichar_t @@ -25,5 +24,6 @@ API Reference bson_writer_t bson_get_monotonic_time bson_memory + binary_vector version legacy_extended_json diff -pruN 1.30.4-1/src/libbson/doc/binary_vector.rst 2.0.2-1/src/libbson/doc/binary_vector.rst --- 1.30.4-1/src/libbson/doc/binary_vector.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/binary_vector.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,149 @@ +:man_page: libbson_binary_vector + +BSON Binary Vector subtype +========================== + +In Libbson, we use the term *Vector* to refer to a data representation for compact storage of uniform elements, defined by the `BSON Binary Subtype 9 - Vector `_ specification. + +Libbson includes API support for Vectors: + +* The *view* APIs provide an efficient way to access elements of Vector fields that reside within :symbol:`bson_t` storage. +* Integration between *views* and other Libbson features: append, array builder, iter. +* Vectors can be converted to and from a plain BSON Array, subject to the specification's type conversion rules. + +The specification currently defines three element types, which Libbson interprets as: + +* ``int8``: signed integer elements, equivalent to C ``int8_t``. +* ``float32``: IEEE 754 floating point, 32 bits per element, least-significant byte first. After alignment and byte swapping, elements are equivalent to C ``float``. +* ``packed_bit``: single-bit integer elements, packed most-significant bit first. Accessible in packed form as C ``uint8_t`` or as unpacked elements using C ``bool``. + +Vector Views +------------ + +.. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_int8_view_t + bson_vector_int8_const_view_t + bson_vector_float32_view_t + bson_vector_float32_const_view_t + bson_vector_packed_bit_view_t + bson_vector_packed_bit_const_view_t + +Integration +----------- + +* Allocating Vectors inside :symbol:`bson_t`: + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_append_vector_int8_uninit + bson_append_vector_float32_uninit + bson_append_vector_packed_bit_uninit + +* Accessing an existing Vector via :symbol:`bson_iter_t`: + + .. code-block:: c + + #define BSON_ITER_HOLDS_VECTOR(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR_INT8(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR_FLOAT32(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR_PACKED_BIT(iter) /* ... */ + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_int8_view_from_iter + bson_vector_int8_const_view_from_iter + bson_vector_float32_view_from_iter + bson_vector_float32_const_view_from_iter + bson_vector_packed_bit_view_from_iter + bson_vector_packed_bit_const_view_from_iter + +Array Conversion +---------------- + +* Polymorphic array-from-vector: + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_append_array_from_vector + +* Type specific array-from-vector: + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_append_array_from_vector_int8 + bson_append_array_from_vector_float32 + bson_append_array_from_vector_packed_bit + +* Using :symbol:`bson_array_builder_t` for array-from-vector: + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_array_builder_append_vector_int8_elements + bson_array_builder_append_vector_float32_elements + bson_array_builder_append_vector_packed_bit_elements + bson_array_builder_append_vector_elements + +* Type specific vector-from-array: + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_append_vector_int8_from_array + bson_append_vector_float32_from_array + bson_append_vector_packed_bit_from_array + +Additional Definitions +---------------------- + +* Binary subtype: + + .. code-block:: c + + typedef enum { + BSON_SUBTYPE_VECTOR = 0x09, + /* ... */ + } bson_subtype_t; + +* Byte length of the Vector header: + + .. code-block:: c + + // Length of the required header for BSON_SUBTYPE_VECTOR, in bytes + #define BSON_VECTOR_HEADER_LEN 2 + +* Byte length for a Vector with specific element type and count: + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_int8_binary_data_length + bson_vector_float32_binary_data_length + bson_vector_packed_bit_binary_data_length + +* Errors: + + .. code-block:: c + + // Error "domain" + #define BSON_ERROR_VECTOR 4 + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_error_code_t diff -pruN 1.30.4-1/src/libbson/doc/bson_append_array_from_vector.rst 2.0.2-1/src/libbson/doc/bson_append_array_from_vector.rst --- 1.30.4-1/src/libbson/doc/bson_append_array_from_vector.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_array_from_vector.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,40 @@ +:man_page: bson_append_array_from_vector + +bson_append_array_from_vector() +=============================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_ARRAY_FROM_VECTOR(b, key, iter) \ + bson_append_array_from_vector (b, key, (int) strlen (key), iter) + + bool + bson_append_array_from_vector (bson_t *bson, + const char *key, + int key_length, + const bson_iter_t *iter); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``iter``: A :symbol:`bson_iter_t` pointing to any supported :doc:`binary_vector` field. + +Description +----------- + +Converts the Vector pointed to by ``iter`` into a plain BSON Array, written to ``bson`` under the name ``key``. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX, or if ``iter`` doesn't point to a valid recognized Vector type. + +.. seealso:: + + | :symbol:`bson_array_builder_append_vector_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_append_array_from_vector_float32.rst 2.0.2-1/src/libbson/doc/bson_append_array_from_vector_float32.rst --- 1.30.4-1/src/libbson/doc/bson_append_array_from_vector_float32.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_array_from_vector_float32.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,40 @@ +:man_page: bson_append_array_from_vector_float32 + +bson_append_array_from_vector_float32() +======================================= + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_ARRAY_FROM_VECTOR_FLOAT32(b, key, view) \ + bson_append_array_from_vector_float32 (b, key, (int) strlen (key), view) + + bool + bson_append_array_from_vector_float32 (bson_t *bson, + const char *key, + int key_length, + bson_vector_float32_const_view_t view); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``view``: A :symbol:`bson_vector_float32_const_view_t` pointing to validated ``float32`` :doc:`binary_vector` data. + +Description +----------- + +Converts the Vector pointed to by ``view`` into a plain BSON Array, written to ``bson`` under the name ``key``. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_array_builder_append_vector_float32_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_append_array_from_vector_int8.rst 2.0.2-1/src/libbson/doc/bson_append_array_from_vector_int8.rst --- 1.30.4-1/src/libbson/doc/bson_append_array_from_vector_int8.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_array_from_vector_int8.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,40 @@ +:man_page: bson_append_array_from_vector_int8 + +bson_append_array_from_vector_int8() +==================================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_ARRAY_FROM_VECTOR_INT8(b, key, view) \ + bson_append_array_from_vector_int8 (b, key, (int) strlen (key), view) + + bool + bson_append_array_from_vector_int8 (bson_t *bson, + const char *key, + int key_length, + bson_vector_int8_const_view_t view); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``view``: A :symbol:`bson_vector_int8_const_view_t` pointing to validated ``int8`` :doc:`binary_vector` data. + +Description +----------- + +Converts the Vector pointed to by ``view`` into a plain BSON Array, written to ``bson`` under the name ``key``. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_array_builder_append_vector_int8_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_append_array_from_vector_packed_bit.rst 2.0.2-1/src/libbson/doc/bson_append_array_from_vector_packed_bit.rst --- 1.30.4-1/src/libbson/doc/bson_append_array_from_vector_packed_bit.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_array_from_vector_packed_bit.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,40 @@ +:man_page: bson_append_array_from_vector_packed_bit + +bson_append_array_from_vector_packed_bit() +========================================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_ARRAY_FROM_VECTOR_PACKED_BIT(b, key, view) \ + bson_append_array_from_vector_packed_bit (b, key, (int) strlen (key), view) + + bool + bson_append_array_from_vector_packed_bit (bson_t *bson, + const char *key, + int key_length, + bson_vector_packed_bit_const_view_t view); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``view``: A :symbol:`bson_vector_packed_bit_const_view_t` pointing to validated ``packed_bit`` :doc:`binary_vector` data. + +Description +----------- + +Converts the Vector pointed to by ``view`` into a plain BSON Array, written to ``bson`` under the name ``key``. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_array_builder_append_vector_packed_bit_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_append_binary.rst 2.0.2-1/src/libbson/doc/bson_append_binary.rst --- 1.30.4-1/src/libbson/doc/bson_append_binary.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_binary.rst 2025-06-19 15:42:22.000000000 +0000 @@ -38,3 +38,7 @@ Returns ------- Returns ``true`` if the operation was applied successfully. The function will fail if appending ``binary`` grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_append_binary_uninit` diff -pruN 1.30.4-1/src/libbson/doc/bson_append_binary_uninit.rst 2.0.2-1/src/libbson/doc/bson_append_binary_uninit.rst --- 1.30.4-1/src/libbson/doc/bson_append_binary_uninit.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_binary_uninit.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,43 @@ +:man_page: bson_append_binary_uninit + +bson_append_binary_uninit() +=========================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_BINARY_UNINIT(b, key, subtype, val, len) \ + bson_append_binary_uninit (b, key, (int) strlen (key), subtype, val, len) + + bool + bson_append_binary_uninit (bson_t *bson, + const char *key, + int key_length, + bson_subtype_t subtype, + uint8_t **binary, + uint32_t length); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: The key name. +* ``key_length``: The length of ``key`` in bytes or -1 to use strlen(). +* ``subtype``: A bson_subtype_t indicating the binary subtype. +* ``binary``: Location for a pointer that will receive a writable pointer to the uninitialized binary data block. +* ``length``: The length of ``buffer`` in bytes. + +Description +----------- + +The :symbol:`bson_append_binary_uninit()` function is an alternative to :symbol:`bson_append_binary()` which allows applications to assemble the contents of the binary field within the :symbol:`bson_t`, without an additional temporary buffer. +On success, the caller MUST write to every byte of the binary data block if the resulting :symbol:`bson_t` is to be used. +The buffer that ``binary`` points to is only valid until the iterator's :symbol:`bson_t` is otherwise modified or freed. + + +Returns +------- + +Returns ``true`` if the uninitialized ``binary`` item was appended. The function will fail if appending ``binary`` grows ``bson`` larger than INT32_MAX. diff -pruN 1.30.4-1/src/libbson/doc/bson_append_vector_float32_from_array.rst 2.0.2-1/src/libbson/doc/bson_append_vector_float32_from_array.rst --- 1.30.4-1/src/libbson/doc/bson_append_vector_float32_from_array.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_vector_float32_from_array.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,45 @@ +:man_page: bson_append_vector_float32_from_array + +bson_append_vector_float32_from_array() +======================================= + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_VECTOR_FLOAT32_FROM_ARRAY(b, key, iter, err) \ + bson_append_vector_float32_from_array (b, key, (int) strlen (key), iter, err) + + bool + bson_append_vector_float32_from_array (bson_t *bson, + const char *key, + int key_length, + const bson_iter_t *iter, + bson_error_t *error); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``iter``: A :symbol:`bson_iter_t` referencing array elements that will be converted. +* ``error``: Optional :symbol:`bson_error_t` for detail about conversion failures. + +Description +----------- + +Appends a new field to ``bson`` by converting an Array to a Vector of ``float32`` elements. + +For the conversion to succeed, every item in the Array must be double-precision floating point number. (``BSON_TYPE_DOUBLE``) + +The provided ``iter`` must be positioned just prior to the first element of the BSON Array. +If your input is a bare BSON Array, set up ``iter`` using :symbol:`bson_iter_init`. +If the input is within a document field, use :symbol:`bson_iter_recurse`. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. On error, returns ``false`` and writes additional error information to ``error`` without modifying ``bson``. +The error will have a ``domain`` of ``BSON_ERROR_VECTOR`` and a ``code`` from :symbol:`bson_vector_error_code_t`. diff -pruN 1.30.4-1/src/libbson/doc/bson_append_vector_float32_uninit.rst 2.0.2-1/src/libbson/doc/bson_append_vector_float32_uninit.rst --- 1.30.4-1/src/libbson/doc/bson_append_vector_float32_uninit.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_vector_float32_uninit.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,42 @@ +:man_page: bson_append_vector_float32_uninit + +bson_append_vector_float32_uninit() +=================================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_VECTOR_FLOAT32_UNINIT(b, key, count, view) \ + bson_append_vector_float32_uninit (b, key, (int) strlen (key), count, view) + + bool + bson_append_vector_float32_uninit (bson_t *bson, + const char *key, + int key_length, + size_t element_count, + bson_vector_float32_view_t *view_out); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``element_count``: Number of elements to allocate space for. +* ``view_out``: Receives a :symbol:`bson_vector_float32_view_t` with uninitialized elements. + +Description +----------- + +Appends a new field to ``bson`` by allocating a Vector with the indicated number of ``float32`` elements. +The elements will be uninitialized. +On success, the caller must write every element in the Vector if the resulting :symbol:`bson_t` is to be used. + +The view written to ``*view_out`` is only valid until ``bson`` is otherwise modified or freed. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. diff -pruN 1.30.4-1/src/libbson/doc/bson_append_vector_int8_from_array.rst 2.0.2-1/src/libbson/doc/bson_append_vector_int8_from_array.rst --- 1.30.4-1/src/libbson/doc/bson_append_vector_int8_from_array.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_vector_int8_from_array.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,46 @@ +:man_page: bson_append_vector_int8_from_array + +bson_append_vector_int8_from_array() +==================================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_VECTOR_INT8_FROM_ARRAY(b, key, iter, err) \ + bson_append_vector_int8_from_array (b, key, (int) strlen (key), iter, err) + + bool + bson_append_vector_int8_from_array (bson_t *bson, + const char *key, + int key_length, + const bson_iter_t *iter, + bson_error_t *error); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``iter``: A :symbol:`bson_iter_t` referencing array elements that will be converted. +* ``error``: Optional :symbol:`bson_error_t` for detail about conversion failures. + +Description +----------- + +Appends a new field to ``bson`` by converting an Array to a Vector of ``int8`` elements. + +For the conversion to succeed, every item in the Array must be an integer (``BSON_TYPE_INT32`` or ``BSON_TYPE_INT64``) in the range ``INT8_MIN`` (-128) through ``INT8_MAX`` (127) inclusive. +If any element has an incorrect type or an out-of-range value, the conversion fails with an ``error`` message providing details, and no changes are made to ``bson``. + +The provided ``iter`` must be positioned just prior to the first element of the BSON Array. +If your input is a bare BSON Array, set up ``iter`` using :symbol:`bson_iter_init`. +If the input is within a document field, use :symbol:`bson_iter_recurse`. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. On error, returns ``false`` and writes additional error information to ``error`` without modifying ``bson``. +The error will have a ``domain`` of ``BSON_ERROR_VECTOR`` and a ``code`` from :symbol:`bson_vector_error_code_t`. diff -pruN 1.30.4-1/src/libbson/doc/bson_append_vector_int8_uninit.rst 2.0.2-1/src/libbson/doc/bson_append_vector_int8_uninit.rst --- 1.30.4-1/src/libbson/doc/bson_append_vector_int8_uninit.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_vector_int8_uninit.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,42 @@ +:man_page: bson_append_vector_int8_uninit + +bson_append_vector_int8_uninit() +================================ + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_VECTOR_INT8_UNINIT(b, key, count, view) \ + bson_append_vector_int8_uninit (b, key, (int) strlen (key), count, view) + + bool + bson_append_vector_int8_uninit (bson_t *bson, + const char *key, + int key_length, + size_t element_count, + bson_vector_int8_view_t *view_out); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``element_count``: Number of elements to allocate space for. +* ``view_out``: Receives a :symbol:`bson_vector_int8_view_t` with uninitialized elements. + +Description +----------- + +Appends a new field to ``bson`` by allocating a Vector with the indicated number of ``int8`` elements. +The elements will be uninitialized. +On success, the caller must write every element in the Vector if the resulting :symbol:`bson_t` is to be used. + +The view written to ``*view_out`` is only valid until ``bson`` is otherwise modified or freed. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. diff -pruN 1.30.4-1/src/libbson/doc/bson_append_vector_packed_bit_from_array.rst 2.0.2-1/src/libbson/doc/bson_append_vector_packed_bit_from_array.rst --- 1.30.4-1/src/libbson/doc/bson_append_vector_packed_bit_from_array.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_vector_packed_bit_from_array.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,46 @@ +:man_page: bson_append_vector_packed_bit_from_array + +bson_append_vector_packed_bit_from_array() +========================================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_VECTOR_PACKED_BIT_FROM_ARRAY(b, key, iter, err) \ + bson_append_vector_packed_bit_from_array (b, key, (int) strlen (key), iter, err) + + bool + bson_append_vector_packed_bit_from_array (bson_t *bson, + const char *key, + int key_length, + const bson_iter_t *iter, + bson_error_t *error); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``iter``: A :symbol:`bson_iter_t` referencing array elements that will be converted. +* ``error``: Optional :symbol:`bson_error_t` for detail about conversion failures. + +Description +----------- + +Appends a new field to ``bson`` by converting an Array to a Vector of ``packed_bit`` elements. + +For the conversion to succeed, every item in the Array must be either an integer (``BSON_TYPE_INT32`` or ``BSON_TYPE_INT64``) with the values ``0`` or ``1``, or boolean (``BSON_TYPE_BOOL``). +If any element has an incorrect type or an out-of-range value, the conversion fails with an ``error`` message providing details, and no changes are made to ``bson``. + +The provided ``iter`` must be positioned just prior to the first element of the BSON Array. +If your input is a bare BSON Array, set up ``iter`` using :symbol:`bson_iter_init`. +If the input is within a document field, use :symbol:`bson_iter_recurse`. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. On error, returns ``false`` and writes additional error information to ``error`` without modifying ``bson``. +The error will have a ``domain`` of ``BSON_ERROR_VECTOR`` and a ``code`` from :symbol:`bson_vector_error_code_t`. diff -pruN 1.30.4-1/src/libbson/doc/bson_append_vector_packed_bit_uninit.rst 2.0.2-1/src/libbson/doc/bson_append_vector_packed_bit_uninit.rst --- 1.30.4-1/src/libbson/doc/bson_append_vector_packed_bit_uninit.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_append_vector_packed_bit_uninit.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,42 @@ +:man_page: bson_append_vector_packed_bit_uninit + +bson_append_vector_packed_bit_uninit() +====================================== + +Synopsis +-------- + +.. code-block:: c + + #define BSON_APPEND_VECTOR_PACKED_BIT_UNINIT(b, key, count, view) \ + bson_append_vector_packed_bit_uninit (b, key, (int) strlen (key), count, view) + + bool + bson_append_vector_packed_bit_uninit (bson_t *bson, + const char *key, + int key_length, + size_t element_count, + bson_vector_packed_bit_view_t *view_out); + +Parameters +---------- + +* ``bson``: A :symbol:`bson_t`. +* ``key``: An ASCII C string containing the name of the field. +* ``key_length``: The length of ``key`` in bytes, or -1 to determine the length with ``strlen()``. +* ``element_count``: Number of elements to allocate space for. +* ``view_out``: Receives a :symbol:`bson_vector_packed_bit_view_t` with uninitialized elements. + +Description +----------- + +Appends a new field to ``bson`` by allocating a Vector with the indicated number of ``packed_bit`` elements. +The elements will be uninitialized. +On success, the caller must write every element in the Vector if the resulting :symbol:`bson_t` is to be used. + +The view written to ``*view_out`` is only valid until ``bson`` is otherwise modified or freed. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. diff -pruN 1.30.4-1/src/libbson/doc/bson_array_as_json.rst 2.0.2-1/src/libbson/doc/bson_array_as_json.rst --- 1.30.4-1/src/libbson/doc/bson_array_as_json.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_array_as_json.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -:man_page: bson_array_as_json - -bson_array_as_json() -==================== - -.. warning:: - .. deprecated:: 1.29.0 - - Use :symbol:`bson_array_as_canonical_extended_json()` and :symbol:`bson_array_as_relaxed_extended_json()` instead, which use the same `MongoDB Extended JSON format`_ as all other MongoDB drivers. - - To continue producing Legacy Extended JSON, use :symbol:`bson_array_as_legacy_extended_json()`. - -Synopsis --------- - -.. code-block:: c - - char * - bson_array_as_json (const bson_t *bson, size_t *length); - -Parameters ----------- - -* ``bson``: A :symbol:`bson_t`. -* ``length``: An optional location for the length of the resulting string. - -Description ------------ - -:symbol:`bson_array_as_json()` encodes ``bson`` as a UTF-8 string using :doc:`libbson's Legacy Extended JSON `. -The outermost element is encoded as a JSON array (``[ ... ]``), rather than a JSON document (``{ ... }``). - -The caller is responsible for freeing the resulting UTF-8 encoded string by calling :symbol:`bson_free()` with the result. - -If non-NULL, ``length`` will be set to the length of the result in bytes. - -Returns -------- - -If successful, a newly allocated UTF-8 encoded string and ``length`` is set. - -Upon failure, NULL is returned. - -.. only:: html - - .. include:: includes/seealso/bson-as-json.txt - -.. _MongoDB Extended JSON format: https://github.com/mongodb/specifications/blob/master/source/extended-json/extended-json.md diff -pruN 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_elements.rst 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_elements.rst --- 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_elements.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_elements.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,38 @@ +:man_page: bson_array_builder_append_vector_elements + +bson_array_builder_append_vector_elements() +=========================================== + +Synopsis +-------- + +.. code-block:: c + + bool + bson_array_builder_append_vector_elements (bson_array_builder_t *builder, + const bson_iter_t *iter); + +Parameters +---------- + +* ``builder``: A valid :symbol:`bson_array_builder_t`. +* ``iter``: A :symbol:`bson_iter_t` pointing to any supported :doc:`binary_vector` field. + +Description +----------- + +Converts the Vector pointed to by ``iter`` into elements of a plain BSON Array, written to ``builder``. +This conversion is polymorphic: A converted element type will be chosen based on the type of the input Vector. +For details, see the type-specific versions of this function. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX, or if ``iter`` doesn't point to a valid recognized Vector type. + +.. seealso:: + + | :symbol:`bson_append_array_from_vector` + | :symbol:`bson_array_builder_append_vector_int8_elements` + | :symbol:`bson_array_builder_append_vector_float32_elements` + | :symbol:`bson_array_builder_append_vector_packed_bit_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_float32_elements.rst 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_float32_elements.rst --- 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_float32_elements.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_float32_elements.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,35 @@ +:man_page: bson_array_builder_append_vector_float32_elements + +bson_array_builder_append_vector_float32_elements() +=================================================== + +Synopsis +-------- + +.. code-block:: c + + bool + bson_array_builder_append_vector_float32_elements (bson_array_builder_t *builder, + bson_vector_float32_const_view_t view); + +Parameters +---------- + +* ``builder``: A valid :symbol:`bson_array_builder_t`. +* ``view``: A :symbol:`bson_vector_float32_const_view_t` pointing to validated ``float32`` :doc:`binary_vector` data. + +Description +----------- + +Converts the Vector pointed to by ``view`` into elements of a plain BSON Array, written to ``builder``. +Every element will be converted from ``float`` to ``double`` precision. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_append_array_from_vector` + | :symbol:`bson_array_builder_append_vector_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_int8_elements.rst 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_int8_elements.rst --- 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_int8_elements.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_int8_elements.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,35 @@ +:man_page: bson_array_builder_append_vector_int8_elements + +bson_array_builder_append_vector_int8_elements() +================================================ + +Synopsis +-------- + +.. code-block:: c + + bool + bson_array_builder_append_vector_int8_elements (bson_array_builder_t *builder, + bson_vector_int8_const_view_t view); + +Parameters +---------- + +* ``builder``: A valid :symbol:`bson_array_builder_t`. +* ``view``: A :symbol:`bson_vector_int8_const_view_t` pointing to validated ``int8`` :doc:`binary_vector` data. + +Description +----------- + +Converts the Vector pointed to by ``view`` into elements of a plain BSON Array, written to ``builder``. +Every element will be losslessly extended from ``int8_t`` to ``int32_t``. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_append_array_from_vector` + | :symbol:`bson_array_builder_append_vector_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_packed_bit_elements.rst 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_packed_bit_elements.rst --- 1.30.4-1/src/libbson/doc/bson_array_builder_append_vector_packed_bit_elements.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_array_builder_append_vector_packed_bit_elements.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,35 @@ +:man_page: bson_array_builder_append_vector_packed_bit_elements + +bson_array_builder_append_vector_packed_bit_elements() +====================================================== + +Synopsis +-------- + +.. code-block:: c + + bool + bson_array_builder_append_vector_packed_bit_elements (bson_array_builder_t *builder, + bson_vector_packed_bit_const_view_t view); + +Parameters +---------- + +* ``builder``: A valid :symbol:`bson_array_builder_t`. +* ``view``: A :symbol:`bson_vector_packed_bit_const_view_t` pointing to validated ``packed_bit`` :doc:`binary_vector` data. + +Description +----------- + +Converts the Vector pointed to by ``view`` into elements of a plain BSON Array, written to ``builder``. +Every element will be ``0`` or ``1`` written as a ``BSON_TYPE_INT32``. + +Returns +------- + +Returns ``true`` if the operation was applied successfully. The function fails if appending the array grows ``bson`` larger than INT32_MAX. + +.. seealso:: + + | :symbol:`bson_append_array_from_vector` + | :symbol:`bson_array_builder_append_vector_elements` diff -pruN 1.30.4-1/src/libbson/doc/bson_array_builder_t.rst 2.0.2-1/src/libbson/doc/bson_array_builder_t.rst --- 1.30.4-1/src/libbson/doc/bson_array_builder_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_array_builder_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -83,6 +83,12 @@ Appending values to an array uint32_t length); bool + bson_array_builder_append_binary_uninit (bson_array_builder_t *bab, + bson_subtype_t subtype, + uint8_t **binary, + uint32_t length); + + bool bson_array_builder_append_bool (bson_array_builder_t *bab, bool value); diff -pruN 1.30.4-1/src/libbson/doc/bson_as_json.rst 2.0.2-1/src/libbson/doc/bson_as_json.rst --- 1.30.4-1/src/libbson/doc/bson_as_json.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_as_json.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -:man_page: bson_as_json - -bson_as_json() -============== - -.. warning:: - .. deprecated:: 1.29.0 - - Use :symbol:`bson_as_canonical_extended_json()` and :symbol:`bson_as_relaxed_extended_json()` instead, which use the same `MongoDB Extended JSON format`_ as all other MongoDB drivers. - - To continue producing Legacy Extended JSON, use :symbol:`bson_as_legacy_extended_json()`. - -Synopsis --------- - -.. code-block:: c - - char * - bson_as_json (const bson_t *bson, size_t *length); - -Parameters ----------- - -* ``bson``: A :symbol:`bson_t`. -* ``length``: An optional location for the length of the resulting string. - -Description ------------ - -:symbol:`bson_as_json()` encodes ``bson`` as a UTF-8 string using :doc:`libbson's Legacy Extended JSON `. - -The caller is responsible for freeing the resulting UTF-8 encoded string by calling :symbol:`bson_free()` with the result. - -If non-NULL, ``length`` will be set to the length of the result in bytes. - -Returns -------- - -If successful, a newly allocated UTF-8 encoded string and ``length`` is set. - -Upon failure, NULL is returned. - -.. only:: html - - .. include:: includes/seealso/bson-as-json.txt - -.. _MongoDB Extended JSON format: https://github.com/mongodb/specifications/blob/master/source/extended-json/extended-json.md diff -pruN 1.30.4-1/src/libbson/doc/bson_copy_to_excluding.rst 2.0.2-1/src/libbson/doc/bson_copy_to_excluding.rst --- 1.30.4-1/src/libbson/doc/bson_copy_to_excluding.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_copy_to_excluding.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -:man_page: bson_copy_to_excluding - -bson_copy_to_excluding() -======================== - -.. warning:: - .. deprecated:: 1.1.0 - - Use :symbol:`bson_copy_to_excluding_noinit()` instead. - -Synopsis --------- - -.. code-block:: c - - void - bson_copy_to_excluding (const bson_t *src, - bson_t *dst, - const char *first_exclude, - ...); - -Parameters ----------- - -* ``src``: A :symbol:`bson_t`. -* ``dst``: A :symbol:`bson_t`. -* ``first_exclude``: The first field name to exclude. - -Description ------------ - -The :symbol:`bson_copy_to_excluding()` function shall copy all fields from -``src`` to ``dst`` except those specified by the variadic, NULL terminated list -of keys starting from ``first_exclude``. - -.. warning:: - - :symbol:`bson_init` is called on ``dst``. - diff -pruN 1.30.4-1/src/libbson/doc/bson_copy_to_excluding_noinit.rst 2.0.2-1/src/libbson/doc/bson_copy_to_excluding_noinit.rst --- 1.30.4-1/src/libbson/doc/bson_copy_to_excluding_noinit.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_copy_to_excluding_noinit.rst 2025-06-19 15:42:22.000000000 +0000 @@ -27,9 +27,8 @@ Description The :symbol:`bson_copy_to_excluding_noinit()` function shall copy all fields from ``src`` to ``dst`` except those specified by the variadic, NULL terminated list of keys starting from ``first_exclude``. -Works the same way as :symbol:`bson_copy_to_excluding`, except does **not** call -:symbol:`bson_init` on ``dst``. -This function should be preferred in new code over :symbol:`bson_copy_to_excluding`. + +Does **not** call :symbol:`bson_init` on ``dst``. .. warning:: diff -pruN 1.30.4-1/src/libbson/doc/bson_copy_to_excluding_noinit_va.rst 2.0.2-1/src/libbson/doc/bson_copy_to_excluding_noinit_va.rst --- 1.30.4-1/src/libbson/doc/bson_copy_to_excluding_noinit_va.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_copy_to_excluding_noinit_va.rst 2025-06-19 15:42:22.000000000 +0000 @@ -27,7 +27,7 @@ Description The :symbol:`bson_copy_to_excluding_noinit_va()` function shall copy all fields from ``src`` to ``dst`` except those specified by ``first_exclude`` and ``args``. -This method works the same way as :symbol:`bson_copy_to_excluding_noinit`, except it takes a va_list. This method does not call :symbol:`bson_init` on ``dst``. +Does **not** call :symbol:`bson_init` on ``dst``. .. seealso:: diff -pruN 1.30.4-1/src/libbson/doc/bson_iter_binary.rst 2.0.2-1/src/libbson/doc/bson_iter_binary.rst --- 1.30.4-1/src/libbson/doc/bson_iter_binary.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_iter_binary.rst 2025-06-19 15:42:22.000000000 +0000 @@ -32,3 +32,7 @@ This function shall return the binary da The buffer that ``binary`` points to is only valid until the iterator's :symbol:`bson_t` is modified or freed. +.. seealso:: + + | :symbol:`bson_iter_binary_equal` + | :symbol:`bson_iter_binary_subtype` diff -pruN 1.30.4-1/src/libbson/doc/bson_iter_binary_equal.rst 2.0.2-1/src/libbson/doc/bson_iter_binary_equal.rst --- 1.30.4-1/src/libbson/doc/bson_iter_binary_equal.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_iter_binary_equal.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,30 @@ +:man_page: bson_iter_binary_equal + +bson_iter_binary_equal() +======================== + +Synopsis +-------- + +.. code-block:: c + + bool + bson_iter_binary_equal (const bson_iter_t *iter_a, const bson_iter_t *iter_b); + +Parameters +---------- + +* ``iter_a``: A :symbol:`bson_iter_t`. +* ``iter_b``: A :symbol:`bson_iter_t`. + +Description +----------- + +Compare two BSON_TYPE_BINARY fields for exact equality. + +This is the preferred way to compare :doc:`binary_vector` values for equality. + +Returns +------- + +``true`` if both iterators point to BSON_TYPE_BINARY fields with identical subtype and contents. ``false`` if there is any difference in subtype, length, or content, or if the fields are not binary type. \ No newline at end of file diff -pruN 1.30.4-1/src/libbson/doc/bson_iter_binary_subtype.rst 2.0.2-1/src/libbson/doc/bson_iter_binary_subtype.rst --- 1.30.4-1/src/libbson/doc/bson_iter_binary_subtype.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_iter_binary_subtype.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,24 @@ +:man_page: bson_iter_binary_subtype + +bson_iter_binary_subtype() +========================== + +Synopsis +-------- + +.. code-block:: c + + bson_subtype_t + bson_iter_binary_subtype (const bson_iter_t *iter); + +Parameters +---------- + +* ``iter``: A :symbol:`bson_iter_t`. + +Description +----------- + +This function shall return the subtype of a BSON_TYPE_BINARY element. It is a programming error to call this function on a field that is not of type BSON_TYPE_BINARY. You can check this with the BSON_ITER_HOLDS_BINARY() macro or :symbol:`bson_iter_type()`. + +Equivalent to the ``subtype`` output parameter of :symbol:`bson_iter_binary`. diff -pruN 1.30.4-1/src/libbson/doc/bson_iter_overwrite_binary.rst 2.0.2-1/src/libbson/doc/bson_iter_overwrite_binary.rst --- 1.30.4-1/src/libbson/doc/bson_iter_overwrite_binary.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_iter_overwrite_binary.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,38 @@ +:man_page: bson_iter_overwrite_binary + +bson_iter_overwrite_binary() +============================ + +Synopsis +-------- + +.. code-block:: c + + void + bson_iter_overwrite_binary (bson_iter_t *iter, + bson_subtype_t subtype, + uint32_t *binary_len, + uint8_t **binary); + +Parameters +---------- + +* ``iter``: A :symbol:`bson_iter_t`. +* ``subtype``: The expected :symbol:`bson_subtype_t`. +* ``binary_len``: A location for the length of ``binary``. +* ``binary``: A location for a pointer to the mutable buffer. + +Description +----------- + +The ``bson_iter_overwrite_binary()`` function obtains mutable access to a BSON_TYPE_BINARY element in place. + +This may only be done when the underlying bson document allows mutation. + +It is a programming error to call this function when ``iter`` is not observing an element of type BSON_TYPE_BINARY and the provided ``subtype``. + +The buffer that ``binary`` points to is only valid until the iterator's :symbol:`bson_t` is otherwise modified or freed. + +.. seealso:: + + | :symbol:`bson_iter_binary` diff -pruN 1.30.4-1/src/libbson/doc/bson_iter_t.rst 2.0.2-1/src/libbson/doc/bson_iter_t.rst --- 1.30.4-1/src/libbson/doc/bson_iter_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_iter_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -22,6 +22,11 @@ Synopsis #define BSON_ITER_HOLDS_BINARY(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR_INT8(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR_FLOAT32(iter) /* ... */ + #define BSON_ITER_HOLDS_VECTOR_PACKED_BIT(iter) /* ... */ + #define BSON_ITER_HOLDS_UNDEFINED(iter) /* ... */ #define BSON_ITER_HOLDS_OID(iter) /* ... */ @@ -88,6 +93,8 @@ The :symbol:`bson_t` *MUST* be valid for bson_iter_as_double bson_iter_as_int64 bson_iter_binary + bson_iter_binary_subtype + bson_iter_binary_equal bson_iter_bool bson_iter_code bson_iter_codewscope @@ -115,6 +122,7 @@ The :symbol:`bson_t` *MUST* be valid for bson_iter_offset bson_iter_oid bson_iter_overwrite_bool + bson_iter_overwrite_binary bson_iter_overwrite_date_time bson_iter_overwrite_decimal128 bson_iter_overwrite_double diff -pruN 1.30.4-1/src/libbson/doc/bson_oid_init_sequence.rst 2.0.2-1/src/libbson/doc/bson_oid_init_sequence.rst --- 1.30.4-1/src/libbson/doc/bson_oid_init_sequence.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_oid_init_sequence.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -:man_page: bson_oid_init_sequence - -bson_oid_init_sequence() -======================== - -.. warning:: - .. deprecated:: 1.14.0 - - Use :symbol:`bson_oid_init()` instead. - -Synopsis --------- - -.. code-block:: c - - void - bson_oid_init_sequence (bson_oid_t *oid, bson_context_t *context); - -Parameters ----------- - -* ``oid``: A :symbol:`bson_oid_t`. -* ``context``: An optional :symbol:`bson_context_t`. - -Description ------------ - -Generates a new ObjectID with the next 64-bit sequence number in ``context``. The first 4 bytes contain the current time and the following 8 contain the sequence number in big-endian format. - -The :symbol:`bson_oid_t` generated by this function is not guaranteed to be globally unique. Only unique within this context. It is however, guaranteed to be sequential. diff -pruN 1.30.4-1/src/libbson/doc/bson_oid_t.rst 2.0.2-1/src/libbson/doc/bson_oid_t.rst --- 1.30.4-1/src/libbson/doc/bson_oid_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_oid_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -70,7 +70,6 @@ You can validate that a string containin bson_oid_init_from_data bson_oid_init_from_string bson_oid_init_from_string_unsafe - bson_oid_init_sequence bson_oid_is_valid bson_oid_to_string diff -pruN 1.30.4-1/src/libbson/doc/bson_string_append.rst 2.0.2-1/src/libbson/doc/bson_string_append.rst --- 1.30.4-1/src/libbson/doc/bson_string_append.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_append.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -:man_page: bson_string_append - -bson_string_append() -==================== - -.. warning:: - .. deprecated:: 1.29.0 - -Synopsis --------- - -.. code-block:: c - - void - bson_string_append (bson_string_t *string, const char *str); - -Parameters ----------- - -* ``string``: A :symbol:`bson_string_t`. -* ``str``: A string. - -Description ------------ - -Appends the ASCII or UTF-8 encoded string ``str`` to ``string``. This is not suitable for embedding NULLs in strings. - -.. warning:: The length of the resulting string (including the ``NULL`` terminator) MUST NOT exceed ``UINT32_MAX``. diff -pruN 1.30.4-1/src/libbson/doc/bson_string_append_c.rst 2.0.2-1/src/libbson/doc/bson_string_append_c.rst --- 1.30.4-1/src/libbson/doc/bson_string_append_c.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_append_c.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -:man_page: bson_string_append_c - -bson_string_append_c() -====================== - -.. warning:: - .. deprecated:: 1.29.0 - -Synopsis --------- - -.. code-block:: c - - void - bson_string_append_c (bson_string_t *string, char str); - -Parameters ----------- - -* ``string``: A :symbol:`bson_string_t`. -* ``str``: An ASCII char. - -Description ------------ - -Appends ``c`` to the string builder ``string``. - -.. warning:: The length of the resulting string (including the ``NULL`` terminator) MUST NOT exceed ``UINT32_MAX``. diff -pruN 1.30.4-1/src/libbson/doc/bson_string_append_printf.rst 2.0.2-1/src/libbson/doc/bson_string_append_printf.rst --- 1.30.4-1/src/libbson/doc/bson_string_append_printf.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_append_printf.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -:man_page: bson_string_append_printf - -bson_string_append_printf() -=========================== - -.. warning:: - .. deprecated:: 1.29.0 - -Synopsis --------- - -.. code-block:: c - - void - bson_string_append_printf (bson_string_t *string, const char *format, ...); - -Parameters ----------- - -* ``string``: A :symbol:`bson_string_t`. -* ``format``: A printf style format string. - -Description ------------ - -Like bson_string_append() but formats a printf style string and then appends that to ``string``. - -.. warning:: The length of the resulting string (including the ``NULL`` terminator) MUST NOT exceed ``UINT32_MAX``. diff -pruN 1.30.4-1/src/libbson/doc/bson_string_append_unichar.rst 2.0.2-1/src/libbson/doc/bson_string_append_unichar.rst --- 1.30.4-1/src/libbson/doc/bson_string_append_unichar.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_append_unichar.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -:man_page: bson_string_append_unichar - -bson_string_append_unichar() -============================ - -.. warning:: - .. deprecated:: 1.29.0 - -Synopsis --------- - -.. code-block:: c - - void - bson_string_append_unichar (bson_string_t *string, bson_unichar_t unichar); - -Parameters ----------- - -* ``string``: A :symbol:`bson_string_t`. -* ``unichar``: A :symbol:`bson_unichar_t`. - -Description ------------ - -Appends a unicode character to string. The character will be encoded into its multi-byte UTF-8 representation. - -.. warning:: The length of the resulting string (including the ``NULL`` terminator) MUST NOT exceed ``UINT32_MAX``. diff -pruN 1.30.4-1/src/libbson/doc/bson_string_free.rst 2.0.2-1/src/libbson/doc/bson_string_free.rst --- 1.30.4-1/src/libbson/doc/bson_string_free.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_free.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -:man_page: bson_string_free - -bson_string_free() -================== - -.. warning:: - .. deprecated:: 1.29.0 - -Synopsis --------- - -.. code-block:: c - - char * - bson_string_free (bson_string_t *string, bool free_segment); - -Parameters ----------- - -* ``string``: A :symbol:`bson_string_t`. -* ``free_segment``: A bool indicating whether ``string->str`` should be freed. - -Description ------------ - -Frees the ``bson_string_t`` structure and optionally ``string->str``. - -Returns -------- - -``string->str`` if ``free_segment`` is false, otherwise ``NULL``. - diff -pruN 1.30.4-1/src/libbson/doc/bson_string_new.rst 2.0.2-1/src/libbson/doc/bson_string_new.rst --- 1.30.4-1/src/libbson/doc/bson_string_new.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_new.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -:man_page: bson_string_new - -bson_string_new() -================= - -.. warning:: - .. deprecated:: 1.29.0 - -Synopsis --------- - -.. code-block:: c - - bson_string_t * - bson_string_new (const char *str); - -Parameters ----------- - -* ``str``: A string to be copied or NULL. - -Description ------------ - -Creates a new string builder, which uses power-of-two growth of buffers. Use the various bson_string_append*() functions to append to the string. - -.. warning:: The length of the resulting string (including the ``NULL`` terminator) MUST NOT exceed ``UINT32_MAX``. - -Returns -------- - -A newly allocated bson_string_t that should be freed with bson_string_free() when no longer in use. - diff -pruN 1.30.4-1/src/libbson/doc/bson_string_t.rst 2.0.2-1/src/libbson/doc/bson_string_t.rst --- 1.30.4-1/src/libbson/doc/bson_string_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_t.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -:man_page: bson_string_t - -bson_string_t -============= - -.. warning:: - .. deprecated:: 1.29.0 - - -String Building Abstraction - -Synopsis --------- - -.. code-block:: c - - #include - - typedef struct { - char *str; - uint32_t len; - uint32_t alloc; - } bson_string_t; - -Description ------------ - -:symbol:`bson_string_t` is an abstraction for building strings. As chunks are added to the string, allocations are performed in powers of two. - -This API is useful if you need to build UTF-8 encoded strings. - -.. only:: html - - Functions - --------- - - .. toctree:: - :titlesonly: - :maxdepth: 1 - - bson_string_append - bson_string_append_c - bson_string_append_printf - bson_string_append_unichar - bson_string_free - bson_string_new - bson_string_truncate - -Example -------- - -.. code-block:: c - - bson_string_t *str; - - str = bson_string_new (NULL); - bson_string_append_printf (str, "%d %s %f\n", 0, "some string", 0.123); - printf ("%s\n", str->str); - - bson_string_free (str, true); - -.. tip:: - - You can call :symbol:`bson_string_free()` with ``false`` if you would like to take ownership of ``str->str``. Some APIs that do this might call ``return bson_string_free (str, false);`` after building the string. - diff -pruN 1.30.4-1/src/libbson/doc/bson_string_truncate.rst 2.0.2-1/src/libbson/doc/bson_string_truncate.rst --- 1.30.4-1/src/libbson/doc/bson_string_truncate.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_string_truncate.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -:man_page: bson_string_truncate - -bson_string_truncate() -====================== - -.. warning:: - .. deprecated:: 1.29.0 - - -Synopsis --------- - -.. code-block:: c - - void - bson_string_truncate (bson_string_t *string, uint32_t len); - -Parameters ----------- - -* ``string``: A :symbol:`bson_string_t`. -* ``len``: The new length of the string, excluding the trailing ``\0``. - -Description ------------ - -Truncates the string so that it is ``len`` bytes in length. This must be smaller or equal to the current length of the string. - -A ``\0`` byte will be placed where the end of the string occurs. - -.. warning:: This function is oblivious to UTF-8 structure. If truncation occurs in the middle of a UTF-8 byte sequence, the resulting :symbol:`bson_string_t` will contain invalid UTF-8. - -.. warning:: The length of the resulting string (including the ``NULL`` terminator) MUST NOT exceed ``UINT32_MAX``. diff -pruN 1.30.4-1/src/libbson/doc/bson_subtype_t.rst 2.0.2-1/src/libbson/doc/bson_subtype_t.rst --- 1.30.4-1/src/libbson/doc/bson_subtype_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_subtype_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -22,6 +22,7 @@ Synopsis BSON_SUBTYPE_MD5 = 0x05, BSON_SUBTYPE_COLUMN = 0x07, BSON_SUBTYPE_SENSITIVE = 0x08, + BSON_SUBTYPE_VECTOR = 0x09, BSON_SUBTYPE_USER = 0x80, } bson_subtype_t; diff -pruN 1.30.4-1/src/libbson/doc/bson_t.rst 2.0.2-1/src/libbson/doc/bson_t.rst --- 1.30.4-1/src/libbson/doc/bson_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -56,6 +56,9 @@ Synopsis #define BSON_APPEND_BINARY(b, key, subtype, val, len) \ bson_append_binary (b, key, (int) strlen (key), subtype, val, len) + #define BSON_APPEND_BINARY_UNINIT(b, key, subtype, val, len) \ + bson_append_binary_uninit (b, key, (int) strlen (key), subtype, val, len) + #define BSON_APPEND_BOOL(b, key, val) \ bson_append_bool (b, key, (int) strlen (key), val) @@ -124,12 +127,11 @@ Synopsis #define BSON_APPEND_VALUE(b, key, val) \ bson_append_value (b, key, (int) strlen (key), (val)) - BSON_ALIGNED_BEGIN (128) typedef struct { uint32_t flags; /* Internal flags for the bson_t. */ uint32_t len; /* Length of BSON data. */ uint8_t padding[120]; /* Padding for stack allocation. */ - } bson_t BSON_ALIGNED_END (128); + } bson_t; Description ----------- @@ -163,6 +165,7 @@ BSON document contains duplicate keys. bson_append_array_begin bson_append_array_end bson_append_binary + bson_append_binary_uninit bson_append_bool bson_append_code bson_append_code_with_scope @@ -191,11 +194,9 @@ BSON document contains duplicate keys. bson_append_utf8 bson_append_value bson_array_as_canonical_extended_json - bson_array_as_json bson_array_as_legacy_extended_json bson_array_as_relaxed_extended_json bson_as_canonical_extended_json - bson_as_json bson_as_json_with_opts bson_as_legacy_extended_json bson_as_relaxed_extended_json @@ -203,7 +204,6 @@ BSON document contains duplicate keys. bson_concat bson_copy bson_copy_to - bson_copy_to_excluding bson_copy_to_excluding_noinit bson_copy_to_excluding_noinit_va bson_count_keys diff -pruN 1.30.4-1/src/libbson/doc/bson_validate_flags_t.rst 2.0.2-1/src/libbson/doc/bson_validate_flags_t.rst --- 1.30.4-1/src/libbson/doc/bson_validate_flags_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_validate_flags_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -19,6 +19,7 @@ Synopsis BSON_VALIDATE_DOT_KEYS = (1 << 2), BSON_VALIDATE_UTF8_ALLOW_NULL = (1 << 3), BSON_VALIDATE_EMPTY_KEYS = (1 << 4), + BSON_VALIDATE_CORRUPT = (1 << 5), } bson_validate_flags_t; Description @@ -40,6 +41,8 @@ Each defined flag aside from ``BSON_VALI * ``BSON_VALIDATE_DOLLAR_KEYS`` Prohibit keys that start with ``$`` outside of a "DBRef" subdocument. * ``BSON_VALIDATE_DOT_KEYS`` Prohibit keys that contain ``.`` anywhere in the string. * ``BSON_VALIDATE_EMPTY_KEYS`` Prohibit zero-length keys. +* ``BSON_VALIDATE_CORRUPT`` is not a control flag, but is used as an error code + when a validation routine encounters corrupt BSON data. .. seealso:: diff -pruN 1.30.4-1/src/libbson/doc/bson_value_copy.rst 2.0.2-1/src/libbson/doc/bson_value_copy.rst --- 1.30.4-1/src/libbson/doc/bson_value_copy.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_value_copy.rst 2025-06-19 15:42:22.000000000 +0000 @@ -21,6 +21,7 @@ Description ----------- This function will copy the boxed content in ``src`` into ``dst``. ``dst`` must be freed with :symbol:`bson_value_destroy()` when no longer in use. +``dst`` *MUST* be an uninitialized :symbol:`bson_value_t` to avoid leaking memory. .. note:: diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_error_code_t.rst 2.0.2-1/src/libbson/doc/bson_vector_error_code_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_error_code_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_error_code_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,30 @@ +:man_page: bson_vector_error_code_t + +bson_vector_error_code_t +======================== + +BSON Error codes for :doc:`binary_vector` operations that could fail in multiple ways. + +Synopsis +-------- + +.. code-block:: c + + #define BSON_ERROR_VECTOR 4 + + typedef enum { + BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE = 1, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_VALUE = 2, + BSON_VECTOR_ERROR_ARRAY_KEY = 3, + BSON_VECTOR_ERROR_MAX_SIZE = 4, + } bson_vector_error_code_t; + +Description +----------- + +The error ``code`` values in ``bson_vector_error_code_t`` apply to :symbol:`bson_error_t` values with a ``category`` of ``BSON_ERROR_CATEGORY`` and a ``domain`` of ``BSON_ERROR_VECTOR``. + +* ``BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE``: An element was encountered with incorrect type. Location and type details in ``message``. +* ``BSON_VECTOR_ERROR_ARRAY_ELEMENT_VALUE``: An element was encountered with out-of-range value. Location and value details in ``message``. +* ``BSON_VECTOR_ERROR_ARRAY_KEY``: An input BSON Array did not contain the expected numeric key value. Expected and actual keys in ``message``. +* ``BSON_VECTOR_ERROR_MAX_SIZE``: The BSON maximum document size would be exceeded. Equivalent to a failure from ``bson_append_*`` functions that do not return an ``error``. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_binary_data_length.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_binary_data_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_binary_data_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_binary_data_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,31 @@ +:man_page: bson_vector_float32_binary_data_length + +bson_vector_float32_binary_data_length() +======================================== + +Calculate the size of a BSON Binary field that would be needed to store a Vector with the indicated number of ``float32`` elements. + +Synopsis +-------- + +.. code-block:: c + + uint32_t + bson_vector_float32_binary_data_length (size_t element_count); + +Parameters +---------- + +* ``element_count``: Number of elements, as a ``size_t``. + +Description +----------- + +Checks ``element_count`` against the maximum representable size, and calculates the required Binary size. + +Returns +------- + +On success, returns the required Binary size as a ``uint32_t`` greater than or equal to ``BSON_VECTOR_HEADER_LEN``. +This length includes the 2-byte Vector header, but not the Binary subtype header or any other BSON headers. +If the ``element_count`` is too large to represent, returns 0. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_from_iter.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_from_iter.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_from_iter.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_from_iter.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_float32_const_view_from_iter + +bson_vector_float32_const_view_from_iter() +========================================== + +Initialize a :symbol:`bson_vector_float32_const_view_t` from a :symbol:`bson_iter_t` pointing to a valid Vector of ``float32`` element type. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_const_view_from_iter (bson_vector_float32_const_view_t *view_out, + const bson_iter_t *iter); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_float32_const_view_t` is written here on success. +* ``iter``: A valid :symbol:`bson_iter_t`. + +Description +----------- + +The provided iterator, which must point to some kind of BSON item, will be checked for a valid Vector of ``float32`` element type. +On success, a :symbol:`bson_vector_float32_const_view_t` is set to point to the same underlying :symbol:`bson_t` buffer as the provided :symbol:`bson_iter_t`. +The view will only be valid until the containing document is destroyed or modified. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_float32_view_from_iter` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_init.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_init.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_init.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_init.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,39 @@ +:man_page: bson_vector_float32_const_view_init + +bson_vector_float32_const_view_init() +===================================== + +Initialize a :symbol:`bson_vector_float32_const_view_t` from a const ``uint8_t`` buffer. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_const_view_init (bson_vector_float32_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_float32_const_view_t` is written here on success. +* ``binary_data``: A pointer to the BSON Binary data block to be validated. +* ``binary_data_len``: Length of the binary data block, in bytes. + +Description +----------- + +The length and header of the provided binary data block will be checked for a valid Vector of ``float32`` element type. +On success, the pointer and length are packaged as a :symbol:`bson_vector_float32_const_view_t` written to ``*view_out``. +The view will only be valid as long as ``binary_data`` is valid. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_float32_view_init` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_length.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,33 @@ +:man_page: bson_vector_float32_const_view_length + +bson_vector_float32_const_view_length() +======================================= + +Return the number of elements in a Vector referenced by a :symbol:`bson_vector_float32_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_float32_const_view_length (bson_vector_float32_const_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_float32_const_view_t`. + +Description +----------- + +An element count is calculated from the view's stored binary block length. + +Returns +------- + +The number of elements, as a ``size_t``. + +.. seealso:: + + | :symbol:`bson_vector_float32_view_length` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_read.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_read.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_read.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_read.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,41 @@ +:man_page: bson_vector_float32_const_view_read + +bson_vector_float32_const_view_read() +===================================== + +Copy a contiguous block of elements from a :symbol:`bson_vector_float32_const_view_t` into a C array of ``float``. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_const_view_read (bson_vector_float32_const_view_t view, + float *values_out, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_float32_const_view_t`. +* ``values_out``: Location where the ``float`` elements will be read to. +* ``element_count``: Number of elements to read. +* ``vector_offset_elements``: The vector index of the first element to read. + +Description +----------- + +Elements are copied in bulk from the view to the provided output pointer. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and reads ``element_count`` elements into ``*values_out``. + +.. seealso:: + + | :symbol:`bson_vector_float32_view_read` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_t.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_const_view_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_const_view_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,62 @@ +:man_page: bson_vector_float32_const_view_t + +bson_vector_float32_const_view_t +================================ + +A reference to non-owned const BSON Binary data holding a valid Vector of ``float32`` element type. + +Synopsis +-------- + +.. code-block:: c + + #include + + typedef struct bson_vector_float32_const_view_t { + /*< private >*/ + } bson_vector_float32_const_view_t; + +Description +----------- + +:symbol:`bson_vector_float32_const_view_t` is a structure that acts as an opaque const reference to a block of memory that has been validated as a ``float32`` vector. + +It is meant to be passed by value and can be discarded at any time. The contents of the structure should be considered private. + +The :symbol:`bson_t` *MUST* be valid for the lifetime of the view and it is an error to modify the :symbol:`bson_t` while using the view. + +.. only:: html + + Functions + --------- + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_float32_const_view_init + bson_vector_float32_const_view_from_iter + bson_vector_float32_const_view_length + bson_vector_float32_const_view_read + +Example +------- + +.. code-block:: c + + bson_iter_t iter; + bson_vector_float32_const_view_t view; + + if (bson_iter_init_find (&iter, &doc, "vector") && bson_vector_float32_const_view_from_iter (&view, &iter)) { + size_t length = bson_vector_float32_const_view_length (view); + printf ("Elements in 'vector':\n"); + for (size_t i = 0; i < length; i++) { + float element; + BSON_ASSERT (bson_vector_float32_const_view_read (view, &element, 1, i)); + printf (" [%d] = %f\n", (int) i, element); + } + } + +.. seealso:: + + | :symbol:`bson_vector_float32_view_t` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_as_const.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_as_const.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_as_const.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_as_const.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,29 @@ +:man_page: bson_vector_float32_view_as_const + +bson_vector_float32_view_as_const() +=================================== + +Convert a :symbol:`bson_vector_float32_view_t` into a :symbol:`bson_vector_float32_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bson_vector_float32_const_view_t + bson_vector_float32_view_as_const (bson_vector_float32_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_float32_view_t`. + +Description +----------- + +This adds a ``const`` qualifier to the view without re-validating the underlying data. + +Returns +------- + +Always returns a :symbol:`bson_vector_float32_const_view_t`. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_from_iter.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_from_iter.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_from_iter.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_from_iter.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_float32_view_from_iter + +bson_vector_float32_view_from_iter() +==================================== + +Initialize a :symbol:`bson_vector_float32_view_t` from a :symbol:`bson_iter_t` pointing to a valid Vector of ``float32`` element type. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_view_from_iter (bson_vector_float32_view_t *view_out, + bson_iter_t *iter); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_float32_view_t` is written here on success. +* ``iter``: A valid :symbol:`bson_iter_t`. + +Description +----------- + +The provided iterator, which must point to some kind of BSON item, will be checked for a valid Vector of ``float32`` element type. +On success, a :symbol:`bson_vector_float32_view_t` is set to point to the same underlying :symbol:`bson_t` buffer as the provided :symbol:`bson_iter_t`. +The view will only be valid until the containing document is destroyed or otherwise modified. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_float32_const_view_from_iter` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_init.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_init.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_init.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_init.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,39 @@ +:man_page: bson_vector_float32_view_init + +bson_vector_float32_view_init() +=============================== + +Initialize a :symbol:`bson_vector_float32_view_t` from a mutable ``uint8_t`` buffer. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_view_init (bson_vector_float32_view_t *view_out, + uint8_t *binary_data, + uint32_t binary_data_len); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_float32_view_t` is written here on success. +* ``binary_data``: A pointer to the BSON Binary data block to be validated. +* ``binary_data_len``: Length of the binary data block, in bytes. + +Description +----------- + +The length and header of the provided binary data block will be checked for a valid Vector of ``float32`` element type. +On success, the pointer and length are packaged as a :symbol:`bson_vector_float32_view_t` written to ``*view_out``. +The view will only be valid as long as ``binary_data`` is valid. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_float32_const_view_init` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_length.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,33 @@ +:man_page: bson_vector_float32_view_length + +bson_vector_float32_view_length() +================================= + +Return the number of elements in a Vector referenced by a :symbol:`bson_vector_float32_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_float32_view_length (bson_vector_float32_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_float32_view_t`. + +Description +----------- + +An element count is calculated from the view's stored binary block length. + +Returns +------- + +The number of elements, as a ``size_t``. + +.. seealso:: + + | :symbol:`bson_vector_float32_const_view_length` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_read.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_read.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_read.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_read.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,41 @@ +:man_page: bson_vector_float32_view_read + +bson_vector_float32_view_read() +=============================== + +Copy a contiguous block of elements from a :symbol:`bson_vector_float32_view_t` into a C array of ``float``. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_view_read (bson_vector_float32_view_t view, + float *values_out, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_float32_view_t`. +* ``values_out``: Location where the ``float`` elements will be read to. +* ``element_count``: Number of elements to read. +* ``vector_offset_elements``: The vector index of the first element to read. + +Description +----------- + +Elements are copied in bulk from the view to the provided output pointer. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and reads ``element_count`` elements into ``*values_out``. + +.. seealso:: + + | :symbol:`bson_vector_float32_const_view_read` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_t.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,59 @@ +:man_page: bson_vector_float32_view_t + +bson_vector_float32_view_t +========================== + +A reference to mutable non-owned BSON Binary data holding a valid Vector of ``float32`` element type. + +Synopsis +-------- + +.. code-block:: c + + #include + + typedef struct bson_vector_float32_view_t { + /*< private >*/ + } bson_vector_float32_view_t; + +Description +----------- + +:symbol:`bson_vector_float32_view_t` is a structure that acts as an opaque reference to a block of memory that has been validated as a ``float32`` vector. + +It is meant to be passed by value and can be discarded at any time. The contents of the structure should be considered private. + +The :symbol:`bson_t` *MUST* be valid for the lifetime of the view and it is an error to modify the :symbol:`bson_t` while using the view. + +.. only:: html + + Functions + --------- + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_float32_view_init + bson_vector_float32_view_from_iter + bson_vector_float32_view_as_const + bson_vector_float32_view_length + bson_vector_float32_view_read + bson_vector_float32_view_write + +Example +------- + +.. code-block:: c + + static const float values[] = {1.0f, 2.0f, 3.0f}; + const size_t values_count = sizeof values / sizeof values[0]; + + bson_vector_float32_view_t view; + BSON_ASSERT (BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "vector", values_count, &view)); + BSON_ASSERT (bson_vector_float32_view_write (view, values, values_count, 0)); + +.. seealso:: + + | :symbol:`bson_append_vector_float32_uninit` + | :symbol:`bson_vector_float32_const_view_t` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_float32_view_write.rst 2.0.2-1/src/libbson/doc/bson_vector_float32_view_write.rst --- 1.30.4-1/src/libbson/doc/bson_vector_float32_view_write.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_float32_view_write.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_float32_view_write + +bson_vector_float32_view_write() +================================ + +Copy a contiguous block of elements from a C ``float`` array into a :symbol:`bson_vector_float32_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_float32_view_write (bson_vector_float32_view_t view, + const float *values, + size_t element_count, + size_t vector_offset_elements) + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_float32_view_t`. +* ``values``: Location where the ``float`` elements will be copied from. +* ``element_count``: Number of elements to write. +* ``vector_offset_elements``: The vector index of the first element to write. + +Description +----------- + +Elements are copied in bulk from the provided pointer into the view. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and writes to ``element_count`` elements in the Vector starting at ``vector_offset_elements``. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_binary_data_length.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_binary_data_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_binary_data_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_binary_data_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,31 @@ +:man_page: bson_vector_int8_binary_data_length + +bson_vector_int8_binary_data_length() +===================================== + +Calculate the size of a BSON Binary field that would be needed to store a Vector with the indicated number of ``int8`` elements. + +Synopsis +-------- + +.. code-block:: c + + uint32_t + bson_vector_int8_binary_data_length (size_t element_count); + +Parameters +---------- + +* ``element_count``: Number of elements, as a ``size_t``. + +Description +----------- + +Checks ``element_count`` against the maximum representable size, and calculates the required Binary size. + +Returns +------- + +On success, returns the required Binary size as a ``uint32_t`` greater than or equal to ``BSON_VECTOR_HEADER_LEN``. +This length includes the 2-byte Vector header, but not the Binary subtype header or any other BSON headers. +If the ``element_count`` is too large to represent, returns 0. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_from_iter.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_from_iter.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_from_iter.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_from_iter.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_int8_const_view_from_iter + +bson_vector_int8_const_view_from_iter() +======================================= + +Initialize a :symbol:`bson_vector_int8_const_view_t` from a :symbol:`bson_iter_t` pointing to a valid Vector of ``int8`` element type. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_const_view_from_iter (bson_vector_int8_const_view_t *view_out, + const bson_iter_t *iter); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_int8_const_view_t` is written here on success. +* ``iter``: A valid :symbol:`bson_iter_t`. + +Description +----------- + +The provided iterator, which must point to some kind of BSON item, will be checked for a valid Vector of ``int8`` element type. +On success, a :symbol:`bson_vector_int8_const_view_t` is set to point to the same underlying :symbol:`bson_t` buffer as the provided :symbol:`bson_iter_t`. +The view will only be valid until the containing document is destroyed or modified. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_int8_view_from_iter` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_init.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_init.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_init.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_init.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,39 @@ +:man_page: bson_vector_int8_const_view_init + +bson_vector_int8_const_view_init() +================================== + +Initialize a :symbol:`bson_vector_int8_const_view_t` from a const ``uint8_t`` buffer. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_const_view_init (bson_vector_int8_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_int8_const_view_t` is written here on success. +* ``binary_data``: A pointer to the BSON Binary data block to be validated. +* ``binary_data_len``: Length of the binary data block, in bytes. + +Description +----------- + +The length and header of the provided binary data block will be checked for a valid Vector of ``int8`` element type. +On success, the pointer and length are packaged as a :symbol:`bson_vector_int8_const_view_t` written to ``*view_out``. +The view will only be valid as long as ``binary_data`` is valid. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_int8_view_init` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_length.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,33 @@ +:man_page: bson_vector_int8_const_view_length + +bson_vector_int8_const_view_length() +==================================== + +Return the number of elements in a Vector referenced by a :symbol:`bson_vector_int8_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_int8_const_view_length (bson_vector_int8_const_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_const_view_t`. + +Description +----------- + +An element count is calculated from the view's stored binary block length. + +Returns +------- + +The number of elements, as a ``size_t``. + +.. seealso:: + + | :symbol:`bson_vector_int8_view_length` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_pointer.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_pointer.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_pointer.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_pointer.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,36 @@ +:man_page: bson_vector_int8_const_view_pointer + +bson_vector_int8_const_view_pointer() +===================================== + +Obtain a direct ``int8_t`` pointer to the Vector elements referenced by a :symbol:`bson_vector_int8_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + const int8_t * + bson_vector_int8_const_view_pointer (bson_vector_int8_const_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_const_view_t`. + +Description +----------- + +Unwraps a vector view into a bare pointer. +The ``int8`` Vector elements use a serialized format that's fully compatible with a C ``int8_t``. + +Returns +------- + +A pointer derived from the pointer this View was created from. +Its lifetime matches that of the original pointer. +If the view was created from a :symbol:`bson_iter_t`, it will be valid until the underlying :symbol:`bson_t` is otherwise modified or destroyed. + +.. seealso:: + + | :symbol:`bson_vector_int8_view_pointer` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_read.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_read.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_read.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_read.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,41 @@ +:man_page: bson_vector_int8_const_view_read + +bson_vector_int8_const_view_read() +================================== + +Copy a contiguous block of elements from a :symbol:`bson_vector_int8_const_view_t` into a C array of ``int8_t``. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_const_view_read (bson_vector_int8_const_view_t view, + int8_t *values_out, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_const_view_t`. +* ``values_out``: Location where the ``int8_t`` elements will be read to. +* ``element_count``: Number of elements to read. +* ``vector_offset_elements``: The vector index of the first element to read. + +Description +----------- + +Elements are copied in bulk from the view to the provided output pointer. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and reads ``element_count`` elements into ``*values_out``. + +.. seealso:: + + | :symbol:`bson_vector_int8_view_read` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_t.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_const_view_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_const_view_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,63 @@ +:man_page: bson_vector_int8_const_view_t + +bson_vector_int8_const_view_t +============================= + +A reference to non-owned const BSON Binary data holding a valid Vector of ``int8`` element type. + +Synopsis +-------- + +.. code-block:: c + + #include + + typedef struct bson_vector_int8_const_view_t { + /*< private >*/ + } bson_vector_int8_const_view_t; + +Description +----------- + +:symbol:`bson_vector_int8_const_view_t` is a structure that acts as an opaque const reference to a block of memory that has been validated as an ``int8`` vector. + +It is meant to be passed by value and can be discarded at any time. The contents of the structure should be considered private. + +The :symbol:`bson_t` *MUST* be valid for the lifetime of the view and it is an error to modify the :symbol:`bson_t` while using the view. + +.. only:: html + + Functions + --------- + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_int8_const_view_init + bson_vector_int8_const_view_from_iter + bson_vector_int8_const_view_length + bson_vector_int8_const_view_read + bson_vector_int8_const_view_pointer + +Example +------- + +.. code-block:: c + + bson_iter_t iter; + bson_vector_int8_const_view_t view; + + if (bson_iter_init_find (&iter, &doc, "vector") && bson_vector_int8_const_view_from_iter (&view, &iter)) { + size_t length = bson_vector_int8_const_view_length (view); + printf ("Elements in 'vector':\n"); + for (size_t i = 0; i < length; i++) { + int8_t element; + BSON_ASSERT (bson_vector_int8_const_view_read (view, &element, 1, i)); + printf (" [%d] = %d\n", (int) i, (int) element); + } + } + +.. seealso:: + + | :symbol:`bson_vector_int8_view_t` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_as_const.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_as_const.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_as_const.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_as_const.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,29 @@ +:man_page: bson_vector_int8_view_as_const + +bson_vector_int8_view_as_const() +================================ + +Convert a :symbol:`bson_vector_int8_view_t` into a :symbol:`bson_vector_int8_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bson_vector_int8_const_view_t + bson_vector_int8_view_as_const (bson_vector_int8_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_view_t`. + +Description +----------- + +This adds a ``const`` qualifier to the view without re-validating the underlying data. + +Returns +------- + +Always returns a :symbol:`bson_vector_int8_const_view_t`. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_from_iter.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_from_iter.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_from_iter.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_from_iter.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_int8_view_from_iter + +bson_vector_int8_view_from_iter() +================================= + +Initialize a :symbol:`bson_vector_int8_view_t` from a :symbol:`bson_iter_t` pointing to a valid Vector of ``int8`` element type. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_view_from_iter (bson_vector_int8_view_t *view_out, + bson_iter_t *iter); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_int8_view_t` is written here on success. +* ``iter``: A valid :symbol:`bson_iter_t`. + +Description +----------- + +The provided iterator, which must point to some kind of BSON item, will be checked for a valid Vector of ``int8`` element type. +On success, a :symbol:`bson_vector_int8_view_t` is set to point to the same underlying :symbol:`bson_t` buffer as the provided :symbol:`bson_iter_t`. +The view will only be valid until the containing document is destroyed or otherwise modified. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_int8_const_view_from_iter` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_init.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_init.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_init.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_init.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,39 @@ +:man_page: bson_vector_int8_view_init + +bson_vector_int8_view_init() +============================ + +Initialize a :symbol:`bson_vector_int8_view_t` from a mutable ``uint8_t`` buffer. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_view_init (bson_vector_int8_view_t *view_out, + uint8_t *binary_data, + uint32_t binary_data_len); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_int8_view_t` is written here on success. +* ``binary_data``: A pointer to the BSON Binary data block to be validated. +* ``binary_data_len``: Length of the binary data block, in bytes. + +Description +----------- + +The length and header of the provided binary data block will be checked for a valid Vector of ``int8`` element type. +On success, the pointer and length are packaged as a :symbol:`bson_vector_int8_view_t` written to ``*view_out``. +The view will only be valid as long as ``binary_data`` is valid. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_int8_const_view_init` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_length.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,33 @@ +:man_page: bson_vector_int8_view_length + +bson_vector_int8_view_length() +============================== + +Return the number of elements in a Vector referenced by a :symbol:`bson_vector_int8_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_int8_view_length (bson_vector_int8_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_view_t`. + +Description +----------- + +An element count is calculated from the view's stored binary block length. + +Returns +------- + +The number of elements, as a ``size_t``. + +.. seealso:: + + | :symbol:`bson_vector_int8_const_view_length` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_pointer.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_pointer.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_pointer.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_pointer.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,36 @@ +:man_page: bson_vector_int8_view_pointer + +bson_vector_int8_view_pointer() +=============================== + +Obtain a direct ``int8_t`` pointer to the Vector elements referenced by a :symbol:`bson_vector_int8_view_t`. + +Synopsis +-------- + +.. code-block:: c + + int8_t * + bson_vector_int8_view_pointer (bson_vector_int8_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_view_t`. + +Description +----------- + +Unwraps a vector view into a bare pointer. +The ``int8`` Vector elements use a serialized format that's fully compatible with a C ``int8_t``. + +Returns +------- + +A pointer derived from the pointer this View was created from. +Its lifetime matches that of the original pointer. +If the view was created from a :symbol:`bson_iter_t`, it will be valid until the underlying :symbol:`bson_t` is otherwise modified or destroyed. + +.. seealso:: + + | :symbol:`bson_vector_int8_const_view_pointer` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_read.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_read.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_read.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_read.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,41 @@ +:man_page: bson_vector_int8_view_read + +bson_vector_int8_view_read() +============================ + +Copy a contiguous block of elements from a :symbol:`bson_vector_int8_view_t` into a C array of ``int8_t``. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_view_read (bson_vector_int8_view_t view, + int8_t *values_out, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_view_t`. +* ``values_out``: Location where the ``int8_t`` elements will be read to. +* ``element_count``: Number of elements to read. +* ``vector_offset_elements``: The vector index of the first element to read. + +Description +----------- + +Elements are copied in bulk from the view to the provided output pointer. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and reads ``element_count`` elements into ``*values_out``. + +.. seealso:: + + | :symbol:`bson_vector_int8_const_view_read` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_t.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,60 @@ +:man_page: bson_vector_int8_view_t + +bson_vector_int8_view_t +======================= + +A reference to mutable non-owned BSON Binary data holding a valid Vector of ``int8`` element type. + +Synopsis +-------- + +.. code-block:: c + + #include + + typedef struct bson_vector_int8_view_t { + /*< private >*/ + } bson_vector_int8_view_t; + +Description +----------- + +:symbol:`bson_vector_int8_view_t` is a structure that acts as an opaque reference to a block of memory that has been validated as an ``int8`` vector. + +It is meant to be passed by value and can be discarded at any time. The contents of the structure should be considered private. + +The :symbol:`bson_t` *MUST* be valid for the lifetime of the view and it is an error to modify the :symbol:`bson_t` while using the view. + +.. only:: html + + Functions + --------- + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_int8_view_init + bson_vector_int8_view_from_iter + bson_vector_int8_view_as_const + bson_vector_int8_view_length + bson_vector_int8_view_read + bson_vector_int8_view_write + bson_vector_int8_view_pointer + +Example +------- + +.. code-block:: c + + static const int8_t values[] = {1, 2, 3}; + const size_t values_count = sizeof values / sizeof values[0]; + + bson_vector_int8_view_t view; + BSON_ASSERT (BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "vector", values_count, &view)); + BSON_ASSERT (bson_vector_int8_view_write (view, values, values_count, 0)); + +.. seealso:: + + | :symbol:`bson_append_vector_int8_uninit` + | :symbol:`bson_vector_int8_const_view_t` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_int8_view_write.rst 2.0.2-1/src/libbson/doc/bson_vector_int8_view_write.rst --- 1.30.4-1/src/libbson/doc/bson_vector_int8_view_write.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_int8_view_write.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_int8_view_write + +bson_vector_int8_view_write() +============================= + +Copy a contiguous block of elements from a C ``int8_t`` array into a :symbol:`bson_vector_int8_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_int8_view_write (bson_vector_int8_view_t view, + const int8_t *values, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_int8_view_t`. +* ``values``: Location where the ``int8_t`` elements will be copied from. +* ``element_count``: Number of elements to write. +* ``vector_offset_elements``: The vector index of the first element to write. + +Description +----------- + +Elements are copied in bulk from the provided pointer into the view. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and writes to ``element_count`` elements in the Vector starting at ``vector_offset_elements``. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_binary_data_length.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_binary_data_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_binary_data_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_binary_data_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,31 @@ +:man_page: bson_vector_packed_bit_binary_data_length + +bson_vector_packed_bit_binary_data_length() +=========================================== + +Calculate the size of a BSON Binary field that would be needed to store a Vector with the indicated number of ``packed_bit`` elements. + +Synopsis +-------- + +.. code-block:: c + + uint32_t + bson_vector_packed_bit_binary_data_length (size_t element_count); + +Parameters +---------- + +* ``element_count``: Number of single-bit elements, as a ``size_t``. + +Description +----------- + +Checks ``element_count`` against the maximum representable size, and calculates the required Binary size. + +Returns +------- + +On success, returns the required Binary size as a ``uint32_t`` greater than or equal to ``BSON_VECTOR_HEADER_LEN``. +This length includes the 2-byte Vector header, but not the Binary subtype header or any other BSON headers. +If the ``element_count`` is too large to represent, returns 0. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_from_iter.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_from_iter.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_from_iter.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_from_iter.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_packed_bit_const_view_from_iter + +bson_vector_packed_bit_const_view_from_iter() +============================================= + +Initialize a :symbol:`bson_vector_packed_bit_const_view_t` from a :symbol:`bson_iter_t` pointing to a valid Vector of ``packed_bit`` element type. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_const_view_from_iter (bson_vector_packed_bit_const_view_t *view_out, + const bson_iter_t *iter); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_packed_bit_const_view_t` is written here on success. +* ``iter``: A valid :symbol:`bson_iter_t`. + +Description +----------- + +The provided iterator, which must point to some kind of BSON item, will be checked for a valid Vector of ``packed_bit`` element type. +On success, a :symbol:`bson_vector_packed_bit_const_view_t` is set to point to the same underlying :symbol:`bson_t` buffer as the provided :symbol:`bson_iter_t`. +The view will only be valid until the containing document is destroyed or modified. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_from_iter` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_init.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_init.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_init.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_init.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,39 @@ +:man_page: bson_vector_packed_bit_const_view_init + +bson_vector_packed_bit_const_view_init() +======================================== + +Initialize a :symbol:`bson_vector_packed_bit_const_view_t` from a const ``uint8_t`` buffer. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_const_view_init (bson_vector_packed_bit_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_packed_bit_const_view_t` is written here on success. +* ``binary_data``: A pointer to the BSON Binary data block to be validated. +* ``binary_data_len``: Length of the binary data block, in bytes. + +Description +----------- + +The length, header, and trailing padding of the provided binary data block will be checked for a valid Vector of ``packed_bit`` element type. +On success, the pointer and length are packaged as a :symbol:`bson_vector_packed_bit_const_view_t` written to ``*view_out``. +The view will only be valid as long as ``binary_data`` is valid. + +Returns +------- + +Returns true if the view was successfully initialized. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_init` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_length.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,33 @@ +:man_page: bson_vector_packed_bit_const_view_length + +bson_vector_packed_bit_const_view_length() +========================================== + +Return the number of elements in a Vector referenced by a :symbol:`bson_vector_packed_bit_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_packed_bit_const_view_length (bson_vector_packed_bit_const_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_const_view_t`. + +Description +----------- + +An element count is calculated from information stored inside the `bson_vector_packed_bit_const_view_t` value. + +Returns +------- + +The number of elements, as a ``size_t``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_length` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_length_bytes.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_length_bytes.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_length_bytes.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_length_bytes.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,34 @@ +:man_page: bson_vector_packed_bit_const_view_length_bytes + +bson_vector_packed_bit_const_view_length_bytes() +================================================ + +Return the number of packed bytes in a Vector referenced by a :symbol:`bson_vector_packed_bit_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_packed_bit_const_view_length_bytes (bson_vector_packed_bit_const_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_const_view_t`. + +Description +----------- + +A byte count is calculated from the view's stored binary block length. +If the element count isn't a multiple of 8, the final byte will include bits that do not belong to any element. + +Returns +------- + +The number of bytes, as a ``size_t``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_length_bytes` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_padding.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_padding.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_padding.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_padding.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,34 @@ +:man_page: bson_vector_packed_bit_const_view_padding + +bson_vector_packed_bit_const_view_padding() +=========================================== + +Returns the number of unused bits in a Vector referenced by a :symbol:`bson_vector_packed_bit_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_packed_bit_const_view_padding (bson_vector_packed_bit_const_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_const_view_t`. + +Description +----------- + +The 3-bit ``padding`` field is extracted from a copy of the Vector header inside ``view``. + +Returns +------- + +The number of unused bits in the final packed byte. Guaranteed to be between 0 and 7 inclusive. +Vector validation guarantees that empty Vectors have a ``padding`` of 0. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_padding` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_read_packed.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_read_packed.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_read_packed.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_read_packed.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,45 @@ +:man_page: bson_vector_packed_bit_const_view_read_packed + +bson_vector_packed_bit_const_view_read_packed() +=============================================== + +Copy a contiguous block of packed bytes out of a :symbol:`bson_vector_packed_bit_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_const_view_read_packed (bson_vector_packed_bit_const_view_t view, + uint8_t *packed_values_out, + size_t byte_count, + size_t vector_offset_bytes); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_const_view_t`. +* ``packed_values_out``: Location where the packed bytes will be read to. +* ``byte_count``: Number of bytes to read. +* ``vector_offset_bytes``: The byte index of the first packed byte to read. + +Description +----------- + +Packed bytes are copied in bulk from the view to the provided output pointer. + +If the Vector's element count isn't a multiple of 8, its final byte will include bits that do not belong to any element. +Vector validation checks that these bits are zero. + +Returns +------- + +If the ``byte_count`` and ``vector_offset_bytes`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and reads ``byte_count`` bytes into ``*packed_values_out``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_read_packed` + | :symbol:`bson_vector_packed_bit_view_write_packed` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_t.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,75 @@ +:man_page: bson_vector_packed_bit_const_view_t + +bson_vector_packed_bit_const_view_t +=================================== + +A reference to non-owned const BSON Binary data holding a valid Vector of ``packed_bit`` element type. + +Synopsis +-------- + +.. code-block:: c + + #include + + typedef struct bson_vector_packed_bit_const_view_t { + /*< private >*/ + } bson_vector_packed_bit_const_view_t; + +Description +----------- + +:symbol:`bson_vector_packed_bit_const_view_t` is a structure that acts as an opaque const reference to a block of memory that has been validated as a ``packed_bit`` vector. + +It is meant to be passed by value and can be discarded at any time. The contents of the structure should be considered private. + +The :symbol:`bson_t` *MUST* be valid for the lifetime of the view and it is an error to modify the :symbol:`bson_t` while using the view. + +.. only:: html + + Functions + --------- + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_packed_bit_const_view_init + bson_vector_packed_bit_const_view_from_iter + bson_vector_packed_bit_const_view_length + bson_vector_packed_bit_const_view_length_bytes + bson_vector_packed_bit_const_view_padding + bson_vector_packed_bit_const_view_read_packed + bson_vector_packed_bit_const_view_unpack_bool + +Example +------- + +.. code-block:: c + + bson_iter_t iter; + bson_vector_packed_bit_const_view_t view; + + if (bson_iter_init_find (&iter, &doc, "vector") && bson_vector_packed_bit_const_view_from_iter (&view, &iter)) { + size_t length = bson_vector_packed_bit_const_view_length (view); + size_t length_bytes = bson_vector_packed_bit_const_view_length_bytes (view); + size_t padding = bson_vector_packed_bit_const_view_padding (view); + + printf ("Elements in 'vector':\n"); + for (size_t i = 0; i < length; i++) { + bool element; + BSON_ASSERT (bson_vector_packed_bit_const_view_unpack_bool (view, &element, 1, i)); + printf (" elements[%d] = %d\n", (int) i, (int) element); + } + + printf ("Bytes in 'vector': (%d bits unused)\n", (int) padding); + for (size_t i = 0; i < length_bytes; i++) { + uint8_t packed_byte; + BSON_ASSERT (bson_vector_packed_bit_const_view_read_packed (view, &packed_byte, 1, i)); + printf (" bytes[%d] = 0x%02x\n", (int) i, (unsigned) packed_byte); + } + } + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_t` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_unpack_bool.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_unpack_bool.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_const_view_unpack_bool.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_const_view_unpack_bool.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,41 @@ +:man_page: bson_vector_packed_bit_const_view_unpack_bool + +bson_vector_packed_bit_const_view_unpack_bool() +=============================================== + +Unpack a contiguous block of elements from a :symbol:`bson_vector_packed_bit_const_view_t` into a C array of ``bool``. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_const_view_unpack_bool (bson_vector_packed_bit_const_view_t view, + bool *unpacked_values_out, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_const_view_t`. +* ``unpacked_values_out``: Location where the ``bool`` elements will be unpacked to. +* ``element_count``: Number of elements to unpack. +* ``vector_offset_elements``: The vector index of the first element to unpack. + +Description +----------- + +Elements are unpacked from individual bits into a C array of ``bool``. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and unpacks ``element_count`` elements into ``*unpacked_values_out``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_unpack_bool` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_as_const.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_as_const.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_as_const.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_as_const.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,29 @@ +:man_page: bson_vector_packed_bit_view_as_const + +bson_vector_packed_bit_view_as_const() +====================================== + +Convert a :symbol:`bson_vector_packed_bit_view_t` into a :symbol:`bson_vector_packed_bit_const_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bson_vector_packed_bit_const_view_t + bson_vector_packed_bit_view_as_const (bson_vector_packed_bit_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. + +Description +----------- + +This adds a ``const`` qualifier to the view without re-validating the underlying data. + +Returns +------- + +Always returns a :symbol:`bson_vector_packed_bit_const_view_t`. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_from_iter.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_from_iter.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_from_iter.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_from_iter.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,33 @@ +:man_page: bson_vector_packed_bit_view_from_iter + +bson_vector_packed_bit_view_from_iter() +======================================= + +Initialize a :symbol:`bson_vector_packed_bit_view_t` from a :symbol:`bson_iter_t` pointing to a valid Vector of ``packed_bit`` element type. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_view_from_iter (bson_vector_packed_bit_view_t *view_out, + bson_iter_t *iter); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_packed_bit_view_t` is written here on success. +* ``iter``: A valid :symbol:`bson_iter_t`. + +Description +----------- + +The provided iterator, which must point to some kind of BSON item, will be checked for a valid Vector of ``packed_bit`` element type. +On success, a :symbol:`bson_vector_packed_bit_view_t` is set to point to the same underlying :symbol:`bson_t` buffer as the provided :symbol:`bson_iter_t`. +The view will only be valid until the containing document is destroyed or otherwise modified. + +Returns +------- + +Returns true if the view was successfully initialized. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_init.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_init.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_init.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_init.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,35 @@ +:man_page: bson_vector_packed_bit_view_init + +bson_vector_packed_bit_view_init() +================================== + +Initialize a :symbol:`bson_vector_packed_bit_view_t` from a mutable ``uint8_t`` buffer. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_view_init (bson_vector_packed_bit_view_t *view_out, + uint8_t *binary_data, + uint32_t binary_data_len); + +Parameters +---------- + +* ``view_out``: A :symbol:`bson_vector_packed_bit_view_t` is written here on success. +* ``binary_data``: A pointer to the BSON Binary data block to be validated. +* ``binary_data_len``: Length of the binary data block, in bytes. + +Description +----------- + +The length, header, and trailing padding of the provided binary data block will be checked for a valid Vector of ``packed_bit`` element type. +On success, the pointer and length are packaged as a :symbol:`bson_vector_packed_bit_view_t` written to ``*view_out``. +The view will only be valid as long as ``binary_data`` is valid. + +Returns +------- + +Returns true if the view was successfully initialized. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_length.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_length.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_length.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_length.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,29 @@ +:man_page: bson_vector_packed_bit_view_length + +bson_vector_packed_bit_view_length() +==================================== + +Return the number of elements in a Vector referenced by a :symbol:`bson_vector_packed_bit_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_packed_bit_view_length (bson_vector_packed_bit_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. + +Description +----------- + +An element count is calculated from information stored inside the `bson_vector_packed_bit_view_t` value. + +Returns +------- + +The number of elements, as a ``size_t``. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_length_bytes.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_length_bytes.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_length_bytes.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_length_bytes.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,30 @@ +:man_page: bson_vector_packed_bit_view_length_bytes + +bson_vector_packed_bit_view_length_bytes() +========================================== + +Return the number of packed bytes in a Vector referenced by a :symbol:`bson_vector_packed_bit_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_packed_bit_view_length_bytes (bson_vector_packed_bit_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. + +Description +----------- + +A byte count is calculated from the view's stored binary block length. +If the element count isn't a multiple of 8, the final byte will include bits that do not belong to any element. + +Returns +------- + +The number of bytes, as a ``size_t``. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_pack_bool.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_pack_bool.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_pack_bool.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_pack_bool.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +:man_page: bson_vector_packed_bit_view_pack_bool + +bson_vector_packed_bit_view_pack_bool() +======================================= + +Pack a contiguous block of elements from a C ``bool`` array into a :symbol:`bson_vector_packed_bit_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_view_pack_bool (bson_vector_packed_bit_view_t view, + const bool *unpacked_values, + size_t element_count, + size_t vector_offset_elements) + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. +* ``unpacked_values``: Location where the ``bool`` elements will be packed from. +* ``element_count``: Number of elements to pack. +* ``vector_offset_elements``: The vector index of the first element to pack. + +Description +----------- + +Elements are packed into individual Vector bits from a C ``bool`` array. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and writes to ``element_count`` elements in the Vector starting at ``vector_offset_elements``. diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_padding.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_padding.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_padding.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_padding.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,34 @@ +:man_page: bson_vector_packed_bit_view_padding + +bson_vector_packed_bit_view_padding() +===================================== + +Returns the number of unused bits in a Vector referenced by a :symbol:`bson_vector_packed_bit_view_t`. + +Synopsis +-------- + +.. code-block:: c + + size_t + bson_vector_packed_bit_view_padding (bson_vector_packed_bit_view_t view); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. + +Description +----------- + +The 3-bit ``padding`` field is extracted from a copy of the Vector header inside ``view``. + +Returns +------- + +The number of unused bits in the final packed byte. Guaranteed to be between 0 and 7 inclusive. +Vector validation guarantees that empty Vectors have a ``padding`` of 0. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_const_view_padding` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_read_packed.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_read_packed.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_read_packed.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_read_packed.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,45 @@ +:man_page: bson_vector_packed_bit_view_read_packed + +bson_vector_packed_bit_view_read_packed() +========================================= + +Copy a contiguous block of packed bytes out of a :symbol:`bson_vector_packed_bit_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_view_read_packed (bson_vector_packed_bit_view_t view, + uint8_t *packed_values_out, + size_t byte_count, + size_t vector_offset_bytes); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. +* ``packed_values_out``: Location where the packed bytes will be read to. +* ``byte_count``: Number of bytes to read. +* ``vector_offset_bytes``: The byte index of the first packed byte to read. + +Description +----------- + +Packed bytes are copied in bulk from the view to the provided output pointer. + +If the Vector's element count isn't a multiple of 8, its final byte will include bits that do not belong to any element. +Vector validation checks that these bits are zero. + +Returns +------- + +If the ``byte_count`` and ``vector_offset_bytes`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and reads ``byte_count`` bytes into ``*packed_values_out``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_const_view_read_packed` + | :symbol:`bson_vector_packed_bit_view_write_packed` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_t.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_t.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_t.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,85 @@ +:man_page: bson_vector_packed_bit_view_t + +bson_vector_packed_bit_view_t +============================= + +A reference to mutable non-owned BSON Binary data holding a valid Vector of ``packed_bit`` element type. + +Synopsis +-------- + +.. code-block:: c + + #include + + typedef struct bson_vector_packed_bit_view_t { + /*< private >*/ + } bson_vector_packed_bit_view_t; + +Description +----------- + +:symbol:`bson_vector_packed_bit_view_t` is a structure that acts as an opaque reference to a block of memory that has been validated as a ``packed_bit`` vector. + +It is meant to be passed by value and can be discarded at any time. The contents of the structure should be considered private. + +The :symbol:`bson_t` *MUST* be valid for the lifetime of the view and it is an error to modify the :symbol:`bson_t` while using the view. + +.. only:: html + + Functions + --------- + + .. toctree:: + :titlesonly: + :maxdepth: 1 + + bson_vector_packed_bit_view_init + bson_vector_packed_bit_view_from_iter + bson_vector_packed_bit_view_as_const + bson_vector_packed_bit_view_length + bson_vector_packed_bit_view_length_bytes + bson_vector_packed_bit_view_padding + bson_vector_packed_bit_view_read_packed + bson_vector_packed_bit_view_write_packed + bson_vector_packed_bit_view_unpack_bool + bson_vector_packed_bit_view_pack_bool + +Example +------- + +.. code-block:: c + + // Fill a new vector with individual boolean elements + { + static const bool bool_values[] = {true, false, true, true, false}; + const size_t bool_values_count = sizeof bool_values / sizeof bool_values[0]; + + bson_vector_packed_bit_view_t view; + BSON_ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "from_bool", bool_values_count, &view)); + BSON_ASSERT (bson_vector_packed_bit_view_pack_bool (view, bool_values, bool_values_count, 0)); + } + + // Fill another new vector with packed bytes + { + static const uint8_t packed_bytes[] = {0xb0}; + const size_t unused_bits_count = 3; + const size_t packed_values_count = sizeof packed_bytes * 8 - unused_bits_count; + + bson_vector_packed_bit_view_t view; + BSON_ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "from_packed", packed_values_count, &view)); + BSON_ASSERT (bson_vector_packed_bit_view_write_packed (view, packed_bytes, sizeof packed_bytes, 0)); + } + + // Compare both vectors. They match exactly. + { + bson_iter_t from_bool_iter, from_packed_iter; + BSON_ASSERT (bson_iter_init_find (&from_bool_iter, &doc, "from_bool")); + BSON_ASSERT (bson_iter_init_find (&from_packed_iter, &doc, "from_packed")); + BSON_ASSERT (bson_iter_binary_equal (&from_bool_iter, &from_packed_iter)); + } + +.. seealso:: + + | :symbol:`bson_append_vector_packed_bit_uninit` + | :symbol:`bson_vector_packed_bit_const_view_t` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_unpack_bool.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_unpack_bool.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_unpack_bool.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_unpack_bool.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,41 @@ +:man_page: bson_vector_packed_bit_view_unpack_bool + +bson_vector_packed_bit_view_unpack_bool() +========================================= + +Unpack a contiguous block of elements from a :symbol:`bson_vector_packed_bit_view_t` into a C array of ``bool``. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_view_unpack_bool (bson_vector_packed_bit_view_t view, + bool *unpacked_values_out, + size_t element_count, + size_t vector_offset_elements); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. +* ``unpacked_values_out``: Location where the ``bool`` elements will be unpacked to. +* ``element_count``: Number of elements to unpack. +* ``vector_offset_elements``: The vector index of the first element to unpack. + +Description +----------- + +Elements are unpacked from individual bits into a C array of ``bool``. + +Returns +------- + +If the ``element_count`` and ``vector_offset_elements`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and unpacks ``element_count`` elements into ``*unpacked_values_out``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_const_view_unpack_bool` diff -pruN 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_write_packed.rst 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_write_packed.rst --- 1.30.4-1/src/libbson/doc/bson_vector_packed_bit_view_write_packed.rst 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_vector_packed_bit_view_write_packed.rst 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,45 @@ +:man_page: bson_vector_packed_bit_view_write_packed + +bson_vector_packed_bit_view_write_packed() +========================================== + +Copy a contiguous block of packed bytes into a :symbol:`bson_vector_packed_bit_view_t`. + +Synopsis +-------- + +.. code-block:: c + + bool + bson_vector_packed_bit_view_write_packed (bson_vector_packed_bit_view_t view, + const uint8_t *packed_values, + size_t byte_count, + size_t vector_offset_bytes); + +Parameters +---------- + +* ``view``: A valid :symbol:`bson_vector_packed_bit_view_t`. +* ``packed_values``: Location where the packed bytes will be copied from. +* ``byte_count``: Number of bytes to write. +* ``vector_offset_bytes``: The byte index of the first packed byte to write. + +Description +----------- + +Packed bytes are copied in bulk from the input pointer to the provided view. + +If the Vector's element count isn't a multiple of 8, its final byte will include bits that do not belong to any element. +This function cannot be used to modify the unused bits, they will be explicitly zeroed if set. + +Returns +------- + +If the ``byte_count`` and ``vector_offset_bytes`` parameters overflow the bounds of the Vector, returns false without taking any other action. +If the parameters are in range, this is guaranteed to succeed. +On success, returns true and writes ``byte_count`` bytes from ``*packed_values`` into the Vector starting at byte index ``vector_offset_bytes``. + +.. seealso:: + + | :symbol:`bson_vector_packed_bit_view_read_packed` + | :symbol:`bson_vector_packed_bit_const_view_read_packed` diff -pruN 1.30.4-1/src/libbson/doc/bson_writer_t.rst 2.0.2-1/src/libbson/doc/bson_writer_t.rst --- 1.30.4-1/src/libbson/doc/bson_writer_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/bson_writer_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -61,9 +61,9 @@ Example writer = bson_writer_new (&buf, &buflen, 0, bson_realloc_ctx, NULL); - for (i = 0; i < 1000; i++) { + for (int i = 0; i < 1000; i++) { bson_writer_begin (writer, &doc); - BSON_APPEND_INT32 (&doc, "i", i); + BSON_APPEND_INT32 (doc, "i", i); bson_writer_end (writer); } diff -pruN 1.30.4-1/src/libbson/doc/includes/seealso/bson-as-json.txt 2.0.2-1/src/libbson/doc/includes/seealso/bson-as-json.txt --- 1.30.4-1/src/libbson/doc/includes/seealso/bson-as-json.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/doc/includes/seealso/bson-as-json.txt 2025-06-19 15:42:22.000000000 +0000 @@ -5,8 +5,6 @@ | :symbol:`bson_as_legacy_extended_json()` - | :symbol:`bson_as_json()` (Deprecated) - | :symbol:`bson_as_json_with_opts()` | :symbol:`bson_array_as_canonical_extended_json()` @@ -15,5 +13,3 @@ | :symbol:`bson_array_as_legacy_extended_json()` - | :symbol:`bson_array_as_json()` (Deprecated) - diff -pruN 1.30.4-1/src/libbson/etc/bsonConfig.cmake 2.0.2-1/src/libbson/etc/bsonConfig.cmake --- 1.30.4-1/src/libbson/etc/bsonConfig.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/etc/bsonConfig.cmake 2025-06-19 15:42:22.000000000 +0000 @@ -1,16 +1,15 @@ #[[ - This is a transitional CMake package config file to allow compatibility - between libbson 1.x and libbson 2.x CMake packages. + CMake package file for the BSON library. - When distributed with libbson 1.x, this file is mostly just a shim for - the `bson-1.0` CMake packages. + This file globs and includes all "*-targets.cmake" files in the containing + directory, and intends that those files define the actual libbson targets. - This file imports "bson-1.0" and generates alias targets for it: + This file also defines a `bson::bson` target, which redirects to either + `bson::static` or `bson::shared` depending on what type of library is + available and can be controlled with an import-time CMake setting. - • `bson::shared` → `mongo::bson_shared` - • `bson::static` → `mongo::bson_static` - • `bson::bson` → Points to either `bson::shared` or `bson::static`, - controlled by `BSON_DEFAULT_IMPORTED_LIBRARY_TYPE` + If the installation has a static library, it is named `bson::static`. If + the installation has a shared (dynamic) library, it is named `bson::shared`. ]] # Check for missing components before proceeding. We don't provide any, so we @@ -31,35 +30,29 @@ if(missing_required_components) endif() include(CMakeFindDependencyMacro) +find_dependency(Threads) # Required for Threads::Threads -# We are installed alongside the `bson-1.0` packages. Forcibly prevent find_package -# from considering any other `bson-1.0` package that might live elsewhere on the system -# by setting HINTS and NO_DEFAULT_PATH -get_filename_component(parent_dir "${CMAKE_CURRENT_LIST_DIR}" DIRECTORY) -find_dependency(bson-1.0 HINTS ${parent_dir} NO_DEFAULT_PATH) +# Import the target files that will be installed alongside this file. Only the +# targets of libraries that were actually installed alongside this file will be imported +file(GLOB __targets_files "${CMAKE_CURRENT_LIST_DIR}/*-targets.cmake") +foreach(__file IN LISTS __targets_files) + include("${__file}") +endforeach() # The library type that is linked with `bson::bson` -set(_default_lib_type) -# Add compat targets for the bson-1.0 package targets -if(TARGET mongo::bson_shared AND NOT TARGET bson::shared) - add_library(bson::shared IMPORTED INTERFACE) - set_property(TARGET bson::shared APPEND PROPERTY INTERFACE_LINK_LIBRARIES mongo::bson_shared) - set(_default_lib_type SHARED) -endif() -if(TARGET mongo::bson_static AND NOT TARGET bson::static) - add_library(bson::static IMPORTED INTERFACE) - set_property(TARGET bson::static APPEND PROPERTY INTERFACE_LINK_LIBRARIES mongo::bson_static) +set(__default_lib_type SHARED) +if(TARGET bson::static) # If static is available, set it as the default library type - set(_default_lib_type STATIC) + set(__default_lib_type STATIC) endif() # Allow the user to tweak what library type is linked for `bson::bson` -set(BSON_DEFAULT_IMPORTED_LIBRARY_TYPE "${_default_lib_type}" +set(BSON_DEFAULT_IMPORTED_LIBRARY_TYPE "${__default_lib_type}" CACHE STRING "The default library type that is used when linking against 'bson::bson' (either SHARED or STATIC, requires that the package was built with the appropriate library type)") set_property(CACHE BSON_DEFAULT_IMPORTED_LIBRARY_TYPE PROPERTY STRINGS SHARED STATIC) if(NOT TARGET bson::bson) # Don't redefine the target if we were already included - string(TOLOWER "${BSON_DEFAULT_IMPORTED_LIBRARY_TYPE}" _type) + string(TOLOWER "${BSON_DEFAULT_IMPORTED_LIBRARY_TYPE}" __type) add_library(bson::bson IMPORTED INTERFACE) - set_property(TARGET bson::bson APPEND PROPERTY INTERFACE_LINK_LIBRARIES bson::${_type}) + set_property(TARGET bson::bson APPEND PROPERTY INTERFACE_LINK_LIBRARIES bson::${__type}) endif() diff -pruN 1.30.4-1/src/libbson/examples/bson-metrics.c 2.0.2-1/src/libbson/examples/bson-metrics.c --- 1.30.4-1/src/libbson/examples/bson-metrics.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/bson-metrics.c 2025-06-19 15:42:22.000000000 +0000 @@ -252,7 +252,7 @@ main (int argc, char *argv[]) mark = 0; while ((b = bson_reader_read (reader, NULL))) { off_t pos = bson_reader_tell (reader); - state.doc_size_max = BSON_MAX (pos - mark, state.doc_size_max); + state.doc_size_max = BSON_MAX (pos - mark, (off_t) state.doc_size_max); mark = pos; bson_metrics (b, NULL, &state); } diff -pruN 1.30.4-1/src/libbson/examples/cmake/find_package/CMakeLists.txt 2.0.2-1/src/libbson/examples/cmake/find_package/CMakeLists.txt --- 1.30.4-1/src/libbson/examples/cmake/find_package/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/cmake/find_package/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -24,7 +24,7 @@ project (hello_bson LANGUAGES C) # building libbson. # -- sphinx-include-start -- # Specify the minimum version you require. -find_package (bson 1.7 REQUIRED) +find_package (bson 2.0 REQUIRED) # The "hello_bson.c" sample program is shared among four tests. add_executable (hello_bson ../../hello_bson.c) diff -pruN 1.30.4-1/src/libbson/examples/cmake/find_package_static/CMakeLists.txt 2.0.2-1/src/libbson/examples/cmake/find_package_static/CMakeLists.txt --- 1.30.4-1/src/libbson/examples/cmake/find_package_static/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/cmake/find_package_static/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -24,7 +24,7 @@ project (hello_bson LANGUAGES C) # building libbson. # -- sphinx-include-start -- # Specify the minimum version you require. -find_package (bson 1.7 REQUIRED) +find_package (bson 2.0 REQUIRED) # The "hello_bson.c" sample program is shared among four tests. add_executable (hello_bson ../../hello_bson.c) diff -pruN 1.30.4-1/src/libbson/examples/cmake-deprecated/.gitignore 2.0.2-1/src/libbson/examples/cmake-deprecated/.gitignore --- 1.30.4-1/src/libbson/examples/cmake-deprecated/.gitignore 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/cmake-deprecated/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -CMakeCache.txt -CMakeFiles -Makefile -cmake_install.cmake -hello_bson -build diff -pruN 1.30.4-1/src/libbson/examples/cmake-deprecated/find_package/CMakeLists.txt 2.0.2-1/src/libbson/examples/cmake-deprecated/find_package/CMakeLists.txt --- 1.30.4-1/src/libbson/examples/cmake-deprecated/find_package/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/cmake-deprecated/find_package/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Demonstrates how to use the CMake 'find_package' mechanism to locate -# and build against libbson. - -cmake_minimum_required (VERSION 2.8) - -project (hello_bson LANGUAGES C) - -# NOTE: For this to work, the CMAKE_PREFIX_PATH variable must be set to point to -# the directory that was used as the argument to CMAKE_INSTALL_PREFIX when -# building libbson. -# -- sphinx-include-start -- -# Specify the minimum version you require. -find_package (libbson-1.0 1.7 REQUIRED) - -message (STATUS " libbson found version \"${BSON_VERSION}\"") -message (STATUS " libbson include path \"${BSON_INCLUDE_DIRS}\"") -message (STATUS " libbson libraries \"${BSON_LIBRARIES}\"") - -# The "hello_bson.c" sample program is shared among four tests. -add_executable (hello_bson ../../hello_bson.c) -target_include_directories (hello_bson PRIVATE ${BSON_INCLUDE_DIRS}) -target_link_libraries (hello_bson PRIVATE ${BSON_LIBRARIES}) -target_compile_definitions (hello_bson PRIVATE ${BSON_DEFINITIONS}) diff -pruN 1.30.4-1/src/libbson/examples/cmake-deprecated/find_package_static/CMakeLists.txt 2.0.2-1/src/libbson/examples/cmake-deprecated/find_package_static/CMakeLists.txt --- 1.30.4-1/src/libbson/examples/cmake-deprecated/find_package_static/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/cmake-deprecated/find_package_static/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -# Copyright 2009-present MongoDB, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Demonstrates how to use the CMake 'find_package' mechanism to locate -# and build against libbson. - -cmake_minimum_required (VERSION 2.8) - -project (hello_bson LANGUAGES C) - -# NOTE: For this to work, the CMAKE_PREFIX_PATH variable must be set to point to -# the directory that was used as the argument to CMAKE_INSTALL_PREFIX when -# building libbson. -# -- sphinx-include-start -- -# Specify the minimum version you require. -find_package (libbson-static-1.0 1.7 REQUIRED) - -message (STATUS " libbson-static found version \"${BSON_STATIC_VERSION}\"") -message (STATUS " libbson-static include path \"${BSON_STATIC_INCLUDE_DIRS}\"") -message (STATUS " libbson-static libraries \"${BSON_STATIC_LIBRARIES}\"") - -# The "hello_bson.c" sample program is shared among four tests. -add_executable (hello_bson ../../hello_bson.c) -target_include_directories (hello_bson PRIVATE ${BSON_STATIC_INCLUDE_DIRS}) -target_link_libraries (hello_bson PRIVATE ${BSON_STATIC_LIBRARIES}) -target_compile_definitions (hello_bson PRIVATE ${BSON_STATIC_DEFINITIONS}) diff -pruN 1.30.4-1/src/libbson/examples/compile-with-pkg-config-static.sh 2.0.2-1/src/libbson/examples/compile-with-pkg-config-static.sh --- 1.30.4-1/src/libbson/examples/compile-with-pkg-config-static.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/compile-with-pkg-config-static.sh 2025-06-19 15:42:22.000000000 +0000 @@ -3,4 +3,4 @@ set -o errexit # Exit the script with error if any of the commands fail # -- sphinx-include-start -- -gcc -o hello_bson hello_bson.c $(pkg-config --libs --cflags libbson-static-1.0) +gcc -o hello_bson hello_bson.c $(pkg-config --libs --cflags bson$major-static) diff -pruN 1.30.4-1/src/libbson/examples/compile-with-pkg-config.sh 2.0.2-1/src/libbson/examples/compile-with-pkg-config.sh --- 1.30.4-1/src/libbson/examples/compile-with-pkg-config.sh 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/compile-with-pkg-config.sh 2025-06-19 15:42:22.000000000 +0000 @@ -3,4 +3,4 @@ set -o errexit # Exit the script with error if any of the commands fail # -- sphinx-include-start -- -gcc -o hello_bson hello_bson.c $(pkg-config --libs --cflags libbson-1.0) +gcc -o hello_bson hello_bson.c $(pkg-config --libs --cflags bson$major) diff -pruN 1.30.4-1/src/libbson/examples/extended-json.c 2.0.2-1/src/libbson/examples/extended-json.c --- 1.30.4-1/src/libbson/examples/extended-json.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/examples/extended-json.c 2025-06-19 15:42:22.000000000 +0000 @@ -20,7 +20,7 @@ #include int -main (int argc, char *argv[]) +main (void) { { // bson_as_canonical_extended_json ... begin diff -pruN 1.30.4-1/src/libbson/libbson.rc.in 2.0.2-1/src/libbson/libbson.rc.in --- 1.30.4-1/src/libbson/libbson.rc.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/libbson.rc.in 2025-06-19 15:42:22.000000000 +0000 @@ -5,7 +5,6 @@ #include // Defines BSON_MAJOR_VERSION and other version macros. #define BSON_OUTPUT_BASENAME "@BSON_OUTPUT_BASENAME@" -#define BSON_API_VERSION "@BSON_API_VERSION@" VS_VERSION_INFO VERSIONINFO FILEVERSION BSON_MAJOR_VERSION,BSON_MINOR_VERSION,BSON_MICRO_VERSION,0 @@ -30,8 +29,8 @@ BEGIN VALUE "CompanyName", "MongoDB, Inc" VALUE "FileDescription", "A BSON Library for C" VALUE "FileVersion", BSON_VERSION_S - VALUE "InternalName", BSON_OUTPUT_BASENAME "-" BSON_API_VERSION - VALUE "OriginalFilename", BSON_OUTPUT_BASENAME "-" BSON_API_VERSION ".dll" + VALUE "InternalName", BSON_OUTPUT_BASENAME "@PROJECT_VERSION_MAJOR@" + VALUE "OriginalFilename", BSON_OUTPUT_BASENAME "@PROJECT_VERSION_MAJOR@.dll" VALUE "ProductName", "MongoDB C Driver" VALUE "ProductVersion", BSON_VERSION_S VALUE "LegalCopyright", "Copyright 2009-present MongoDB, Inc." diff -pruN 1.30.4-1/src/libbson/src/bson/bcon.c 2.0.2-1/src/libbson/src/bson/bcon.c --- 1.30.4-1/src/libbson/src/bson/bcon.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bcon.c 2025-06-19 15:42:22.000000000 +0000 @@ -38,7 +38,6 @@ #define STACK_BSON_PARENT STACK_BSON (-1) #define STACK_BSON_CHILD STACK_BSON (0) -#define STACK_ITER_PARENT STACK_ITER (-1) #define STACK_ITER_CHILD STACK_ITER (0) #define STACK_I STACK_ELE (0, i) diff -pruN 1.30.4-1/src/libbson/src/bson/bson-atomic.c 2.0.2-1/src/libbson/src/bson/bson-atomic.c --- 1.30.4-1/src/libbson/src/bson/bson-atomic.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-atomic.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,274 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#include -#include - -BEGIN_IGNORE_DEPRECATIONS - -#ifdef BSON_OS_UNIX -/* For sched_yield() */ -#include -#endif - -int32_t -bson_atomic_int_add (volatile int32_t *p, int32_t n) -{ - return n + bson_atomic_int32_fetch_add ((DECL_ATOMIC_INTEGRAL_INT32 *) p, n, bson_memory_order_seq_cst); -} - -int64_t -bson_atomic_int64_add (volatile int64_t *p, int64_t n) -{ - return n + bson_atomic_int64_fetch_add (p, n, bson_memory_order_seq_cst); -} - -void -bson_thrd_yield (void) -{ - BSON_IF_WINDOWS (SwitchToThread ();) - BSON_IF_POSIX (sched_yield ();) -} - -void -bson_memory_barrier (void) -{ - bson_atomic_thread_fence (); -} - -/** - * Some platforms do not support compiler intrinsics for atomic operations. - * We emulate that here using a spin lock and regular arithmetic operations - */ -static int8_t gEmulAtomicLock = 0; - -static void -_lock_emul_atomic (void) -{ - int i; - if (bson_atomic_int8_compare_exchange_weak (&gEmulAtomicLock, 0, 1, bson_memory_order_acquire) == 0) { - /* Successfully took the spinlock */ - return; - } - /* Failed. Try taking ten more times, then begin sleeping. */ - for (i = 0; i < 10; ++i) { - if (bson_atomic_int8_compare_exchange_weak (&gEmulAtomicLock, 0, 1, bson_memory_order_acquire) == 0) { - /* Succeeded in taking the lock */ - return; - } - } - /* Still don't have the lock. Spin and yield */ - while (bson_atomic_int8_compare_exchange_weak (&gEmulAtomicLock, 0, 1, bson_memory_order_acquire) != 0) { - bson_thrd_yield (); - } -} - -static void -_unlock_emul_atomic (void) -{ - int64_t rv = bson_atomic_int8_exchange (&gEmulAtomicLock, 0, bson_memory_order_release); - BSON_ASSERT (rv == 1 && "Released atomic lock while not holding it"); -} - -int64_t -_bson_emul_atomic_int64_fetch_add (volatile int64_t *p, int64_t n, enum bson_memory_order _unused) -{ - int64_t ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p += n; - _unlock_emul_atomic (); - return ret; -} - -int64_t -_bson_emul_atomic_int64_exchange (volatile int64_t *p, int64_t n, enum bson_memory_order _unused) -{ - int64_t ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p = n; - _unlock_emul_atomic (); - return ret; -} - -int64_t -_bson_emul_atomic_int64_compare_exchange_strong (volatile int64_t *p, - int64_t expect_value, - int64_t new_value, - enum bson_memory_order _unused) -{ - int64_t ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - if (ret == expect_value) { - *p = new_value; - } - _unlock_emul_atomic (); - return ret; -} - -int64_t -_bson_emul_atomic_int64_compare_exchange_weak (volatile int64_t *p, - int64_t expect_value, - int64_t new_value, - enum bson_memory_order order) -{ - /* We're emulating. We can't do a weak version. */ - return _bson_emul_atomic_int64_compare_exchange_strong (p, expect_value, new_value, order); -} - - -int32_t -_bson_emul_atomic_int32_fetch_add (volatile int32_t *p, int32_t n, enum bson_memory_order _unused) -{ - int32_t ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p += n; - _unlock_emul_atomic (); - return ret; -} - -int32_t -_bson_emul_atomic_int32_exchange (volatile int32_t *p, int32_t n, enum bson_memory_order _unused) -{ - int32_t ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p = n; - _unlock_emul_atomic (); - return ret; -} - -int32_t -_bson_emul_atomic_int32_compare_exchange_strong (volatile int32_t *p, - int32_t expect_value, - int32_t new_value, - enum bson_memory_order _unused) -{ - int32_t ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - if (ret == expect_value) { - *p = new_value; - } - _unlock_emul_atomic (); - return ret; -} - -int32_t -_bson_emul_atomic_int32_compare_exchange_weak (volatile int32_t *p, - int32_t expect_value, - int32_t new_value, - enum bson_memory_order order) -{ - /* We're emulating. We can't do a weak version. */ - return _bson_emul_atomic_int32_compare_exchange_strong (p, expect_value, new_value, order); -} - - -int -_bson_emul_atomic_int_fetch_add (volatile int *p, int n, enum bson_memory_order _unused) -{ - int ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p += n; - _unlock_emul_atomic (); - return ret; -} - -int -_bson_emul_atomic_int_exchange (volatile int *p, int n, enum bson_memory_order _unused) -{ - int ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p = n; - _unlock_emul_atomic (); - return ret; -} - -int -_bson_emul_atomic_int_compare_exchange_strong (volatile int *p, - int expect_value, - int new_value, - enum bson_memory_order _unused) -{ - int ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - if (ret == expect_value) { - *p = new_value; - } - _unlock_emul_atomic (); - return ret; -} - -int -_bson_emul_atomic_int_compare_exchange_weak (volatile int *p, - int expect_value, - int new_value, - enum bson_memory_order order) -{ - /* We're emulating. We can't do a weak version. */ - return _bson_emul_atomic_int_compare_exchange_strong (p, expect_value, new_value, order); -} - -void * -_bson_emul_atomic_ptr_exchange (void *volatile *p, void *n, enum bson_memory_order _unused) -{ - void *ret; - - BSON_UNUSED (_unused); - - _lock_emul_atomic (); - ret = *p; - *p = n; - _unlock_emul_atomic (); - return ret; -} - -END_IGNORE_DEPRECATIONS diff -pruN 1.30.4-1/src/libbson/src/bson/bson-atomic.h 2.0.2-1/src/libbson/src/bson/bson-atomic.h --- 1.30.4-1/src/libbson/src/bson/bson-atomic.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-atomic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,683 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - - -#ifndef BSON_ATOMIC_H -#define BSON_ATOMIC_H - - -#include -#include -#include - -#ifdef _MSC_VER -#include -#endif - -// bson-atomic.h is deprecated. -// Ignore deprecation warnings for function calls within this file. - -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) -#define BSON_BEGIN_IGNORE_DEPRECATIONS \ - _Pragma ("GCC diagnostic push") _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#define BSON_END_IGNORE_DEPRECATIONS _Pragma ("GCC diagnostic pop") -#elif defined(__clang__) -#define BSON_BEGIN_IGNORE_DEPRECATIONS \ - _Pragma ("clang diagnostic push") _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#define BSON_END_IGNORE_DEPRECATIONS _Pragma ("clang diagnostic pop") -#else -#define BSON_BEGIN_IGNORE_DEPRECATIONS -#define BSON_END_IGNORE_DEPRECATIONS -#endif - -BSON_BEGIN_IGNORE_DEPRECATIONS - -BSON_BEGIN_DECLS - -enum BSON_GNUC_DEPRECATED bson_memory_order { - bson_memory_order_seq_cst, - bson_memory_order_acquire, - bson_memory_order_release, - bson_memory_order_relaxed, - bson_memory_order_acq_rel, - bson_memory_order_consume, -}; - -#if defined(_M_ARM) /* MSVC memorder atomics are only avail on ARM */ -#define MSVC_MEMORDER_SUFFIX(X) X -#else -#define MSVC_MEMORDER_SUFFIX(X) -#endif - -#if defined(USE_LEGACY_GCC_ATOMICS) || (!defined(__clang__) && __GNUC__ == 4) || defined(__xlC__) -#define BSON_USE_LEGACY_GCC_ATOMICS -#else -#undef BSON_USE_LEGACY_GCC_ATOMICS -#endif - -/* Not all GCC-like compilers support the current __atomic built-ins. Older - * GCC (pre-5) used different built-ins named with the __sync prefix. When - * compiling with such older GCC versions, it is necessary to use the applicable - * functions, which requires redefining BSON_IF_GNU_LIKE and defining the - * additional BSON_IF_GNU_LEGACY_ATOMICS macro here. */ -#ifdef BSON_USE_LEGACY_GCC_ATOMICS -#undef BSON_IF_GNU_LIKE -#define BSON_IF_GNU_LIKE(...) -#define BSON_IF_GNU_LEGACY_ATOMICS(...) __VA_ARGS__ -#else -#define BSON_IF_GNU_LEGACY_ATOMICS(...) -#endif - -/* CDRIVER-4229 zSeries with gcc 4.8.4 produces illegal instructions for int and - * int32 atomic intrinsics. */ -#if defined(__s390__) || defined(__s390x__) || defined(__zarch__) -#define BSON_EMULATE_INT32 -#define BSON_EMULATE_INT -#endif - -/* CDRIVER-4264 Contrary to documentation, VS 2013 targeting x86 does not - * correctly/consistently provide _InterlockedPointerExchange. */ -#if defined(_MSC_VER) && _MSC_VER < 1900 && defined(_M_IX86) -#define BSON_EMULATE_PTR -#endif - -// Disable the -Wcovered-switch-default warning. -#define BSON_DISABLE_COVERED_SWITCH_DEFAULT_BEGIN -#define BSON_DISABLE_COVERED_SWITCH_DEFAULT_END -#if defined(__clang__) -#if __has_warning("-Wcovered-switch-default") -#undef BSON_DISABLE_COVERED_SWITCH_DEFAULT_BEGIN -#undef BSON_DISABLE_COVERED_SWITCH_DEFAULT_END -#define BSON_DISABLE_COVERED_SWITCH_DEFAULT_BEGIN \ - _Pragma ("clang diagnostic push") _Pragma ("clang diagnostic ignored \"-Wcovered-switch-default\"") -#define BSON_DISABLE_COVERED_SWITCH_DEFAULT_END _Pragma ("clang diagnostic pop") -#endif // __has_warning("-Wcovered-switch-default") -#endif // defined(__clang__) - -// Disable the -Watomic-implicit-seq-cst warning. -#define BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_BEGIN -#define BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_END -#if defined(__clang__) -#if __has_warning("-Watomic-implicit-seq-cst") -#undef BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_BEGIN -#undef BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_END -#define BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_BEGIN \ - _Pragma ("clang diagnostic push") _Pragma ("clang diagnostic ignored \"-Watomic-implicit-seq-cst\"") -#define BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_END _Pragma ("clang diagnostic pop") -#endif // __has_warning("-Watomic-implicit-seq-cst") -#endif // defined(__clang__) - -BSON_DISABLE_COVERED_SWITCH_DEFAULT_BEGIN - -#define DEF_ATOMIC_OP(MSVC_Intrinsic, GNU_Intrinsic, GNU_Legacy_Intrinsic, Order, ...) \ - do { \ - switch (Order) { \ - case bson_memory_order_acq_rel: \ - BSON_IF_MSVC (return MSVC_Intrinsic (__VA_ARGS__);) \ - BSON_IF_GNU_LIKE (return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_ACQ_REL);) \ - BSON_IF_GNU_LEGACY_ATOMICS (return GNU_Legacy_Intrinsic (__VA_ARGS__);) \ - case bson_memory_order_seq_cst: \ - BSON_IF_MSVC (return MSVC_Intrinsic (__VA_ARGS__);) \ - BSON_IF_GNU_LIKE (return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_SEQ_CST);) \ - BSON_IF_GNU_LEGACY_ATOMICS (return GNU_Legacy_Intrinsic (__VA_ARGS__);) \ - case bson_memory_order_acquire: \ - BSON_IF_MSVC (return BSON_CONCAT (MSVC_Intrinsic, MSVC_MEMORDER_SUFFIX (_acq)) (__VA_ARGS__);) \ - BSON_IF_GNU_LIKE (return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_ACQUIRE);) \ - BSON_IF_GNU_LEGACY_ATOMICS (return GNU_Legacy_Intrinsic (__VA_ARGS__);) \ - case bson_memory_order_consume: \ - BSON_IF_MSVC (return BSON_CONCAT (MSVC_Intrinsic, MSVC_MEMORDER_SUFFIX (_acq)) (__VA_ARGS__);) \ - BSON_IF_GNU_LIKE (return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_CONSUME);) \ - BSON_IF_GNU_LEGACY_ATOMICS (return GNU_Legacy_Intrinsic (__VA_ARGS__);) \ - case bson_memory_order_release: \ - BSON_IF_MSVC (return BSON_CONCAT (MSVC_Intrinsic, MSVC_MEMORDER_SUFFIX (_rel)) (__VA_ARGS__);) \ - BSON_IF_GNU_LIKE (return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_RELEASE);) \ - BSON_IF_GNU_LEGACY_ATOMICS (return GNU_Legacy_Intrinsic (__VA_ARGS__);) \ - case bson_memory_order_relaxed: \ - BSON_IF_MSVC (return BSON_CONCAT (MSVC_Intrinsic, MSVC_MEMORDER_SUFFIX (_nf)) (__VA_ARGS__);) \ - BSON_IF_GNU_LIKE (return GNU_Intrinsic (__VA_ARGS__, __ATOMIC_RELAXED);) \ - BSON_IF_GNU_LEGACY_ATOMICS (return GNU_Legacy_Intrinsic (__VA_ARGS__);) \ - default: \ - BSON_UNREACHABLE ("Invalid bson_memory_order value"); \ - } \ - } while (0) - - -#define DEF_ATOMIC_CMPEXCH_STRONG(VCSuffix1, VCSuffix2, GNU_MemOrder, Ptr, ExpectActualVar, NewValue) \ - do { \ - BSON_IF_MSVC (ExpectActualVar = BSON_CONCAT3 (_InterlockedCompareExchange, VCSuffix1, VCSuffix2) ( \ - Ptr, NewValue, ExpectActualVar);) \ - BSON_IF_GNU_LIKE ((void) __atomic_compare_exchange_n (Ptr, \ - &ExpectActualVar, \ - NewValue, \ - false, /* Not weak */ \ - GNU_MemOrder, \ - GNU_MemOrder);) \ - BSON_IF_GNU_LEGACY_ATOMICS (__typeof__ (ExpectActualVar) _val; \ - _val = __sync_val_compare_and_swap (Ptr, ExpectActualVar, NewValue); \ - ExpectActualVar = _val;) \ - } while (0) - - -#define DEF_ATOMIC_CMPEXCH_WEAK(VCSuffix1, VCSuffix2, GNU_MemOrder, Ptr, ExpectActualVar, NewValue) \ - do { \ - BSON_IF_MSVC (ExpectActualVar = BSON_CONCAT3 (_InterlockedCompareExchange, VCSuffix1, VCSuffix2) ( \ - Ptr, NewValue, ExpectActualVar);) \ - BSON_IF_GNU_LIKE ((void) __atomic_compare_exchange_n (Ptr, \ - &ExpectActualVar, \ - NewValue, \ - true, /* Yes weak */ \ - GNU_MemOrder, \ - GNU_MemOrder);) \ - BSON_IF_GNU_LEGACY_ATOMICS (__typeof__ (ExpectActualVar) _val; \ - _val = __sync_val_compare_and_swap (Ptr, ExpectActualVar, NewValue); \ - ExpectActualVar = _val;) \ - } while (0) - - -#define DECL_ATOMIC_INTEGRAL(NamePart, Type, VCIntrinSuffix) \ - static BSON_INLINE Type BSON_GNUC_DEPRECATED bson_atomic_##NamePart##_fetch_add ( \ - Type volatile *a, Type addend, enum bson_memory_order ord) \ - { \ - DEF_ATOMIC_OP (BSON_CONCAT (_InterlockedExchangeAdd, VCIntrinSuffix), \ - __atomic_fetch_add, \ - __sync_fetch_and_add, \ - ord, \ - a, \ - addend); \ - } \ - \ - static BSON_INLINE Type BSON_GNUC_DEPRECATED bson_atomic_##NamePart##_fetch_sub ( \ - Type volatile *a, Type subtrahend, enum bson_memory_order ord) \ - { \ - /* MSVC doesn't have a subtract intrinsic, so just reuse addition */ \ - BSON_IF_MSVC (return bson_atomic_##NamePart##_fetch_add (a, -subtrahend, ord);) \ - BSON_IF_GNU_LIKE (DEF_ATOMIC_OP (~, __atomic_fetch_sub, ~, ord, a, subtrahend);) \ - BSON_IF_GNU_LEGACY_ATOMICS (DEF_ATOMIC_OP (~, ~, __sync_fetch_and_sub, ord, a, subtrahend);) \ - } \ - \ - static BSON_INLINE Type BSON_GNUC_DEPRECATED bson_atomic_##NamePart##_fetch (Type volatile const *a, \ - enum bson_memory_order order) \ - { \ - /* MSVC doesn't have a load intrinsic, so just add zero */ \ - BSON_IF_MSVC (return bson_atomic_##NamePart##_fetch_add ((Type volatile *) a, 0, order);) \ - /* GNU doesn't want RELEASE order for the fetch operation, so we can't \ - * just use DEF_ATOMIC_OP. */ \ - BSON_IF_GNU_LIKE (switch (order) { \ - case bson_memory_order_release: /* Fall back to seqcst */ \ - case bson_memory_order_acq_rel: /* Fall back to seqcst */ \ - case bson_memory_order_seq_cst: \ - return __atomic_load_n (a, __ATOMIC_SEQ_CST); \ - case bson_memory_order_acquire: \ - return __atomic_load_n (a, __ATOMIC_ACQUIRE); \ - case bson_memory_order_consume: \ - return __atomic_load_n (a, __ATOMIC_CONSUME); \ - case bson_memory_order_relaxed: \ - return __atomic_load_n (a, __ATOMIC_RELAXED); \ - default: \ - BSON_UNREACHABLE ("Invalid bson_memory_order value"); \ - }) \ - BSON_IF_GNU_LEGACY_ATOMICS ({ \ - BSON_UNUSED (order); \ - __sync_synchronize (); \ - return *a; \ - }) \ - } \ - \ - static BSON_INLINE Type BSON_GNUC_DEPRECATED bson_atomic_##NamePart##_exchange ( \ - Type volatile *a, Type value, enum bson_memory_order ord) \ - { \ - BSON_IF_MSVC (DEF_ATOMIC_OP (BSON_CONCAT (_InterlockedExchange, VCIntrinSuffix), ~, ~, ord, a, value);) \ - /* GNU doesn't want CONSUME order for the exchange operation, so we \ - * cannot use DEF_ATOMIC_OP. */ \ - BSON_IF_GNU_LIKE (switch (ord) { \ - case bson_memory_order_acq_rel: \ - return __atomic_exchange_n (a, value, __ATOMIC_ACQ_REL); \ - case bson_memory_order_release: \ - return __atomic_exchange_n (a, value, __ATOMIC_RELEASE); \ - case bson_memory_order_seq_cst: \ - return __atomic_exchange_n (a, value, __ATOMIC_SEQ_CST); \ - case bson_memory_order_consume: /* Fall back to acquire */ \ - case bson_memory_order_acquire: \ - return __atomic_exchange_n (a, value, __ATOMIC_ACQUIRE); \ - case bson_memory_order_relaxed: \ - return __atomic_exchange_n (a, value, __ATOMIC_RELAXED); \ - default: \ - BSON_UNREACHABLE ("Invalid bson_memory_order value"); \ - }) \ - BSON_IF_GNU_LEGACY_ATOMICS (BSON_UNUSED (ord); return __sync_val_compare_and_swap (a, *a, value);) \ - } \ - \ - static BSON_INLINE Type BSON_GNUC_DEPRECATED bson_atomic_##NamePart##_compare_exchange_strong ( \ - Type volatile *a, Type expect, Type new_value, enum bson_memory_order ord) \ - { \ - Type actual = expect; \ - switch (ord) { \ - case bson_memory_order_release: \ - case bson_memory_order_acq_rel: \ - case bson_memory_order_seq_cst: \ - DEF_ATOMIC_CMPEXCH_STRONG (VCIntrinSuffix, , __ATOMIC_SEQ_CST, a, actual, new_value); \ - break; \ - case bson_memory_order_acquire: \ - DEF_ATOMIC_CMPEXCH_STRONG ( \ - VCIntrinSuffix, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_ACQUIRE, a, actual, new_value); \ - break; \ - case bson_memory_order_consume: \ - DEF_ATOMIC_CMPEXCH_STRONG ( \ - VCIntrinSuffix, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_CONSUME, a, actual, new_value); \ - break; \ - case bson_memory_order_relaxed: \ - DEF_ATOMIC_CMPEXCH_STRONG ( \ - VCIntrinSuffix, MSVC_MEMORDER_SUFFIX (_nf), __ATOMIC_RELAXED, a, actual, new_value); \ - break; \ - default: \ - BSON_UNREACHABLE ("Invalid bson_memory_order value"); \ - } \ - return actual; \ - } \ - \ - static BSON_INLINE Type BSON_GNUC_DEPRECATED bson_atomic_##NamePart##_compare_exchange_weak ( \ - Type volatile *a, Type expect, Type new_value, enum bson_memory_order ord) \ - { \ - Type actual = expect; \ - switch (ord) { \ - case bson_memory_order_release: \ - case bson_memory_order_acq_rel: \ - case bson_memory_order_seq_cst: \ - DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix, , __ATOMIC_SEQ_CST, a, actual, new_value); \ - break; \ - case bson_memory_order_acquire: \ - DEF_ATOMIC_CMPEXCH_WEAK ( \ - VCIntrinSuffix, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_ACQUIRE, a, actual, new_value); \ - break; \ - case bson_memory_order_consume: \ - DEF_ATOMIC_CMPEXCH_WEAK ( \ - VCIntrinSuffix, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_CONSUME, a, actual, new_value); \ - break; \ - case bson_memory_order_relaxed: \ - DEF_ATOMIC_CMPEXCH_WEAK (VCIntrinSuffix, MSVC_MEMORDER_SUFFIX (_nf), __ATOMIC_RELAXED, a, actual, new_value); \ - break; \ - default: \ - BSON_UNREACHABLE ("Invalid bson_memory_order value"); \ - } \ - return actual; \ - } - -#define DECL_ATOMIC_STDINT(Name, VCSuffix) DECL_ATOMIC_INTEGRAL (Name, Name##_t, VCSuffix) - -#if defined(_MSC_VER) || defined(BSON_USE_LEGACY_GCC_ATOMICS) -/* MSVC and GCC require built-in types (not typedefs) for their atomic - * intrinsics. */ -#if defined(_MSC_VER) -#define DECL_ATOMIC_INTEGRAL_INT8 char -#define DECL_ATOMIC_INTEGRAL_INT32 long -#define DECL_ATOMIC_INTEGRAL_INT long -#else -#define DECL_ATOMIC_INTEGRAL_INT8 signed char -#define DECL_ATOMIC_INTEGRAL_INT32 int -#define DECL_ATOMIC_INTEGRAL_INT int -#endif -DECL_ATOMIC_INTEGRAL (int8, DECL_ATOMIC_INTEGRAL_INT8, 8) -DECL_ATOMIC_INTEGRAL (int16, short, 16) -#if !defined(BSON_EMULATE_INT32) -DECL_ATOMIC_INTEGRAL (int32, DECL_ATOMIC_INTEGRAL_INT32, ) -#endif -#if !defined(BSON_EMULATE_INT) -DECL_ATOMIC_INTEGRAL (int, DECL_ATOMIC_INTEGRAL_INT, ) -#endif -#else -/* Other compilers that we support provide generic intrinsics */ -DECL_ATOMIC_STDINT (int8, 8) -DECL_ATOMIC_STDINT (int16, 16) -#if !defined(BSON_EMULATE_INT32) -DECL_ATOMIC_STDINT (int32, ) -#endif -#if !defined(BSON_EMULATE_INT) -DECL_ATOMIC_INTEGRAL (int, int, ) -#endif -#endif - -#ifndef DECL_ATOMIC_INTEGRAL_INT32 -#define DECL_ATOMIC_INTEGRAL_INT32 int32_t -#endif - -BSON_EXPORT (int64_t) -_bson_emul_atomic_int64_fetch_add (int64_t volatile *val, int64_t v, enum bson_memory_order); -BSON_EXPORT (int64_t) -_bson_emul_atomic_int64_exchange (int64_t volatile *val, int64_t v, enum bson_memory_order); -BSON_EXPORT (int64_t) -_bson_emul_atomic_int64_compare_exchange_strong (int64_t volatile *val, - int64_t expect_value, - int64_t new_value, - enum bson_memory_order); - -BSON_EXPORT (int64_t) -_bson_emul_atomic_int64_compare_exchange_weak (int64_t volatile *val, - int64_t expect_value, - int64_t new_value, - enum bson_memory_order); - -BSON_EXPORT (int32_t) -_bson_emul_atomic_int32_fetch_add (int32_t volatile *val, int32_t v, enum bson_memory_order); -BSON_EXPORT (int32_t) -_bson_emul_atomic_int32_exchange (int32_t volatile *val, int32_t v, enum bson_memory_order); -BSON_EXPORT (int32_t) -_bson_emul_atomic_int32_compare_exchange_strong (int32_t volatile *val, - int32_t expect_value, - int32_t new_value, - enum bson_memory_order); - -BSON_EXPORT (int32_t) -_bson_emul_atomic_int32_compare_exchange_weak (int32_t volatile *val, - int32_t expect_value, - int32_t new_value, - enum bson_memory_order); - -BSON_EXPORT (int) -_bson_emul_atomic_int_fetch_add (int volatile *val, int v, enum bson_memory_order); -BSON_EXPORT (int) -_bson_emul_atomic_int_exchange (int volatile *val, int v, enum bson_memory_order); -BSON_EXPORT (int) -_bson_emul_atomic_int_compare_exchange_strong (int volatile *val, - int expect_value, - int new_value, - enum bson_memory_order); - -BSON_EXPORT (int) -_bson_emul_atomic_int_compare_exchange_weak (int volatile *val, - int expect_value, - int new_value, - enum bson_memory_order); - -BSON_EXPORT (void *) -_bson_emul_atomic_ptr_exchange (void *volatile *val, void *v, enum bson_memory_order); - -BSON_EXPORT (void) -bson_thrd_yield (void); - -#if (defined(_MSC_VER) && !defined(_M_IX86)) || (defined(__LP64__) && __LP64__) -/* (64-bit intrinsics are only available in x64) */ -#ifdef _MSC_VER -DECL_ATOMIC_INTEGRAL (int64, __int64, 64) -#else -DECL_ATOMIC_STDINT (int64, 64) -#endif -#else -static BSON_INLINE int64_t BSON_GNUC_DEPRECATED -bson_atomic_int64_fetch (const int64_t volatile *val, enum bson_memory_order order) -{ - return _bson_emul_atomic_int64_fetch_add ((int64_t volatile *) val, 0, order); -} - -static BSON_INLINE int64_t BSON_GNUC_DEPRECATED -bson_atomic_int64_fetch_add (int64_t volatile *val, int64_t v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int64_fetch_add (val, v, order); -} - -static BSON_INLINE int64_t BSON_GNUC_DEPRECATED -bson_atomic_int64_fetch_sub (int64_t volatile *val, int64_t v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int64_fetch_add (val, -v, order); -} - -static BSON_INLINE int64_t BSON_GNUC_DEPRECATED -bson_atomic_int64_exchange (int64_t volatile *val, int64_t v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int64_exchange (val, v, order); -} - -static BSON_INLINE int64_t BSON_GNUC_DEPRECATED -bson_atomic_int64_compare_exchange_strong (int64_t volatile *val, - int64_t expect_value, - int64_t new_value, - enum bson_memory_order order) -{ - return _bson_emul_atomic_int64_compare_exchange_strong (val, expect_value, new_value, order); -} - -static BSON_INLINE int64_t BSON_GNUC_DEPRECATED -bson_atomic_int64_compare_exchange_weak (int64_t volatile *val, - int64_t expect_value, - int64_t new_value, - enum bson_memory_order order) -{ - return _bson_emul_atomic_int64_compare_exchange_weak (val, expect_value, new_value, order); -} -#endif - -#if defined(BSON_EMULATE_INT32) -static BSON_INLINE int32_t BSON_GNUC_DEPRECATED -bson_atomic_int32_fetch (const int32_t volatile *val, enum bson_memory_order order) -{ - return _bson_emul_atomic_int32_fetch_add ((int32_t volatile *) val, 0, order); -} - -static BSON_INLINE int32_t BSON_GNUC_DEPRECATED -bson_atomic_int32_fetch_add (int32_t volatile *val, int32_t v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int32_fetch_add (val, v, order); -} - -static BSON_INLINE int32_t BSON_GNUC_DEPRECATED -bson_atomic_int32_fetch_sub (int32_t volatile *val, int32_t v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int32_fetch_add (val, -v, order); -} - -static BSON_INLINE int32_t BSON_GNUC_DEPRECATED -bson_atomic_int32_exchange (int32_t volatile *val, int32_t v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int32_exchange (val, v, order); -} - -static BSON_INLINE int32_t BSON_GNUC_DEPRECATED -bson_atomic_int32_compare_exchange_strong (int32_t volatile *val, - int32_t expect_value, - int32_t new_value, - enum bson_memory_order order) -{ - return _bson_emul_atomic_int32_compare_exchange_strong (val, expect_value, new_value, order); -} - -static BSON_INLINE int32_t BSON_GNUC_DEPRECATED -bson_atomic_int32_compare_exchange_weak (int32_t volatile *val, - int32_t expect_value, - int32_t new_value, - enum bson_memory_order order) -{ - return _bson_emul_atomic_int32_compare_exchange_weak (val, expect_value, new_value, order); -} -#endif /* BSON_EMULATE_INT32 */ - -#if defined(BSON_EMULATE_INT) -static BSON_INLINE int BSON_GNUC_DEPRECATED -bson_atomic_int_fetch (const int volatile *val, enum bson_memory_order order) -{ - return _bson_emul_atomic_int_fetch_add ((int volatile *) val, 0, order); -} - -static BSON_INLINE int BSON_GNUC_DEPRECATED -bson_atomic_int_fetch_add (int volatile *val, int v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int_fetch_add (val, v, order); -} - -static BSON_INLINE int BSON_GNUC_DEPRECATED -bson_atomic_int_fetch_sub (int volatile *val, int v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int_fetch_add (val, -v, order); -} - -static BSON_INLINE int BSON_GNUC_DEPRECATED -bson_atomic_int_exchange (int volatile *val, int v, enum bson_memory_order order) -{ - return _bson_emul_atomic_int_exchange (val, v, order); -} - -static BSON_INLINE int BSON_GNUC_DEPRECATED -bson_atomic_int_compare_exchange_strong (int volatile *val, - int expect_value, - int new_value, - enum bson_memory_order order) -{ - return _bson_emul_atomic_int_compare_exchange_strong (val, expect_value, new_value, order); -} - -static BSON_INLINE int BSON_GNUC_DEPRECATED -bson_atomic_int_compare_exchange_weak (int volatile *val, int expect_value, int new_value, enum bson_memory_order order) -{ - return _bson_emul_atomic_int_compare_exchange_weak (val, expect_value, new_value, order); -} -#endif /* BSON_EMULATE_INT */ - -static BSON_INLINE void *BSON_GNUC_DEPRECATED -bson_atomic_ptr_exchange (void *volatile *ptr, void *new_value, enum bson_memory_order ord) -{ -#if defined(BSON_EMULATE_PTR) - return _bson_emul_atomic_ptr_exchange (ptr, new_value, ord); -#elif defined(BSON_USE_LEGACY_GCC_ATOMICS) - /* The older __sync_val_compare_and_swap also takes oldval */ - DEF_ATOMIC_OP (_InterlockedExchangePointer, , __sync_val_compare_and_swap, ord, ptr, *ptr, new_value); -#else - DEF_ATOMIC_OP (_InterlockedExchangePointer, __atomic_exchange_n, , ord, ptr, new_value); -#endif -} - -static BSON_INLINE void *BSON_GNUC_DEPRECATED -bson_atomic_ptr_compare_exchange_strong (void *volatile *ptr, void *expect, void *new_value, enum bson_memory_order ord) -{ - switch (ord) { - case bson_memory_order_release: - case bson_memory_order_acq_rel: - case bson_memory_order_seq_cst: - DEF_ATOMIC_CMPEXCH_STRONG (Pointer, , __ATOMIC_SEQ_CST, ptr, expect, new_value); - return expect; - case bson_memory_order_relaxed: - DEF_ATOMIC_CMPEXCH_STRONG (Pointer, MSVC_MEMORDER_SUFFIX (_nf), __ATOMIC_RELAXED, ptr, expect, new_value); - return expect; - case bson_memory_order_consume: - DEF_ATOMIC_CMPEXCH_STRONG (Pointer, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_CONSUME, ptr, expect, new_value); - return expect; - case bson_memory_order_acquire: - DEF_ATOMIC_CMPEXCH_STRONG (Pointer, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_ACQUIRE, ptr, expect, new_value); - return expect; - default: - BSON_UNREACHABLE ("Invalid bson_memory_order value"); - } -} - - -static BSON_INLINE void *BSON_GNUC_DEPRECATED -bson_atomic_ptr_compare_exchange_weak (void *volatile *ptr, void *expect, void *new_value, enum bson_memory_order ord) -{ - switch (ord) { - case bson_memory_order_release: - case bson_memory_order_acq_rel: - case bson_memory_order_seq_cst: - DEF_ATOMIC_CMPEXCH_WEAK (Pointer, , __ATOMIC_SEQ_CST, ptr, expect, new_value); - return expect; - case bson_memory_order_relaxed: - DEF_ATOMIC_CMPEXCH_WEAK (Pointer, MSVC_MEMORDER_SUFFIX (_nf), __ATOMIC_RELAXED, ptr, expect, new_value); - return expect; - case bson_memory_order_consume: - DEF_ATOMIC_CMPEXCH_WEAK (Pointer, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_CONSUME, ptr, expect, new_value); - return expect; - case bson_memory_order_acquire: - DEF_ATOMIC_CMPEXCH_WEAK (Pointer, MSVC_MEMORDER_SUFFIX (_acq), __ATOMIC_ACQUIRE, ptr, expect, new_value); - return expect; - default: - BSON_UNREACHABLE ("Invalid bson_memory_order value"); - } -} - - -static BSON_INLINE void *BSON_GNUC_DEPRECATED -bson_atomic_ptr_fetch (void *volatile const *ptr, enum bson_memory_order ord) -{ - // Use a union to address cast-qual compilation warning - union { - void *volatile const *const_ptr; - void *volatile *non_const_ptr; - } u; - u.const_ptr = ptr; - return bson_atomic_ptr_compare_exchange_strong (u.non_const_ptr, NULL, NULL, ord); -} - -#undef DECL_ATOMIC_STDINT -#undef DECL_ATOMIC_INTEGRAL -#undef DEF_ATOMIC_OP -#undef DEF_ATOMIC_CMPEXCH_STRONG -#undef DEF_ATOMIC_CMPEXCH_WEAK -#undef MSVC_MEMORDER_SUFFIX - -/** - * @brief Generate a full-fence memory barrier at the call site. - */ -static BSON_INLINE void BSON_GNUC_DEPRECATED -bson_atomic_thread_fence (void) -{ - BSON_IF_MSVC (MemoryBarrier ();) - - BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_BEGIN - BSON_IF_GNU_LIKE (__sync_synchronize ();) - BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_END - - BSON_IF_GNU_LEGACY_ATOMICS (__sync_synchronize ();) -} - -static BSON_INLINE void BSON_GNUC_DEPRECATED -bson_sync_synchronize (void) -{ - bson_atomic_thread_fence (); -} - -#ifdef BSON_USE_LEGACY_GCC_ATOMICS -#undef BSON_IF_GNU_LIKE -#define BSON_IF_GNU_LIKE(...) __VA_ARGS__ -#endif -#undef BSON_IF_GNU_LEGACY_ATOMICS -#undef BSON_USE_LEGACY_GCC_ATOMICS - -BSON_GNUC_DEPRECATED -BSON_EXPORT (void) bson_memory_barrier (void); - -BSON_GNUC_DEPRECATED -BSON_EXPORT (int32_t) bson_atomic_int_add (volatile int32_t *p, int32_t n); - -BSON_GNUC_DEPRECATED -BSON_EXPORT (int64_t) bson_atomic_int64_add (volatile int64_t *p, int64_t n); - -BSON_DISABLE_COVERED_SWITCH_DEFAULT_END - -#undef BSON_EMULATE_PTR -#undef BSON_EMULATE_INT32 -#undef BSON_EMULATE_INT -#undef BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_BEGIN -#undef BSON_DISABLE_ATOMIC_IMPLICIT_SEQ_CST_END -#undef BSON_DISABLE_COVERED_SWITCH_DEFAULT_BEGIN -#undef BSON_DISABLE_COVERED_SWITCH_DEFAULT_END - - -BSON_END_DECLS - -BSON_END_IGNORE_DEPRECATIONS - -#undef BSON_BEGIN_IGNORE_DEPRECATIONS -#undef BSON_END_IGNORE_DEPRECATIONS - -#endif /* BSON_ATOMIC_H */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-cmp.h 2.0.2-1/src/libbson/src/bson/bson-cmp.h --- 1.30.4-1/src/libbson/src/bson/bson-cmp.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-cmp.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,193 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - - -#ifndef BSON_CMP_H -#define BSON_CMP_H - - -#include /* ssize_t */ -#include /* BSON_CONCAT */ - -#include -#include -#include - -// bson-cmp.h is deprecated. -// Ignore deprecation warnings for function calls within this file. - -#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) -#define BSON_BEGIN_IGNORE_DEPRECATIONS \ - _Pragma ("GCC diagnostic push") _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -#define BSON_END_IGNORE_DEPRECATIONS _Pragma ("GCC diagnostic pop") -#elif defined(__clang__) -#define BSON_BEGIN_IGNORE_DEPRECATIONS \ - _Pragma ("clang diagnostic push") _Pragma ("clang diagnostic ignored \"-Wdeprecated-declarations\"") -#define BSON_END_IGNORE_DEPRECATIONS _Pragma ("clang diagnostic pop") -#else -#define BSON_BEGIN_IGNORE_DEPRECATIONS -#define BSON_END_IGNORE_DEPRECATIONS -#endif - -BSON_BEGIN_IGNORE_DEPRECATIONS - -BSON_BEGIN_DECLS - - -/* Based on the "Safe Integral Comparisons" proposal merged in C++20: - * http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2020/p0586r2.html - * - * Due to lack of type deduction in C, relational comparison functions (e.g. - * `cmp_less`) are defined in sets of four "functions" according to the - * signedness of each value argument, e.g.: - * - bson_cmp_less_ss (signed-value, signed-value) - * - bson_cmp_less_uu (unsigned-value, unsigned-value) - * - bson_cmp_less_su (signed-value, unsigned-value) - * - bson_cmp_less_us (unsigned-value, signed-value) - * - * Similarly, the `in_range` function is defined as a set of two "functions" - * according to the signedness of the value argument: - * - bson_in_range_signed (Type, signed-value) - * - bson_in_range_unsigned (Type, unsigned-value) - * - * The user must take care to use the correct signedness for the provided - * argument(s). Enabling compiler warnings for implicit sign conversions is - * recommended. - */ - -#define BSON_CMP_SET(op, ss, uu, su, us) \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_cmp_, op, _ss) (int64_t t, int64_t u) \ - { \ - return (ss); \ - } \ - \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_cmp_, op, _uu) (uint64_t t, uint64_t u) \ - { \ - return (uu); \ - } \ - \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_cmp_, op, _su) (int64_t t, uint64_t u) \ - { \ - return (su); \ - } \ - \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_cmp_, op, _us) (uint64_t t, int64_t u) \ - { \ - return (us); \ - } - -BSON_CMP_SET (equal, t == u, t == u, t < 0 ? false : (uint64_t) (t) == u, u < 0 ? false : t == (uint64_t) (u)) - -BSON_CMP_SET (not_equal, - !bson_cmp_equal_ss (t, u), - !bson_cmp_equal_uu (t, u), - !bson_cmp_equal_su (t, u), - !bson_cmp_equal_us (t, u)) - -BSON_CMP_SET (less, t < u, t < u, t < 0 ? true : (uint64_t) (t) < u, u < 0 ? false : t < (uint64_t) (u)) - -BSON_CMP_SET ( - greater, bson_cmp_less_ss (u, t), bson_cmp_less_uu (u, t), bson_cmp_less_us (u, t), bson_cmp_less_su (u, t)) - -BSON_CMP_SET (less_equal, - !bson_cmp_greater_ss (t, u), - !bson_cmp_greater_uu (t, u), - !bson_cmp_greater_su (t, u), - !bson_cmp_greater_us (t, u)) - -BSON_CMP_SET (greater_equal, - !bson_cmp_less_ss (t, u), - !bson_cmp_less_uu (t, u), - !bson_cmp_less_su (t, u), - !bson_cmp_less_us (t, u)) - -#undef BSON_CMP_SET - - -/* Return true if the given value is within the range of the corresponding - * signed type. The suffix must match the signedness of the given value. */ -#define BSON_IN_RANGE_SET_SIGNED(Type, min, max) \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_in_range, _##Type, _signed) (int64_t value) \ - { \ - return bson_cmp_greater_equal_ss (value, min) && bson_cmp_less_equal_ss (value, max); \ - } \ - \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) (uint64_t value) \ - { \ - return bson_cmp_greater_equal_us (value, min) && bson_cmp_less_equal_us (value, max); \ - } - -/* Return true if the given value is within the range of the corresponding - * unsigned type. The suffix must match the signedness of the given value. */ -#define BSON_IN_RANGE_SET_UNSIGNED(Type, max) \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_in_range, _##Type, _signed) (int64_t value) \ - { \ - return bson_cmp_greater_equal_su (value, 0u) && bson_cmp_less_equal_su (value, max); \ - } \ - \ - static BSON_INLINE bool BSON_GNUC_DEPRECATED BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) (uint64_t value) \ - { \ - return bson_cmp_less_equal_uu (value, max); \ - } - -BSON_IN_RANGE_SET_SIGNED (signed_char, SCHAR_MIN, SCHAR_MAX) -BSON_IN_RANGE_SET_SIGNED (short, SHRT_MIN, SHRT_MAX) -BSON_IN_RANGE_SET_SIGNED (int, INT_MIN, INT_MAX) -BSON_IN_RANGE_SET_SIGNED (long, LONG_MIN, LONG_MAX) -BSON_IN_RANGE_SET_SIGNED (long_long, LLONG_MIN, LLONG_MAX) - -BSON_IN_RANGE_SET_UNSIGNED (unsigned_char, UCHAR_MAX) -BSON_IN_RANGE_SET_UNSIGNED (unsigned_short, USHRT_MAX) -BSON_IN_RANGE_SET_UNSIGNED (unsigned_int, UINT_MAX) -BSON_IN_RANGE_SET_UNSIGNED (unsigned_long, ULONG_MAX) -BSON_IN_RANGE_SET_UNSIGNED (unsigned_long_long, ULLONG_MAX) - -BSON_IN_RANGE_SET_SIGNED (int8_t, INT8_MIN, INT8_MAX) -BSON_IN_RANGE_SET_SIGNED (int16_t, INT16_MIN, INT16_MAX) -BSON_IN_RANGE_SET_SIGNED (int32_t, INT32_MIN, INT32_MAX) -BSON_IN_RANGE_SET_SIGNED (int64_t, INT64_MIN, INT64_MAX) - -BSON_IN_RANGE_SET_UNSIGNED (uint8_t, UINT8_MAX) -BSON_IN_RANGE_SET_UNSIGNED (uint16_t, UINT16_MAX) -BSON_IN_RANGE_SET_UNSIGNED (uint32_t, UINT32_MAX) -BSON_IN_RANGE_SET_UNSIGNED (uint64_t, UINT64_MAX) - -BSON_IN_RANGE_SET_SIGNED (ssize_t, SSIZE_MIN, SSIZE_MAX) -BSON_IN_RANGE_SET_UNSIGNED (size_t, SIZE_MAX) - -#undef BSON_IN_RANGE_SET_SIGNED -#undef BSON_IN_RANGE_SET_UNSIGNED - - -/* Return true if the value with *signed* type is in the representable range of - * Type and false otherwise. */ -#define bson_in_range_signed(Type, value) BSON_CONCAT3 (bson_in_range, _##Type, _signed) (value) - -/* Return true if the value with *unsigned* type is in the representable range - * of Type and false otherwise. */ -#define bson_in_range_unsigned(Type, value) BSON_CONCAT3 (bson_in_range, _##Type, _unsigned) (value) - - -BSON_END_DECLS - -BSON_END_IGNORE_DEPRECATIONS - -#undef BSON_BEGIN_IGNORE_DEPRECATIONS -#undef BSON_END_IGNORE_DEPRECATIONS - -#endif /* BSON_CMP_H */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-config.h.in 2.0.2-1/src/libbson/src/bson/bson-config.h.in --- 1.30.4-1/src/libbson/src/bson/bson-config.h.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-config.h.in 2025-06-19 15:42:22.000000000 +0000 @@ -96,14 +96,6 @@ #endif -/* - * Define to 1 if you want extra aligned types in libbson - */ -#define BSON_EXTRA_ALIGN @BSON_EXTRA_ALIGN@ -#if BSON_EXTRA_ALIGN != 1 -# undef BSON_EXTRA_ALIGN -#endif - /* * Define to 1 if you have rand_r available on your platform. diff -pruN 1.30.4-1/src/libbson/src/bson/bson-context-private.h 2.0.2-1/src/libbson/src/bson/bson-context-private.h --- 1.30.4-1/src/libbson/src/bson/bson-context-private.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-context-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -65,19 +65,6 @@ _bson_context_set_oid_rand (bson_context void _bson_context_set_oid_seq32 (bson_context_t *context, bson_oid_t *oid); -/** - * @brief Write a 64-bit counter from the given context into the OID. Increments - * the context's sequence counter. - * - * @param context The context with the counter to get+update - * @param oid The OID to modify - * - * @note Only used by the deprecated @ref bson_oid_init_sequence - */ -void -_bson_context_set_oid_seq64 (bson_context_t *context, bson_oid_t *oid); - - BSON_END_DECLS diff -pruN 1.30.4-1/src/libbson/src/bson/bson-context.c 2.0.2-1/src/libbson/src/bson/bson-context.c --- 1.30.4-1/src/libbson/src/bson/bson-context.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-context.c 2025-06-19 15:42:22.000000000 +0000 @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include #include @@ -67,18 +68,6 @@ _bson_context_set_oid_seq32 (bson_contex memcpy (&oid->bytes[BSON_OID_SEQ32_OFFSET], ((uint8_t *) &seq) + 1, BSON_OID_SEQ32_SIZE); } - -void -_bson_context_set_oid_seq64 (bson_context_t *context, /* IN */ - bson_oid_t *oid) /* OUT */ -{ - uint64_t seq = - (uint64_t) mcommon_atomic_int64_fetch_add ((int64_t *) &context->seq64, 1, mcommon_memory_order_seq_cst); - - seq = BSON_UINT64_TO_BE (seq); - memcpy (&oid->bytes[BSON_OID_SEQ64_OFFSET], &seq, BSON_OID_SEQ64_SIZE); -} - /* * -------------------------------------------------------------------------- * @@ -116,23 +105,6 @@ _bson_rotl_u64 (uint64_t *p, int nbits) *p = (*p << nbits) | (*p >> (64 - nbits)); } -/* Write the little-endian representation of 'val' into 'out' */ -void -_u64_into_u8x8_le (uint8_t out[8], uint64_t val) -{ - val = BSON_UINT64_TO_LE (val); - memcpy (out, &val, sizeof val); -} - -/* Read a little-endian representation of a 64bit number from 'in' */ -uint64_t -_u8x8_le_to_u64 (const uint8_t in[8]) -{ - uint64_t r; - memcpy (&r, in, sizeof r); - return BSON_UINT64_FROM_LE (r); -} - /* Perform one SipHash round */ void _sip_round (uint64_t *v0, uint64_t *v1, uint64_t *v2, uint64_t *v3) @@ -167,8 +139,8 @@ _siphash (const void *in, const size_t i uint64_t v1 = UINT64_C (0x646f72616e646f6d); uint64_t v2 = UINT64_C (0x6c7967656e657261); uint64_t v3 = UINT64_C (0x7465646279746573); - uint64_t k0 = _u8x8_le_to_u64 (kk); - uint64_t k1 = _u8x8_le_to_u64 (kk + 8); + uint64_t k0 = mlib_read_u64le (kk); + uint64_t k1 = mlib_read_u64le (kk + 8); uint64_t m; int i; const unsigned char *end = ni + inlen - (inlen % sizeof (uint64_t)); @@ -182,7 +154,7 @@ _siphash (const void *in, const size_t i v1 ^= 0xee; for (; ni != end; ni += 8) { - m = _u8x8_le_to_u64 (ni); + m = mlib_read_u64le (ni); v3 ^= m; for (i = 0; i < C_ROUNDS; ++i) @@ -232,7 +204,7 @@ _siphash (const void *in, const size_t i _sip_round (&v0, &v1, &v2, &v3); b = v0 ^ v1 ^ v2 ^ v3; - _u64_into_u8x8_le (digest_buf, b); + mlib_write_u64le (digest_buf, b); v1 ^= 0xdd; @@ -240,7 +212,7 @@ _siphash (const void *in, const size_t i _sip_round (&v0, &v1, &v2, &v3); b = v0 ^ v1 ^ v2 ^ v3; - _u64_into_u8x8_le (digest_buf + 8, b); + mlib_write_u64le (digest_buf + 8, b); memcpy (digest, digest_buf, sizeof digest_buf); } diff -pruN 1.30.4-1/src/libbson/src/bson/bson-decimal128.c 2.0.2-1/src/libbson/src/bson/bson-decimal128.c --- 1.30.4-1/src/libbson/src/bson/bson-decimal128.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-decimal128.c 2025-06-19 15:42:22.000000000 +0000 @@ -23,7 +23,8 @@ #include #include #include -#include +#include +#include #define BSON_DECIMAL128_EXPONENT_MAX 6111 @@ -128,16 +129,15 @@ void bson_decimal128_to_string (const bson_decimal128_t *dec, /* IN */ char *str) /* OUT */ { - uint32_t COMBINATION_MASK = 0x1f; /* Extract least significant 5 bits */ - uint32_t EXPONENT_MASK = 0x3fff; /* Extract least significant 14 bits */ - uint32_t COMBINATION_INFINITY = 30; /* Value of combination field for Inf */ - uint32_t COMBINATION_NAN = 31; /* Value of combination field for NaN */ - uint32_t EXPONENT_BIAS = 6176; /* decimal128 exponent bias */ + const int COMBINATION_MASK = 0x1f; /* Extract least significant 5 bits */ + const int EXPONENT_MASK = 0x3fff; /* Extract least significant 14 bits */ + const int COMBINATION_INFINITY = 30; /* Value of combination field for Inf */ + const int COMBINATION_NAN = 31; /* Value of combination field for NaN */ + const int EXPONENT_BIAS = 6176; /* decimal128 exponent bias */ char *str_out = str; /* output pointer in string */ char significand_str[35]; /* decoded significand digits */ - /* Note: bits in this routine are referred to starting at 0, */ /* from the sign bit, towards the coefficient. */ uint32_t high; /* bits 0 - 31 */ @@ -145,13 +145,8 @@ bson_decimal128_to_string (const bson_de uint32_t midl; /* bits 64 - 95 */ uint32_t low; /* bits 96 - 127 */ uint32_t combination; /* bits 1 - 5 */ - uint32_t biased_exponent; /* decoded biased exponent (14 bits) */ - uint32_t significand_digits = 0; /* the number of significand digits */ uint32_t significand[36] = {0}; /* the base-10 digits in the significand */ uint32_t *significand_read = significand; /* read pointer into significand */ - int32_t exponent; /* unbiased exponent */ - int32_t scientific_exponent; /* the exponent if scientific notation is - * used */ bool is_zero = false; /* true if the number is zero */ uint8_t significand_msb; /* the most signifcant significand bits (50-46) */ @@ -171,12 +166,13 @@ bson_decimal128_to_string (const bson_de /* Decode combination field and exponent */ combination = (high >> 26) & COMBINATION_MASK; + int biased_exponent; if (BSON_UNLIKELY ((combination >> 3) == 3)) { /* Check for 'special' values */ - if (combination == COMBINATION_INFINITY) { /* Infinity */ + if (mlib_cmp (combination, ==, COMBINATION_INFINITY)) { /* Infinity */ strcpy (str_out, BSON_DECIMAL128_INF); return; - } else if (combination == COMBINATION_NAN) { /* NaN */ + } else if (mlib_cmp (combination, ==, COMBINATION_NAN)) { /* NaN */ /* str, not str_out, to erase the sign */ strcpy (str, BSON_DECIMAL128_NAN); /* we don't care about the NaN payload. */ @@ -190,13 +186,15 @@ bson_decimal128_to_string (const bson_de biased_exponent = (high >> 17) & EXPONENT_MASK; } - exponent = biased_exponent - EXPONENT_BIAS; + /* unbiased exponent */ + const int32_t exponent = biased_exponent - EXPONENT_BIAS; + /* Create string of significand digits */ /* Convert the 114-bit binary number represented by */ /* (high, midh, midl, low) to at most 34 decimal */ /* digits through modulo and division. */ - significand128.parts[0] = (high & 0x3fff) + ((significand_msb & 0xf) << 14); + significand128.parts[0] = (high & 0x3fff) + ((significand_msb & 0xfu) << 14); significand128.parts[1] = midh; significand128.parts[2] = midl; significand128.parts[3] = low; @@ -234,18 +232,20 @@ bson_decimal128_to_string (const bson_de /* Scientific - [-]d.dddE(+/-)dd or [-]dE(+/-)dd */ /* Regular - ddd.ddd */ + int32_t num_significant_digits; if (is_zero) { - significand_digits = 1; + num_significant_digits = 1; *significand_read = 0; } else { - significand_digits = 36; + num_significant_digits = 36; while (!(*significand_read)) { - significand_digits--; + num_significant_digits--; significand_read++; } } - scientific_exponent = significand_digits - 1 + exponent; + /* the exponent if scientific notation is used */ + const int32_t scientific_exponent = num_significant_digits - 1 + exponent; /* The scientific exponent checks are dictated by the string conversion * specification and are somewhat arbitrary cutoffs. @@ -258,13 +258,13 @@ bson_decimal128_to_string (const bson_de if (scientific_exponent < -6 || exponent > 0) { /* Scientific format */ *(str_out++) = *(significand_read++) + '0'; - significand_digits--; + num_significant_digits--; - if (significand_digits) { + if (num_significant_digits) { *(str_out++) = '.'; } - for (uint32_t i = 0; i < significand_digits && (str_out - str) < 36; i++) { + for (int32_t i = 0; i < num_significant_digits && (str_out - str) < 36; i++) { *(str_out++) = *(significand_read++) + '0'; } /* Exponent */ @@ -275,18 +275,19 @@ bson_decimal128_to_string (const bson_de } else { /* Regular format with no decimal place */ if (exponent >= 0) { - for (uint32_t i = 0; i < significand_digits && (str_out - str) < 36; i++) { + for (int32_t i = 0; i < num_significant_digits && (str_out - str) < 36; i++) { *(str_out++) = *(significand_read++) + '0'; } *str_out = '\0'; } else { - int32_t radix_position = significand_digits + exponent; + int32_t radix_position = num_significant_digits + exponent; // Reserve space for null terminator. const int available_bytes = BSON_DECIMAL128_STRING - 1; + const char *const str_end = str + available_bytes; if (radix_position > 0) { /* non-zero digits before radix */ - for (int32_t i = 0; i < radix_position && (str_out - str) < available_bytes; i++) { + for (int32_t i = 0; i < radix_position && str_out != str_end; i++) { *(str_out++) = *(significand_read++) + '0'; } } else { /* leading zero before radix point */ @@ -294,14 +295,16 @@ bson_decimal128_to_string (const bson_de } *(str_out++) = '.'; - while (radix_position++ < 0) { /* add leading zeros after radix */ + while (radix_position++ < 0 && str_out != str_end) { /* add leading zeros after radix */ *(str_out++) = '0'; } - for (uint32_t i = 0; mcommon_cmp_greater_us (significand_digits - i, BSON_MAX (radix_position - 1, 0)) && - (str_out - str) < available_bytes; - i++) { - *(str_out++) = *(significand_read++) + '0'; + const unsigned dot_pos = (unsigned) BSON_MAX (radix_position - 1, 0); + const unsigned n_trailing_digits = num_significant_digits - dot_pos; + const unsigned n_to_write = BSON_MIN (n_trailing_digits, (unsigned) (str_end - str_out)); + mlib_foreach_urange (i, n_to_write) { + (void) i; + *str_out++ = *significand_read++ + '0'; } *str_out = '\0'; } @@ -548,7 +551,7 @@ bson_decimal128_from_string_w_len (const } found_nonzero = true; - *(digits_insert++) = *(str_read) - '0'; /* Only store 34 digits */ + *(digits_insert++) = (uint16_t) (*(str_read) - '0'); /* Only store 34 digits */ ndigits_stored++; } } @@ -582,7 +585,7 @@ bson_decimal128_from_string_w_len (const int read_exponent = SSCANF (++str_read, "%" SCNd64 "%n", &temp_exponent, &nread); str_read += nread; - if (!read_exponent || nread == 0 || !mcommon_in_range_int32_t_signed (temp_exponent)) { + if (!read_exponent || nread == 0 || !mlib_in_range (int32_t, temp_exponent)) { BSON_DECIMAL128_SET_NAN (*dec); return false; } @@ -601,7 +604,6 @@ bson_decimal128_from_string_w_len (const first_digit = 0; if (!ndigits_stored) { /* value is zero */ - first_digit = 0; last_digit = 0; digits[0] = 0; ndigits = 1; @@ -623,11 +625,10 @@ bson_decimal128_from_string_w_len (const /* to represent user input */ /* Overflow prevention */ - if (mcommon_cmp_less_equal_su (exponent, radix_position) && - mcommon_cmp_greater_us (radix_position, exponent + (1 << 14))) { + if (mlib_cmp (exponent, <=, radix_position) && mlib_cmp (radix_position, >, exponent + (1 << 14))) { exponent = BSON_DECIMAL128_EXPONENT_MIN; } else { - BSON_ASSERT (mcommon_in_range_unsigned (int32_t, radix_position)); + BSON_ASSERT (mlib_in_range (int32_t, radix_position)); exponent -= (int32_t) radix_position; } @@ -694,11 +695,9 @@ bson_decimal128_from_string_w_len (const /* Round */ /* We've normalized the exponent, but might still need to round. */ if (last_digit - first_digit + 1 < significant_digits) { - uint8_t round_digit; - /* There are non-zero digits after last_digit that need rounding. */ /* We round to nearest, ties to even */ - round_digit = string[first_nonzero + last_digit + includes_sign + saw_radix + 1] - '0'; + const char round_digit = string[first_nonzero + last_digit + includes_sign + saw_radix + 1] - '0'; if (round_digit != 0) { /* Inexact (non-zero) rounding is not allowed */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-endian.h 2.0.2-1/src/libbson/src/bson/bson-endian.h --- 1.30.4-1/src/libbson/src/bson/bson-endian.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-endian.h 2025-06-19 15:42:22.000000000 +0000 @@ -83,6 +83,8 @@ BSON_BEGIN_DECLS #define BSON_UINT64_TO_BE(v) BSON_UINT64_SWAP_LE_BE (v) #define BSON_DOUBLE_FROM_LE(v) ((double) v) #define BSON_DOUBLE_TO_LE(v) ((double) v) +#define BSON_FLOAT_FROM_LE(v) ((float) v) +#define BSON_FLOAT_TO_LE(v) ((float) v) #elif BSON_BYTE_ORDER == BSON_BIG_ENDIAN #define BSON_UINT16_FROM_LE(v) BSON_UINT16_SWAP_LE_BE (v) #define BSON_UINT16_TO_LE(v) BSON_UINT16_SWAP_LE_BE (v) @@ -98,6 +100,8 @@ BSON_BEGIN_DECLS #define BSON_UINT64_TO_BE(v) ((uint64_t) v) #define BSON_DOUBLE_FROM_LE(v) (__bson_double_swap_slow (v)) #define BSON_DOUBLE_TO_LE(v) (__bson_double_swap_slow (v)) +#define BSON_FLOAT_FROM_LE(v) (__bson_float_swap_slow (v)) +#define BSON_FLOAT_TO_LE(v) (__bson_float_swap_slow (v)) #else #error "The endianness of target architecture is unknown." #endif @@ -203,6 +207,37 @@ __bson_double_swap_slow (double v) /* IN memcpy (&v, &uv, sizeof (v)); return v; +} + + +/* + *-------------------------------------------------------------------------- + * + * __bson_float_swap_slow -- + * + * Fallback endianness conversion for single floating point. + * + * Returns: + * The endian swapped version. + * + * Side effects: + * None. + * + *-------------------------------------------------------------------------- + */ + +BSON_STATIC_ASSERT2 (sizeof_uint32_t, sizeof (float) == sizeof (uint32_t)); + +static BSON_INLINE float +__bson_float_swap_slow (float v) /* IN */ +{ + uint32_t uv; + + memcpy (&uv, &v, sizeof (v)); + uv = BSON_UINT32_SWAP_LE_BE (uv); + memcpy (&v, &uv, sizeof (v)); + + return v; } BSON_END_DECLS diff -pruN 1.30.4-1/src/libbson/src/bson/bson-error-private.h 2.0.2-1/src/libbson/src/bson/bson-error-private.h --- 1.30.4-1/src/libbson/src/bson/bson-error-private.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-error-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,36 @@ +/* + * Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#ifndef BSON_ERROR_PRIVATE_H +#define BSON_ERROR_PRIVATE_H + +#include +#include + + +#define BSON_ERROR_CATEGORY 1 + + +static BSON_INLINE void +bson_set_error_category (bson_error_t *error, uint8_t category) +{ + BSON_ASSERT_PARAM (error); + error->reserved = category; +} + +#endif /* BSON_ERROR_PRIVATE_H */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-error.c 2.0.2-1/src/libbson/src/bson/bson-error.c --- 1.30.4-1/src/libbson/src/bson/bson-error.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-error.c 2025-06-19 15:42:22.000000000 +0000 @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -74,12 +74,11 @@ bson_set_error (bson_error_t *error, /* if (error) { error->domain = domain; error->code = code; + bson_set_error_category (error, BSON_ERROR_CATEGORY); va_start (args, format); bson_vsnprintf (error->message, sizeof error->message, format, args); va_end (args); - - error->message[sizeof error->message - 1] = '\0'; } } @@ -113,7 +112,7 @@ bson_strerror_r (int err_code, #if defined(_WIN32) // Windows does not provide `strerror_l` or `strerror_r`, but it does // unconditionally provide `strerror_s`. - if (strerror_s (buf, buflen, err_code) != 0) { + if (strerror_s (buf, buflen, err_code) == 0) { ret = buf; } #elif defined(_AIX) diff -pruN 1.30.4-1/src/libbson/src/bson/bson-error.h 2.0.2-1/src/libbson/src/bson/bson-error.h --- 1.30.4-1/src/libbson/src/bson/bson-error.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-error.h 2025-06-19 15:42:22.000000000 +0000 @@ -32,6 +32,7 @@ BSON_BEGIN_DECLS #define BSON_ERROR_JSON 1 #define BSON_ERROR_READER 2 #define BSON_ERROR_INVALID 3 +#define BSON_ERROR_VECTOR 4 BSON_EXPORT (void) diff -pruN 1.30.4-1/src/libbson/src/bson/bson-iter.c 2.0.2-1/src/libbson/src/bson/bson-iter.c --- 1.30.4-1/src/libbson/src/bson/bson-iter.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-iter.c 2025-06-19 15:42:22.000000000 +0000 @@ -15,11 +15,12 @@ */ +#include +#include #include #include #include #include -#include #define ITER_TYPE(i) ((bson_type_t) * ((i)->raw + (i)->type)) @@ -90,8 +91,6 @@ bson_iter_init_from_data (bson_iter_t *i const uint8_t *data, /* IN */ size_t length) /* IN */ { - uint32_t len_le; - BSON_ASSERT (iter); BSON_ASSERT (data); @@ -100,9 +99,9 @@ bson_iter_init_from_data (bson_iter_t *i return false; } - memcpy (&len_le, data, sizeof (len_le)); - - if (BSON_UNLIKELY ((size_t) BSON_UINT32_FROM_LE (len_le) != length)) { + // Check that the object header matches the length of the given buffer + const uint32_t hdr_len = mlib_read_u32le (data); + if (BSON_UNLIKELY (hdr_len != length)) { memset (iter, 0, sizeof *iter); return false; } @@ -112,7 +111,7 @@ bson_iter_init_from_data (bson_iter_t *i return false; } - if (BSON_UNLIKELY (!mcommon_in_range_unsigned (uint32_t, length))) { + if (BSON_UNLIKELY (!mlib_in_range (uint32_t, length))) { memset (iter, 0, sizeof *iter); return false; } @@ -575,16 +574,13 @@ fill_data_fields: case BSON_TYPE_CODE: case BSON_TYPE_SYMBOL: case BSON_TYPE_UTF8: { - uint32_t l; - if ((o + 4) >= len) { iter->err_off = o; goto mark_invalid; } iter->d2 = o + 4; - memcpy (&l, iter->raw + iter->d1, sizeof (l)); - l = BSON_UINT32_FROM_LE (l); + const uint32_t l = mlib_read_u32le (iter->raw + iter->d1); if (l > (len - (o + 4))) { iter->err_off = o; @@ -611,7 +607,6 @@ fill_data_fields: } break; case BSON_TYPE_BINARY: { bson_subtype_t subtype; - uint32_t l; if (o >= (len - 4)) { iter->err_off = o; @@ -621,8 +616,7 @@ fill_data_fields: iter->d2 = o + 4; iter->d3 = o + 5; - memcpy (&l, iter->raw + iter->d1, sizeof (l)); - l = BSON_UINT32_FROM_LE (l); + const uint32_t l = mlib_read_u32le (iter->raw + iter->d1); if (l >= (len - o - 4)) { iter->err_off = o; @@ -632,17 +626,14 @@ fill_data_fields: subtype = *(iter->raw + iter->d2); if (subtype == BSON_SUBTYPE_BINARY_DEPRECATED) { - int32_t binary_len; - if (l < 4) { iter->err_off = o; goto mark_invalid; } /* subtype 2 has a redundant length header in the data */ - memcpy (&binary_len, (iter->raw + iter->d3), sizeof (binary_len)); - binary_len = BSON_UINT32_FROM_LE (binary_len); - if (binary_len != l - 4) { + const int32_t bin_len = mlib_read_i32le (iter->raw + iter->d3); + if (mlib_cmp (bin_len, !=, l - 4)) { iter->err_off = iter->d3; goto mark_invalid; } @@ -652,16 +643,12 @@ fill_data_fields: } break; case BSON_TYPE_ARRAY: case BSON_TYPE_DOCUMENT: { - uint32_t l; - if (o >= (len - 4)) { iter->err_off = o; goto mark_invalid; } - memcpy (&l, iter->raw + iter->d1, sizeof (l)); - l = BSON_UINT32_FROM_LE (l); - + const uint32_t l = mlib_read_u32le (iter->raw + iter->d1); if ((l > len) || (l > (len - o))) { iter->err_off = o; goto mark_invalid; @@ -720,16 +707,13 @@ fill_data_fields: iter->next_off = o + 1; } break; case BSON_TYPE_DBPOINTER: { - uint32_t l; - if (o >= (len - 4)) { iter->err_off = o; goto mark_invalid; } iter->d2 = o + 4; - memcpy (&l, iter->raw + iter->d1, sizeof (l)); - l = BSON_UINT32_FROM_LE (l); + const uint32_t l = mlib_read_u32le (iter->raw + iter->d1); /* Check valid string length. l counts '\0' but not 4 bytes for itself. */ if (l == 0 || l > (len - o - 4)) { @@ -747,9 +731,6 @@ fill_data_fields: iter->next_off = o + 4 + l + 12; } break; case BSON_TYPE_CODEWSCOPE: { - uint32_t l; - uint32_t doclen; - if ((len < 19) || (o >= (len - 14))) { iter->err_off = o; goto mark_invalid; @@ -758,40 +739,37 @@ fill_data_fields: iter->d2 = o + 4; iter->d3 = o + 8; - memcpy (&l, iter->raw + iter->d1, sizeof (l)); - l = BSON_UINT32_FROM_LE (l); + const uint32_t l1 = mlib_read_u32le (iter->raw + iter->d1); - if ((l < 14) || (l >= (len - o))) { + if ((l1 < 14) || (l1 >= (len - o))) { iter->err_off = o; goto mark_invalid; } - iter->next_off = o + l; + iter->next_off = o + l1; if (iter->next_off >= len) { iter->err_off = o; goto mark_invalid; } - memcpy (&l, iter->raw + iter->d2, sizeof (l)); - l = BSON_UINT32_FROM_LE (l); + const uint32_t l2 = mlib_read_u32le (iter->raw + iter->d2); - if (l == 0 || l >= (len - o - 4 - 4)) { + if (l2 == 0 || l2 >= (len - o - 4 - 4)) { iter->err_off = o; goto mark_invalid; } - if ((o + 4 + 4 + l + 4) >= iter->next_off) { + if ((o + 4 + 4 + l2 + 4) >= iter->next_off) { iter->err_off = o + 4; goto mark_invalid; } - iter->d4 = o + 4 + 4 + l; - memcpy (&doclen, iter->raw + iter->d4, sizeof (doclen)); - doclen = BSON_UINT32_FROM_LE (doclen); + iter->d4 = o + 4 + 4 + l2; + const uint32_t doclen = mlib_read_u32le (iter->raw + iter->d4); - if ((o + 4 + 4 + l + doclen) != iter->next_off) { - iter->err_off = o + 4 + 4 + l; + if ((o + 4 + 4 + l2 + doclen) != iter->next_off) { + iter->err_off = o + 4 + 4 + l2; goto mark_invalid; } } break; @@ -881,6 +859,12 @@ bson_iter_next (bson_iter_t *iter) /* IN * @binary should not be modified or freed and is only valid while * @iter's bson_t is valid and unmodified. * + * Note: Public constraints are tighter than private ones. + * API documentation says it's "a programming error to call this function + * when ``iter`` is not observing an element of type BSON_TYPE_BINARY.". + * Privately only, we do check the iterator type and we output NULL and + * BSON_SUBTYPE_BINARY when the type is incorrect. + * * Parameters: * @iter: A bson_iter_t * @subtype: A location for the binary subtype. @@ -915,8 +899,7 @@ bson_iter_binary (const bson_iter_t *ite *subtype = (bson_subtype_t) * (iter->raw + iter->d2); if (binary) { - memcpy (binary_len, (iter->raw + iter->d1), sizeof (*binary_len)); - *binary_len = BSON_UINT32_FROM_LE (*binary_len); + *binary_len = mlib_read_u32le (iter->raw + iter->d1); *binary = iter->raw + iter->d3; if (*subtype == BSON_SUBTYPE_BINARY_DEPRECATED) { @@ -945,6 +928,149 @@ bson_iter_binary (const bson_iter_t *ite /* *-------------------------------------------------------------------------- * + * bson_iter_overwrite_binary -- + * + * Obtain temporary mutable access to the contents of a BSON_TYPE_BINARY + * field. It may be modified in content only, without changing length + * or subtype, through a temporary pointer that's only valid until the + * underlying bson_t is modified or deleted. + * + * Note: Public constraints are tighter than private ones. + * API documentation says it's "a programming error to call this function + * when ``iter`` is not observing an element of type BSON_TYPE_BINARY.". + * Privately only, we do check the iterator type and we return NULL when + * the type is incorrect. + * + * Parameters: + * @iter: A bson_iter_t + * @binary_len: A location for the length of @binary. + * @binary: A location for a pointer to the binary data. + * + * Returns: + * On success, returns a pointer in *binary and a length in *binary_len. + * The pointer is invalidated when the underlying bson_t is destroyed or modified. + * If the iter does not point to a binary item of the indicated subtype, + * returns NULL in *binary and 0 *binary_len. + * + * Side effects: + * None. + * + *-------------------------------------------------------------------------- + */ + +BSON_EXPORT (void) +bson_iter_overwrite_binary (bson_iter_t *iter, /* IN */ + bson_subtype_t subtype, /* IN */ + uint32_t *binary_len, /* OUT */ + uint8_t **binary) /* OUT */ +{ + BSON_ASSERT_PARAM (iter); + BSON_OPTIONAL_PARAM (binary_len); + BSON_OPTIONAL_PARAM (binary); + + bson_subtype_t iter_subtype; + uint32_t iter_binary_len; + const uint8_t *iter_binary; + bson_iter_binary (iter, &iter_subtype, &iter_binary_len, &iter_binary); + + if (iter_binary && iter_subtype == subtype) { + // All of bson_iter_overwrite_* work by casting away const from iter->raw. + if (binary) { + *binary = (void *) iter_binary; + } + if (binary_len) { + *binary_len = iter_binary_len; + } + return; + } + if (binary) { + *binary = NULL; + } + if (binary_len) { + *binary_len = 0; + } +} + + +/* + *-------------------------------------------------------------------------- + * + * bson_iter_binary_subtype -- + * + * Retrieves the subtype of a BSON_TYPE_BINARY field. + * + * Note: Public constraints are tighter than private ones. + * API documentation says it's "a programming error to call this function + * when ``iter`` is not observing an element of type BSON_TYPE_BINARY.". + * Privately only, we do check the iterator type and return + * BSON_SUBTYPE_BINARY when the type is incorrect. + * + * Parameters: + * @iter: A bson_iter_t + * + * Returns: + * Same as the @subtype OUT parameter from bson_iter_binary(). + * If the iterator is valid, returns the referenced subtype. Otherwise, + * returns BSON_SUBTYPE_BINARY as a fallback. + * + * Side effects: + * None. + * + *-------------------------------------------------------------------------- + */ + +BSON_EXPORT (bson_subtype_t) +bson_iter_binary_subtype (const bson_iter_t *iter) +{ + bson_subtype_t result; + bson_iter_binary (iter, &result, NULL, NULL); + return result; +} + + +/* + *-------------------------------------------------------------------------- + * + * bson_iter_binary_equal -- + * + * Compare two BSON_TYPE_BINARY fields for equality. + * + * Parameters: + * @iter_a: First bson_iter_t to compare + * @iter_b: Second bson_iter_t to compare + * + * Returns: + * true if both iterators point to BSON_TYPE_BINARY fields with + * identical subtype and contents. false if there is any difference. + * + * Side effects: + * None. + * + *-------------------------------------------------------------------------- + */ + +BSON_EXPORT (bool) +bson_iter_binary_equal (const bson_iter_t *iter_a, const bson_iter_t *iter_b) +{ + BSON_ASSERT_PARAM (iter_a); + BSON_ASSERT_PARAM (iter_b); + + if (BSON_ITER_HOLDS_BINARY (iter_a) && BSON_ITER_HOLDS_BINARY (iter_b)) { + bson_subtype_t subtypes[2]; + uint32_t lengths[2]; + const uint8_t *data[2]; + bson_iter_binary (iter_a, &subtypes[0], &lengths[0], &data[0]); + bson_iter_binary (iter_b, &subtypes[1], &lengths[1], &data[1]); + return subtypes[0] == subtypes[1] && lengths[0] == lengths[1] && 0 == memcmp (data[0], data[1], lengths[0]); + } else { + return false; + } +} + + +/* + *-------------------------------------------------------------------------- + * * bson_iter_bool -- * * Retrieves the current field of type BSON_TYPE_BOOL. @@ -1448,21 +1574,17 @@ bson_iter_codewscope (const bson_iter_t uint32_t *scope_len, /* OUT */ const uint8_t **scope) /* OUT */ { - uint32_t len; - BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_CODEWSCOPE) { if (length) { - memcpy (&len, iter->raw + iter->d2, sizeof (len)); + const uint32_t len = mlib_read_u32le (iter->raw + iter->d2); /* The string length was checked > 0 in _bson_iter_next_internal. */ - len = BSON_UINT32_FROM_LE (len); BSON_ASSERT (len > 0); *length = len - 1; } - memcpy (&len, iter->raw + iter->d4, sizeof (len)); - *scope_len = BSON_UINT32_FROM_LE (len); + *scope_len = mlib_read_u32le (iter->raw + iter->d4); *scope = iter->raw + iter->d4; return (const char *) (iter->raw + iter->d3); } @@ -1531,8 +1653,7 @@ bson_iter_dbpointer (const bson_iter_t * if (ITER_TYPE (iter) == BSON_TYPE_DBPOINTER) { if (collection_len) { - memcpy (collection_len, (iter->raw + iter->d1), sizeof (*collection_len)); - *collection_len = BSON_UINT32_FROM_LE (*collection_len); + *collection_len = mlib_read_u32le (iter->raw + iter->d1); if ((*collection_len) > 0) { (*collection_len)--; @@ -1681,17 +1802,14 @@ bson_iter_timestamp (const bson_iter_t * uint32_t *timestamp, /* OUT */ uint32_t *increment) /* OUT */ { - uint64_t encoded; uint32_t ret_timestamp = 0; uint32_t ret_increment = 0; BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_TIMESTAMP) { - memcpy (&encoded, iter->raw + iter->d1, sizeof (encoded)); - encoded = BSON_UINT64_FROM_LE (encoded); - ret_timestamp = (encoded >> 32) & 0xFFFFFFFF; - ret_increment = encoded & 0xFFFFFFFF; + ret_increment = mlib_read_u32le (iter->raw + iter->d1); + ret_timestamp = mlib_read_u32le (iter->raw + iter->d1 + sizeof (uint32_t)); } if (timestamp) { @@ -1796,8 +1914,7 @@ bson_iter_document (const bson_iter_t *i *document_len = 0; if (ITER_TYPE (iter) == BSON_TYPE_DOCUMENT) { - memcpy (document_len, (iter->raw + iter->d1), sizeof (*document_len)); - *document_len = BSON_UINT32_FROM_LE (*document_len); + *document_len = mlib_read_u32le (iter->raw + iter->d1); *document = (iter->raw + iter->d1); } } @@ -1858,8 +1975,7 @@ bson_iter_array (const bson_iter_t *iter *array_len = 0; if (ITER_TYPE (iter) == BSON_TYPE_ARRAY) { - memcpy (array_len, (iter->raw + iter->d1), sizeof (*array_len)); - *array_len = BSON_UINT32_FROM_LE (*array_len); + *array_len = mlib_read_u32le (iter->raw + iter->d1); *array = (iter->raw + iter->d1); } } @@ -2210,13 +2326,11 @@ bson_iter_overwrite_oid (bson_iter_t *it void bson_iter_overwrite_timestamp (bson_iter_t *iter, uint32_t timestamp, uint32_t increment) { - uint64_t value; BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_TIMESTAMP) { - value = ((((uint64_t) timestamp) << 32U) | ((uint64_t) increment)); - value = BSON_UINT64_TO_LE (value); - memcpy ((void *) (iter->raw + iter->d1), &value, sizeof (value)); + void *out = mlib_write_u32le ((char *) iter->raw + iter->d1, increment); + mlib_write_u32le (out, timestamp); } } @@ -2227,8 +2341,7 @@ bson_iter_overwrite_date_time (bson_iter BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_DATE_TIME) { - value = BSON_UINT64_TO_LE (value); - memcpy ((void *) (iter->raw + iter->d1), &value, sizeof (value)); + mlib_write_i64le ((char *) iter->raw + iter->d1, value); } } @@ -2257,10 +2370,7 @@ bson_iter_overwrite_int32 (bson_iter_t * BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_INT32) { -#if BSON_BYTE_ORDER != BSON_LITTLE_ENDIAN - value = BSON_UINT32_TO_LE (value); -#endif - memcpy ((void *) (iter->raw + iter->d1), &value, sizeof (value)); + mlib_write_i32le ((char *) iter->raw + iter->d1, value); } } @@ -2289,10 +2399,7 @@ bson_iter_overwrite_int64 (bson_iter_t * BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_INT64) { -#if BSON_BYTE_ORDER != BSON_LITTLE_ENDIAN - value = BSON_UINT64_TO_LE (value); -#endif - memcpy ((void *) (iter->raw + iter->d1), &value, sizeof (value)); + mlib_write_i64le ((char *) iter->raw + iter->d1, value); } } @@ -2321,8 +2428,7 @@ bson_iter_overwrite_double (bson_iter_t BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_DOUBLE) { - value = BSON_DOUBLE_TO_LE (value); - memcpy ((void *) (iter->raw + iter->d1), &value, sizeof (value)); + mlib_write_f64le ((char *) iter->raw + iter->d1, value); } } @@ -2350,14 +2456,10 @@ bson_iter_overwrite_decimal128 (bson_ite BSON_ASSERT (iter); if (ITER_TYPE (iter) == BSON_TYPE_DECIMAL128) { -#if BSON_BYTE_ORDER != BSON_LITTLE_ENDIAN - uint64_t data[2]; - data[0] = BSON_UINT64_TO_LE (value->low); - data[1] = BSON_UINT64_TO_LE (value->high); - memcpy ((void *) (iter->raw + iter->d1), data, sizeof (data)); -#else - memcpy ((void *) (iter->raw + iter->d1), value, sizeof (*value)); -#endif + // low bits + void *out = mlib_write_u64le ((char *) iter->raw + iter->d1, value->low); + // Followed by high bits + mlib_write_u64le (out, value->high); } } diff -pruN 1.30.4-1/src/libbson/src/bson/bson-iter.h 2.0.2-1/src/libbson/src/bson/bson-iter.h --- 1.30.4-1/src/libbson/src/bson/bson-iter.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-iter.h 2025-06-19 15:42:22.000000000 +0000 @@ -40,6 +40,15 @@ BSON_BEGIN_DECLS #define BSON_ITER_HOLDS_BINARY(iter) (bson_iter_type ((iter)) == BSON_TYPE_BINARY) +#define BSON_ITER_HOLDS_VECTOR(iter) \ + (BSON_ITER_HOLDS_BINARY (iter) && bson_iter_binary_subtype (iter) == BSON_SUBTYPE_VECTOR) + +#define BSON_ITER_HOLDS_VECTOR_INT8(iter) (bson_vector_int8_const_view_from_iter (NULL, iter)) + +#define BSON_ITER_HOLDS_VECTOR_FLOAT32(iter) (bson_vector_float32_const_view_from_iter (NULL, iter)) + +#define BSON_ITER_HOLDS_VECTOR_PACKED_BIT(iter) (bson_vector_packed_bit_const_view_from_iter (NULL, iter)) + #define BSON_ITER_HOLDS_UNDEFINED(iter) (bson_iter_type ((iter)) == BSON_TYPE_UNDEFINED) #define BSON_ITER_HOLDS_OID(iter) (bson_iter_type ((iter)) == BSON_TYPE_OID) @@ -115,6 +124,15 @@ bson_iter_array (const bson_iter_t *iter BSON_EXPORT (void) bson_iter_binary (const bson_iter_t *iter, bson_subtype_t *subtype, uint32_t *binary_len, const uint8_t **binary); +BSON_EXPORT (void) +bson_iter_overwrite_binary (bson_iter_t *iter, bson_subtype_t subtype, uint32_t *binary_len, uint8_t **binary); + +BSON_EXPORT (bson_subtype_t) +bson_iter_binary_subtype (const bson_iter_t *iter); + +BSON_EXPORT (bool) +bson_iter_binary_equal (const bson_iter_t *iter_a, const bson_iter_t *iter_b); + BSON_EXPORT (const char *) bson_iter_code (const bson_iter_t *iter, uint32_t *length); diff -pruN 1.30.4-1/src/libbson/src/bson/bson-json.c 2.0.2-1/src/libbson/src/bson/bson-json.c --- 1.30.4-1/src/libbson/src/bson/bson-json.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-json.c 2025-06-19 15:42:22.000000000 +0000 @@ -22,13 +22,14 @@ #include #include +#include #include #include #include +#include #include #include -#include #ifdef _WIN32 #include @@ -264,9 +265,7 @@ _noop (void) #define STACK_BSON_CHILD STACK_BSON (0) #define STACK_I STACK_ELE (0, i) #define STACK_FRAME_TYPE STACK_ELE (0, type) -#define STACK_IS_INITIAL (STACK_FRAME_TYPE == BSON_JSON_FRAME_INITIAL) #define STACK_IS_ARRAY (STACK_FRAME_TYPE == BSON_JSON_FRAME_ARRAY) -#define STACK_IS_DOC (STACK_FRAME_TYPE == BSON_JSON_FRAME_DOC) #define STACK_IS_SCOPE (STACK_FRAME_TYPE == BSON_JSON_FRAME_SCOPE) #define STACK_IS_DBPOINTER (STACK_FRAME_TYPE == BSON_JSON_FRAME_DBPOINTER) #define FRAME_TYPE_HAS_BSON(_type) ((_type) == BSON_JSON_FRAME_SCOPE || (_type) == BSON_JSON_FRAME_DBPOINTER) @@ -422,10 +421,11 @@ _bson_json_read_set_error (bson_json_rea if (reader->error) { reader->error->domain = BSON_ERROR_JSON; reader->error->code = BSON_JSON_ERROR_READ_INVALID_PARAM; + bson_set_error_category (reader->error, BSON_ERROR_CATEGORY); + va_start (ap, fmt); bson_vsnprintf (reader->error->message, sizeof reader->error->message, fmt, ap); va_end (ap); - reader->error->message[sizeof reader->error->message - 1] = '\0'; } reader->bson.read_state = BSON_JSON_ERROR; @@ -447,10 +447,11 @@ _bson_json_read_corrupt (bson_json_reade if (reader->error) { reader->error->domain = BSON_ERROR_JSON; reader->error->code = BSON_JSON_ERROR_READ_CORRUPT_JS; + bson_set_error_category (reader->error, BSON_ERROR_CATEGORY); + va_start (ap, fmt); bson_vsnprintf (reader->error->message, sizeof reader->error->message, fmt, ap); va_end (ap); - reader->error->message[sizeof reader->error->message - 1] = '\0'; } reader->bson.read_state = BSON_JSON_ERROR; @@ -1110,7 +1111,7 @@ _bson_json_read_start_map (bson_json_rea * expected a legacy Binary format. now we see the second "{", so * backtrack and parse $type query operator. */ bson->read_state = BSON_JSON_IN_START_MAP; - BSON_ASSERT (mcommon_in_range_unsigned (int, len)); + BSON_ASSERT (mlib_in_range (int, len)); STACK_PUSH_DOC (bson_append_document_begin (STACK_BSON_PARENT, key, (int) len, STACK_BSON_CHILD)); _bson_json_save_map_key (bson, (const uint8_t *) "$type", 5); break; @@ -2071,8 +2072,8 @@ bson_json_reader_read (bson_json_reader_ /* accumulate a key or string value */ if (reader->json_text_pos != -1) { - if (mcommon_cmp_less_su (reader->json_text_pos, reader->json->pos)) { - BSON_ASSERT (mcommon_in_range_unsigned (ssize_t, reader->json->pos)); + if (mlib_cmp (reader->json_text_pos, <, reader->json->pos)) { + BSON_ASSERT (mlib_in_range (ssize_t, reader->json->pos)); accum = BSON_MIN ((ssize_t) reader->json->pos - reader->json_text_pos, r); /* if this chunk stopped mid-token, buf_offset is how far into * our current chunk the token begins. */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-json.h 2.0.2-1/src/libbson/src/bson/bson-json.h --- 1.30.4-1/src/libbson/src/bson/bson-json.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-json.h 2025-06-19 15:42:22.000000000 +0000 @@ -64,8 +64,8 @@ bson_json_opts_destroy (bson_json_opts_t BSON_EXPORT (void) bson_json_opts_set_outermost_array (bson_json_opts_t *opts, bool is_outermost_array); -typedef ssize_t (*bson_json_reader_cb) (void *handle, uint8_t *buf, size_t count); -typedef void (*bson_json_destroy_cb) (void *handle); +typedef ssize_t (BSON_CALL *bson_json_reader_cb) (void *handle, uint8_t *buf, size_t count); +typedef void (BSON_CALL *bson_json_destroy_cb) (void *handle); BSON_EXPORT (bson_json_reader_t *) diff -pruN 1.30.4-1/src/libbson/src/bson/bson-keys.c 2.0.2-1/src/libbson/src/bson/bson-keys.c --- 1.30.4-1/src/libbson/src/bson/bson-keys.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-keys.c 2025-06-19 15:42:22.000000000 +0000 @@ -19,7 +19,7 @@ #include #include -#include +#include static const char *gUint32Strs[] = { @@ -145,6 +145,6 @@ bson_uint32_to_string (uint32_t value, int ret = bson_snprintf (str, size, "%u", value); // Truncation is OK. BSON_ASSERT (ret > 0); - BSON_ASSERT (mcommon_in_range_size_t_signed (ret)); + BSON_ASSERT (mlib_in_range (size_t, ret)); return (size_t) ret; } diff -pruN 1.30.4-1/src/libbson/src/bson/bson-macros.h 2.0.2-1/src/libbson/src/bson/bson-macros.h --- 1.30.4-1/src/libbson/src/bson/bson-macros.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-macros.h 2025-06-19 15:42:22.000000000 +0000 @@ -162,15 +162,6 @@ #define BSON_ALIGN_OF_PTR (BSON_ALIGNOF (void *)) #endif -#ifdef BSON_EXTRA_ALIGN -#if defined(_MSC_VER) -#define BSON_ALIGNED_BEGIN(_N) __declspec (align (_N)) -#define BSON_ALIGNED_END(_N) -#else -#define BSON_ALIGNED_BEGIN(_N) -#define BSON_ALIGNED_END(_N) __attribute__ ((aligned (_N))) -#endif -#else #if defined(_MSC_VER) #define BSON_ALIGNED_BEGIN(_N) __declspec (align (BSON_ALIGN_OF_PTR)) #define BSON_ALIGNED_END(_N) @@ -178,7 +169,6 @@ #define BSON_ALIGNED_BEGIN(_N) #define BSON_ALIGNED_END(_N) __attribute__ ((aligned ((_N) > BSON_ALIGN_OF_PTR ? BSON_ALIGN_OF_PTR : (_N)))) #endif -#endif #define bson_str_empty(s) (!s[0]) @@ -210,6 +200,18 @@ #endif +#if defined(__GNUC__) +#define BSON_RESTRICT __restrict__ +#elif defined(_MSC_VER) +#define BSON_RESTRICT __restrict +#elif !defined(__cplusplus) +// C99 (not C++) +#define BSON_RESTRICT restrict +#else +#define BSON_RESTRICT +#endif + + BSON_NORETURN static BSON_INLINE void _bson_assert_failed_on_line (const char *file, int line, const char *func, const char *test) { @@ -329,23 +331,39 @@ _bson_assert_failed_on_param (const char #define BSON_TYPEOF typeof #endif +/** + * @brief Statically annotate an entity as deprecated, including the given deprecation message + * + * @param Message The message to be included in a deprecation warning. This + * should be a string literal. + */ +#define BSON_DEPRECATED(Message) _bsonDeprecatedImpl (Message) -#if BSON_GNUC_CHECK_VERSION(3, 1) -#define BSON_GNUC_DEPRECATED __attribute__ ((__deprecated__)) +// Pick the appropriate implementation of a deprecation attribute +#if defined(_MSC_VER) +// For MSVC, emit __declspec(deprecated(Msg)) +#define _bsonDeprecatedImpl(Msg) __declspec (deprecated (Msg)) +#elif defined(__GNUC__) && (defined(__clang__) || BSON_GNUC_CHECK_VERSION(4, 5)) +// For new enough Clang and GCC, emit __attribute__((__deprecated__(Msg))) +#define _bsonDeprecatedImpl(Msg) __attribute__ ((__deprecated__ (Msg))) +#elif defined(__GNUC__) +// For older GCC, emit deprecation attribute without the message +#define _bsonDeprecatedImpl(Msg) __attribute__ ((__deprecated__)) #else -#define BSON_GNUC_DEPRECATED +// For other compilers, emit nothing +#define _bsonDeprecatedImpl(Msg) #endif +#define BSON_DEPRECATED_FOR(F) BSON_DEPRECATED ("This API is deprecated. Use " #F " instead.") + +#define BSON_GNUC_DEPRECATED BSON_DEPRECATED ("This API is deprecated") +#define BSON_GNUC_DEPRECATED_FOR(F) BSON_DEPRECATED_FOR (F) + #define BSON_CONCAT_IMPL(a, ...) a##__VA_ARGS__ #define BSON_CONCAT(a, ...) BSON_CONCAT_IMPL (a, __VA_ARGS__) #define BSON_CONCAT3(a, b, c) BSON_CONCAT (a, BSON_CONCAT (b, c)) #define BSON_CONCAT4(a, b, c, d) BSON_CONCAT (BSON_CONCAT (a, b), BSON_CONCAT (c, d)) -#if BSON_GNUC_CHECK_VERSION(4, 5) -#define BSON_GNUC_DEPRECATED_FOR(f) __attribute__ ((deprecated ("Use " #f " instead"))) -#else -#define BSON_GNUC_DEPRECATED_FOR(f) BSON_GNUC_DEPRECATED -#endif /** * @brief String-ify the given argument diff -pruN 1.30.4-1/src/libbson/src/bson/bson-md5.c 2.0.2-1/src/libbson/src/bson/bson-md5.c --- 1.30.4-1/src/libbson/src/bson/bson-md5.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-md5.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#include - -#include -#include - - -void -bson_md5_init (bson_md5_t *pms) -{ - mcommon_md5_init (pms); -} - - -void -bson_md5_append (bson_md5_t *pms, const uint8_t *data, uint32_t nbytes) -{ - mcommon_md5_append (pms, data, nbytes); -} - -void -bson_md5_finish (bson_md5_t *pms, uint8_t digest[16]) -{ - mcommon_md5_finish (pms, digest); -} diff -pruN 1.30.4-1/src/libbson/src/bson/bson-md5.h 2.0.2-1/src/libbson/src/bson/bson-md5.h --- 1.30.4-1/src/libbson/src/bson/bson-md5.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-md5.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/* - Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgement in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - L. Peter Deutsch - ghost@aladdin.com - - */ -/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */ -/* - Independent implementation of MD5 (RFC 1321). - - This code implements the MD5 Algorithm defined in RFC 1321, whose - text is available at - http://www.ietf.org/rfc/rfc1321.txt - The code is derived from the text of the RFC, including the test suite - (section A.5) but excluding the rest of Appendix A. It does not include - any code or documentation that is identified in the RFC as being - copyrighted. - - The original and principal author of md5.h is L. Peter Deutsch - . Other authors are noted in the change history - that follows (in reverse chronological order): - - 2002-04-13 lpd Removed support for non-ANSI compilers; removed - references to Ghostscript; clarified derivation from RFC 1321; - now handles byte order either statically or dynamically. - 1999-11-04 lpd Edited comments slightly for automatic TOC extraction. - 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5); - added conditionalization for C++ compilation from Martin - Purschke . - 1999-05-03 lpd Original version. - */ - - -/* - * The following MD5 implementation has been modified to use types as - * specified in libbson. - */ - -#include - - -#ifndef BSON_MD5_H -#define BSON_MD5_H - - -#include - - -BSON_BEGIN_DECLS - - -typedef struct { - uint32_t count[2]; /* message length in bits, lsw first */ - uint32_t abcd[4]; /* digest buffer */ - uint8_t buf[64]; /* accumulate block */ -} bson_md5_t; - - -BSON_EXPORT (void) -bson_md5_init (bson_md5_t *pms) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_md5_append (bson_md5_t *pms, const uint8_t *data, uint32_t nbytes) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_md5_finish (bson_md5_t *pms, uint8_t digest[16]) BSON_GNUC_DEPRECATED; - - -BSON_END_DECLS - - -#endif /* BSON_MD5_H */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-memory.h 2.0.2-1/src/libbson/src/bson/bson-memory.h --- 1.30.4-1/src/libbson/src/bson/bson-memory.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-memory.h 2025-06-19 15:42:22.000000000 +0000 @@ -28,15 +28,15 @@ BSON_BEGIN_DECLS -typedef void *(*bson_realloc_func) (void *mem, size_t num_bytes, void *ctx); +typedef void *(BSON_CALL *bson_realloc_func) (void *mem, size_t num_bytes, void *ctx); typedef struct _bson_mem_vtable_t { - void *(*malloc) (size_t num_bytes); - void *(*calloc) (size_t n_members, size_t num_bytes); - void *(*realloc) (void *mem, size_t num_bytes); - void (*free) (void *mem); - void *(*aligned_alloc) (size_t alignment, size_t num_bytes); + void *(BSON_CALL *malloc) (size_t num_bytes); + void *(BSON_CALL *calloc) (size_t n_members, size_t num_bytes); + void *(BSON_CALL *realloc) (void *mem, size_t num_bytes); + void (BSON_CALL *free) (void *mem); + void *(BSON_CALL *aligned_alloc) (size_t alignment, size_t num_bytes); void *padding[3]; } bson_mem_vtable_t; diff -pruN 1.30.4-1/src/libbson/src/bson/bson-oid.c 2.0.2-1/src/libbson/src/bson/bson-oid.c --- 1.30.4-1/src/libbson/src/bson/bson-oid.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-oid.c 2025-06-19 15:42:22.000000000 +0000 @@ -76,8 +76,9 @@ BSON_MAYBE_UNUSED static const uint16_t #endif }; -static BSON_INLINE void -_oid_init (bson_oid_t *oid, bson_context_t *context, bool add_random) +void +bson_oid_init (bson_oid_t *oid, /* OUT */ + bson_context_t *context) /* IN */ { BSON_ASSERT (oid); if (!context) { @@ -90,27 +91,9 @@ _oid_init (bson_oid_t *oid, bson_context oid->bytes[1] = (uint8_t) (now >> 16); oid->bytes[2] = (uint8_t) (now >> 8); oid->bytes[3] = (uint8_t) (now >> 0); - // Maybe add randomness if the caller wants it - if (add_random) { - _bson_context_set_oid_rand (context, oid); - _bson_context_set_oid_seq32 (context, oid); - } else { - _bson_context_set_oid_seq64 (context, oid); - } -} - -void -bson_oid_init_sequence (bson_oid_t *oid, /* OUT */ - bson_context_t *context) /* IN */ -{ - _oid_init (oid, context, false /* no randomness */); -} - -void -bson_oid_init (bson_oid_t *oid, /* OUT */ - bson_context_t *context) /* IN */ -{ - _oid_init (oid, context, true /* add randomness */); + // Add randomness + _bson_context_set_oid_rand (context, oid); + _bson_context_set_oid_seq32 (context, oid); } diff -pruN 1.30.4-1/src/libbson/src/bson/bson-oid.h 2.0.2-1/src/libbson/src/bson/bson-oid.h --- 1.30.4-1/src/libbson/src/bson/bson-oid.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-oid.h 2025-06-19 15:42:22.000000000 +0000 @@ -51,8 +51,6 @@ bson_oid_init_from_data (bson_oid_t *oid BSON_EXPORT (void) bson_oid_init_from_string (bson_oid_t *oid, const char *str); BSON_EXPORT (void) -bson_oid_init_sequence (bson_oid_t *oid, bson_context_t *context) BSON_GNUC_DEPRECATED_FOR (bson_oid_init); -BSON_EXPORT (void) bson_oid_to_string (const bson_oid_t *oid, char str[25]); diff -pruN 1.30.4-1/src/libbson/src/bson/bson-private.h 2.0.2-1/src/libbson/src/bson/bson-private.h --- 1.30.4-1/src/libbson/src/bson/bson-private.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -40,28 +40,19 @@ typedef enum { } bson_flags_t; -#ifdef BSON_MEMCHECK -#define BSON_INLINE_DATA_SIZE (120 - sizeof (char *)) -#else #define BSON_INLINE_DATA_SIZE 120 -#endif -BSON_ALIGNED_BEGIN (128) +BSON_ALIGNED_BEGIN (BSON_ALIGN_OF_PTR) typedef struct { bson_flags_t flags; uint32_t len; -#ifdef BSON_MEMCHECK - char *canary; -#endif uint8_t data[BSON_INLINE_DATA_SIZE]; -} bson_impl_inline_t BSON_ALIGNED_END (128); +} bson_impl_inline_t BSON_ALIGNED_END (BSON_ALIGN_OF_PTR); BSON_STATIC_ASSERT2 (impl_inline_t, sizeof (bson_impl_inline_t) == 128); - -BSON_ALIGNED_BEGIN (128) typedef struct { bson_flags_t flags; /* flags describing the bson_t */ /* len is part of the public bson_t declaration. It is not @@ -78,11 +69,16 @@ typedef struct { size_t alloclen; /* length of buffer that we own. */ bson_realloc_func realloc; /* our realloc implementation */ void *realloc_func_ctx; /* context for our realloc func */ -} bson_impl_alloc_t BSON_ALIGNED_END (128); +} bson_impl_alloc_t; BSON_STATIC_ASSERT2 (impl_alloc_t, sizeof (bson_impl_alloc_t) <= 128); +// Ensure both `bson_t` implementations have the same alignment requirement: +BSON_STATIC_ASSERT2 (impls_match_alignment, BSON_ALIGNOF (bson_impl_inline_t) == BSON_ALIGNOF (bson_impl_alloc_t)); +// Ensure `bson_t` has same alignment requirement as implementations: +BSON_STATIC_ASSERT2 (impls_match_alignment, BSON_ALIGNOF (bson_t) == BSON_ALIGNOF (bson_impl_alloc_t)); + BSON_END_DECLS diff -pruN 1.30.4-1/src/libbson/src/bson/bson-reader.c 2.0.2-1/src/libbson/src/bson/bson-reader.c --- 1.30.4-1/src/libbson/src/bson/bson-reader.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-reader.c 2025-06-19 15:42:22.000000000 +0000 @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include #include @@ -450,8 +451,6 @@ static const bson_t * _bson_reader_handle_read (bson_reader_handle_t *reader, /* IN */ bool *reached_eof) /* IN */ { - int32_t blen; - if (reached_eof) { *reached_eof = false; } @@ -462,9 +461,7 @@ _bson_reader_handle_read (bson_reader_ha continue; } - memcpy (&blen, &reader->data[reader->offset], sizeof blen); - blen = BSON_UINT32_FROM_LE (blen); - + const int32_t blen = mlib_read_i32le (reader->data + reader->offset); if (blen < 5) { return NULL; } @@ -556,16 +553,12 @@ static const bson_t * _bson_reader_data_read (bson_reader_data_t *reader, /* IN */ bool *reached_eof) /* IN */ { - int32_t blen; - if (reached_eof) { *reached_eof = false; } if ((reader->offset + 4) < reader->length) { - memcpy (&blen, &reader->data[reader->offset], sizeof blen); - blen = BSON_UINT32_FROM_LE (blen); - + const int32_t blen = mlib_read_i32le (reader->data + reader->offset); if (blen < 5) { return NULL; } diff -pruN 1.30.4-1/src/libbson/src/bson/bson-reader.h 2.0.2-1/src/libbson/src/bson/bson-reader.h --- 1.30.4-1/src/libbson/src/bson/bson-reader.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-reader.h 2025-06-19 15:42:22.000000000 +0000 @@ -59,9 +59,9 @@ BSON_BEGIN_DECLS *-------------------------------------------------------------------------- */ -typedef ssize_t (*bson_reader_read_func_t) (void *handle, /* IN */ - void *buf, /* IN */ - size_t count); /* IN */ +typedef ssize_t (BSON_CALL *bson_reader_read_func_t) (void *handle, /* IN */ + void *buf, /* IN */ + size_t count); /* IN */ /* @@ -84,7 +84,7 @@ typedef ssize_t (*bson_reader_read_func_ *-------------------------------------------------------------------------- */ -typedef void (*bson_reader_destroy_func_t) (void *handle); /* IN */ +typedef void (BSON_CALL *bson_reader_destroy_func_t) (void *handle); /* IN */ BSON_EXPORT (bson_reader_t *) diff -pruN 1.30.4-1/src/libbson/src/bson/bson-string.c 2.0.2-1/src/libbson/src/bson/bson-string.c --- 1.30.4-1/src/libbson/src/bson/bson-string.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-string.c 2025-06-19 15:42:22.000000000 +0000 @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include @@ -33,116 +33,6 @@ #endif -bson_string_t * -bson_string_new (const char *str) /* IN */ -{ - /* Compatibility wrapper; deprecated. - * New mcommon_string behavior is to use power of two rounding for resize but not for initial allocation unless - * extra capacity is explicitly requested. This emulates the old behavior, padding the allocation of all new strings. - */ - size_t len = str ? strlen (str) : 0; - BSON_ASSERT (mcommon_in_range_unsigned (uint32_t, len) && (uint32_t) len < UINT32_MAX); - uint32_t alloc = mcommon_next_power_of_two_u32 ((uint32_t) len + 1); - return (bson_string_t *) mcommon_string_new_with_capacity (str ? str : "", (uint32_t) len, alloc - 1); -} - -char * -bson_string_free (bson_string_t *string, /* IN */ - bool free_segment) /* IN */ -{ - // Compatibility wrapper; deprecated. - if (free_segment) { - mcommon_string_destroy ((mcommon_string_t *) string); - return NULL; - } else { - return mcommon_string_destroy_with_steal ((mcommon_string_t *) string); - } -} - -void -bson_string_append (bson_string_t *string, /* IN */ - const char *str) /* IN */ -{ - // Compatibility wrapper; deprecated. - BSON_ASSERT_PARAM (string); - BSON_ASSERT_PARAM (str); - - mcommon_string_append_t append; - mcommon_string_set_append ((mcommon_string_t *) string, &append); - (void) mcommon_string_append (&append, str); -} - -void -bson_string_append_unichar (bson_string_t *string, /* IN */ - bson_unichar_t unichar) /* IN */ -{ - // Compatibility wrapper; deprecated. - BSON_ASSERT_PARAM (string); - - mcommon_string_append_t append; - mcommon_string_set_append ((mcommon_string_t *) string, &append); - (void) mcommon_string_append_unichar (&append, unichar); -} - -void -bson_string_append_c (bson_string_t *string, /* IN */ - char c) /* IN */ -{ - // Compatibility wrapper; deprecated. - BSON_ASSERT_PARAM (string); - - mcommon_string_append_t append; - mcommon_string_set_append ((mcommon_string_t *) string, &append); - (void) mcommon_string_append_bytes (&append, &c, 1); -} - -void -bson_string_append_printf (bson_string_t *string, const char *format, ...) -{ - // Compatibility wrapper; deprecated. - BSON_ASSERT_PARAM (string); - BSON_ASSERT_PARAM (format); - - va_list args; - mcommon_string_append_t append; - mcommon_string_set_append ((mcommon_string_t *) string, &append); - va_start (args, format); - (void) mcommon_string_append_vprintf (&append, format, args); - va_end (args); -} - - -void -bson_string_truncate (bson_string_t *string, /* IN */ - uint32_t len) /* IN */ -{ - /* Does not preserve UTF-8 validity; deprecated. - * Although the documentation only describes truncation as decreasing the length, we have undocumented requirements: - * the string may grow or shrink, and the buffer is expected to be allocated using the same power-of-two scheme as - * when growing to append. No effect if 'string' already has the requested length, regardless of the allocation size. - * When extending string length, this implementation is guaranteed to fill with NUL bytes. Previous versions left the - * new buffer contents undefined. - */ - BSON_ASSERT_PARAM (string); - BSON_ASSERT (len < UINT32_MAX); - - uint32_t old_len = string->len; - if (len != old_len) { - uint32_t alloc = mcommon_next_power_of_two_u32 (len + 1u); - char *buffer = bson_realloc (string->str, alloc); - string->str = buffer; - string->alloc = alloc; - string->len = len; - - if (len < old_len) { - buffer[len] = '\0'; - } else { - memset (buffer + old_len, 0, len + 1 - old_len); - } - } -} - - /* *-------------------------------------------------------------------------- * diff -pruN 1.30.4-1/src/libbson/src/bson/bson-string.h 2.0.2-1/src/libbson/src/bson/bson-string.h --- 1.30.4-1/src/libbson/src/bson/bson-string.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-string.h 2025-06-19 15:42:22.000000000 +0000 @@ -29,50 +29,39 @@ BSON_BEGIN_DECLS - -typedef struct { - char *str; - uint32_t len; - uint32_t alloc; -} bson_string_t; - - -BSON_EXPORT (bson_string_t *) -bson_string_new (const char *str) BSON_GNUC_DEPRECATED; -BSON_EXPORT (char *) -bson_string_free (bson_string_t *string, bool free_segment) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_string_append (bson_string_t *string, const char *str) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_string_append_c (bson_string_t *string, char str) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_string_append_unichar (bson_string_t *string, bson_unichar_t unichar) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_string_append_printf (bson_string_t *string, const char *format, ...) BSON_GNUC_PRINTF (2, 3) BSON_GNUC_DEPRECATED; -BSON_EXPORT (void) -bson_string_truncate (bson_string_t *string, uint32_t len) BSON_GNUC_DEPRECATED; BSON_EXPORT (char *) bson_strdup (const char *str); + BSON_EXPORT (char *) bson_strdup_printf (const char *format, ...) BSON_GNUC_PRINTF (1, 2); + BSON_EXPORT (char *) bson_strdupv_printf (const char *format, va_list args) BSON_GNUC_PRINTF (1, 0); + BSON_EXPORT (char *) bson_strndup (const char *str, size_t n_bytes); + BSON_EXPORT (void) bson_strncpy (char *dst, const char *src, size_t size); + BSON_EXPORT (int) bson_vsnprintf (char *str, size_t size, const char *format, va_list ap) BSON_GNUC_PRINTF (3, 0); + BSON_EXPORT (int) bson_snprintf (char *str, size_t size, const char *format, ...) BSON_GNUC_PRINTF (3, 4); + BSON_EXPORT (void) bson_strfreev (char **strv); + BSON_EXPORT (size_t) bson_strnlen (const char *s, size_t maxlen); + BSON_EXPORT (int64_t) bson_ascii_strtoll (const char *str, char **endptr, int base); + BSON_EXPORT (int) bson_strcasecmp (const char *s1, const char *s2); + BSON_EXPORT (bool) bson_isspace (int c); diff -pruN 1.30.4-1/src/libbson/src/bson/bson-timegm.c 2.0.2-1/src/libbson/src/bson/bson-timegm.c --- 1.30.4-1/src/libbson/src/bson/bson-timegm.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-timegm.c 2025-06-19 15:42:22.000000000 +0000 @@ -18,21 +18,10 @@ #include #include /* for INT64_MAX and INT64_MIN */ -/* Unlike 's isdigit, this also works if c < 0 | c > UCHAR_MAX. */ -#define is_digit(c) ((unsigned) (c) - '0' <= 9) - #if 2 < __GNUC__ + (96 <= __GNUC_MINOR__) -#define ATTRIBUTE_CONST __attribute__ ((const)) #define ATTRIBUTE_PURE __attribute__ ((__pure__)) -#define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) #else -#define ATTRIBUTE_CONST /* empty */ -#define ATTRIBUTE_PURE /* empty */ -#define ATTRIBUTE_FORMAT(spec) /* empty */ -#endif - -#if !defined(__STDC_VERSION__) && !defined restrict -#define restrict /* empty */ +#define ATTRIBUTE_PURE /* empty */ #endif #ifdef __clang__ @@ -79,88 +68,13 @@ static int64_t const time_t_max = INT64_ #define SECSPERDAY ((int_fast32_t) SECSPERHOUR * HOURSPERDAY) #define MONSPERYEAR 12 -#define TM_SUNDAY 0 -#define TM_MONDAY 1 -#define TM_TUESDAY 2 -#define TM_WEDNESDAY 3 -#define TM_THURSDAY 4 -#define TM_FRIDAY 5 -#define TM_SATURDAY 6 - -#define TM_JANUARY 0 -#define TM_FEBRUARY 1 -#define TM_MARCH 2 -#define TM_APRIL 3 -#define TM_MAY 4 -#define TM_JUNE 5 -#define TM_JULY 6 -#define TM_AUGUST 7 -#define TM_SEPTEMBER 8 -#define TM_OCTOBER 9 -#define TM_NOVEMBER 10 -#define TM_DECEMBER 11 - #define TM_YEAR_BASE 1900 #define EPOCH_YEAR 1970 -#define EPOCH_WDAY TM_THURSDAY +#define EPOCH_WDAY 4 /* TM_THURSDAY */ #define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0)) -/* -** Since everything in isleap is modulo 400 (or a factor of 400), we know that -** isleap(y) == isleap(y % 400) -** and so -** isleap(a + b) == isleap((a + b) % 400) -** or -** isleap(a + b) == isleap(a % 400 + b % 400) -** This is true even if % means modulo rather than Fortran remainder -** (which is allowed by C89 but not C99). -** We use this to avoid addition overflow problems. -*/ - -#define isleap_sum(a, b) isleap ((a) % 400 + (b) % 400) - -#ifndef TZ_ABBR_MAX_LEN -#define TZ_ABBR_MAX_LEN 16 -#endif /* !defined TZ_ABBR_MAX_LEN */ - -#ifndef TZ_ABBR_CHAR_SET -#define TZ_ABBR_CHAR_SET "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 :+-._" -#endif /* !defined TZ_ABBR_CHAR_SET */ - -#ifndef TZ_ABBR_ERR_CHAR -#define TZ_ABBR_ERR_CHAR '_' -#endif /* !defined TZ_ABBR_ERR_CHAR */ - -#ifndef WILDABBR -/* -** Someone might make incorrect use of a time zone abbreviation: -** 1. They might reference tzname[0] before calling tzset (explicitly -** or implicitly). -** 2. They might reference tzname[1] before calling tzset (explicitly -** or implicitly). -** 3. They might reference tzname[1] after setting to a time zone -** in which Daylight Saving Time is never observed. -** 4. They might reference tzname[0] after setting to a time zone -** in which Standard Time is never observed. -** 5. They might reference tm.TM_ZONE after calling offtime. -** What's best to do in the above cases is open to debate; -** for now, we just set things up so that in any of the five cases -** WILDABBR is used. Another possibility: initialize tzname[0] to the -** string "tzname[0] used before set", and similarly for the other cases. -** And another: initialize tzname[0] to "ERA", with an explanation in the -** manual page of what this "time zone abbreviation" means (doing this so -** that tzname[0] has the "normal" length of three characters). -*/ -#define WILDABBR " " -#endif /* !defined WILDABBR */ - -#ifdef TM_ZONE -static const char wildabbr[] = WILDABBR; -static const char gmt[] = "GMT"; -#endif - struct ttinfo { /* time type information */ int_fast32_t tt_gmtoff; /* UT offset in seconds */ int tt_isdst; /* used to set tm_isdst */ @@ -206,10 +120,6 @@ struct rule { int_fast32_t r_time; /* transition time of rule */ }; -#define JULIAN_DAY 0 /* Jn - Julian day */ -#define DAY_OF_YEAR 1 /* n - day of year */ -#define MONTH_NTH_DAY_OF_WEEK 2 /* Mm.n.d - month, week, day of week */ - /* ** Prototypes for static functions. */ @@ -286,14 +196,6 @@ gmtsub (const int64_t *const timep, cons gmtload (gmtptr); } result = timesub (timep, offset, gmtptr, tmp); -#ifdef TM_ZONE - /* - ** Could get fancy here and deliver something such as - ** "UT+xxxx" or "UT-xxxx" if offset is non-zero, - ** but this is no time for a treasure hunt. - */ - tmp->TM_ZONE = offset ? wildabbr : gmtptr ? gmtptr->chars : gmt; -#endif /* defined TM_ZONE */ return result; } diff -pruN 1.30.4-1/src/libbson/src/bson/bson-types.h 2.0.2-1/src/libbson/src/bson/bson-types.h --- 1.30.4-1/src/libbson/src/bson/bson-types.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-types.h 2025-06-19 15:42:22.000000000 +0000 @@ -41,9 +41,6 @@ BSON_BEGIN_DECLS * unicode characters. When iterating UTF-8 sequences, this should * be used to avoid losing the high-bits of non-ascii characters. * - * See also: - * bson_string_append_unichar() - * *-------------------------------------------------------------------------- */ @@ -123,20 +120,11 @@ typedef struct _bson_json_opts_t bson_js * * This structure is meant to fit in two sequential 64-byte cachelines. */ -#ifdef BSON_MEMCHECK -BSON_ALIGNED_BEGIN (128) typedef struct _bson_t { - uint32_t flags; /* Internal flags for the bson_t. */ - uint32_t len; /* Length of BSON data. */ - char *canary; /* For leak checks. */ - uint8_t padding[120 - sizeof (char *)]; -} bson_t BSON_ALIGNED_END (128); -#else -BSON_ALIGNED_BEGIN (128) typedef struct _bson_t { +BSON_ALIGNED_BEGIN (BSON_ALIGN_OF_PTR) typedef struct _bson_t { uint32_t flags; /* Internal flags for the bson_t. */ uint32_t len; /* Length of BSON data. */ uint8_t padding[120]; /* Padding for stack allocation. */ -} bson_t BSON_ALIGNED_END (128); -#endif +} bson_t BSON_ALIGNED_END (BSON_ALIGN_OF_PTR); /** * BSON_INITIALIZER: @@ -148,12 +136,6 @@ BSON_ALIGNED_BEGIN (128) typedef struct * bson_t b = BSON_INITIALIZER; * ]| */ -#ifdef BSON_MEMCHECK -#define BSON_INITIALIZER \ - { \ - 3, 5, bson_malloc (1), {5}, \ - } -#else #define BSON_INITIALIZER \ { \ 3, 5, \ @@ -161,7 +143,6 @@ BSON_ALIGNED_BEGIN (128) typedef struct 5 \ } \ } -#endif BSON_STATIC_ASSERT2 (bson_t, sizeof (bson_t) == 128); @@ -204,25 +185,54 @@ typedef struct { /** - * bson_validate_flags_t: + * @brief Flags and error codes for BSON validation functions. * - * This enumeration is used for validation of BSON documents. It allows - * selective control on what you wish to validate. + * Pass these flags bits to control the behavior of the `bson_validate` family + * of functions. * - * %BSON_VALIDATE_NONE: No additional validation occurs. - * %BSON_VALIDATE_UTF8: Check that strings are valid UTF-8. - * %BSON_VALIDATE_DOLLAR_KEYS: Check that keys do not start with $. - * %BSON_VALIDATE_DOT_KEYS: Check that keys do not contain a period. - * %BSON_VALIDATE_UTF8_ALLOW_NULL: Allow NUL bytes in UTF-8 text. - * %BSON_VALIDATE_EMPTY_KEYS: Prohibit zero-length field names + * Additionally, if validation fails, then the error code set on a `bson_error_t` + * will have the value corresponding to the reason that validation failed. */ typedef enum { + /** + * @brief No special validation behavior specified. + */ BSON_VALIDATE_NONE = 0, + /** + * @brief Check that all text components of the BSON data are valid UTF-8. + * + * Note that this will also cause validation to reject valid text that contains + * a null character. This can be changed by also passing + * `BSON_VALIDATE_UTF8_ALLOW_NULL` + */ BSON_VALIDATE_UTF8 = (1 << 0), + /** + * @brief Check that element keys do not begin with an ASCII dollar `$` + */ BSON_VALIDATE_DOLLAR_KEYS = (1 << 1), + /** + * @brief Check that element keys do not contain an ASCII period `.` + */ BSON_VALIDATE_DOT_KEYS = (1 << 2), + /** + * @brief If set then it is *not* an error for a UTF-8 string to contain + * embedded null characters. + * + * This has no effect unless `BSON_VALIDATE_UTF8` is also passed. + */ BSON_VALIDATE_UTF8_ALLOW_NULL = (1 << 3), + /** + * @brief Check that no element key is a zero-length empty string. + */ BSON_VALIDATE_EMPTY_KEYS = (1 << 4), + /** + * @brief This is not a flag that controls behavior, but is instead used to indicate + * that a BSON document is corrupted in some way. This is the value that will + * appear as an error code. + * + * Passing this as a flag has no effect. + */ + BSON_VALIDATE_CORRUPT = (1 << 5), } bson_validate_flags_t; @@ -274,6 +284,7 @@ typedef enum { BSON_SUBTYPE_ENCRYPTED = 0x06, BSON_SUBTYPE_COLUMN = 0x07, BSON_SUBTYPE_SENSITIVE = 0x08, + BSON_SUBTYPE_VECTOR = 0x09, BSON_SUBTYPE_USER = 0x80, } bson_subtype_t; @@ -292,7 +303,6 @@ typedef enum { *-------------------------------------------------------------------------- */ -BSON_ALIGNED_BEGIN (8) typedef struct _bson_value_t { bson_type_t value_type; int32_t padding; @@ -346,7 +356,7 @@ typedef struct _bson_value_t { } v_symbol; bson_decimal128_t v_decimal128; } value; -} bson_value_t BSON_ALIGNED_END (8); +} bson_value_t; /** @@ -360,7 +370,6 @@ typedef struct _bson_value_t { * This structure is safe to discard on the stack. No cleanup is necessary * after using it. */ -BSON_ALIGNED_BEGIN (128) typedef struct { const uint8_t *raw; /* The raw buffer being iterated. */ uint32_t len; /* The length of raw. */ @@ -374,7 +383,7 @@ typedef struct { uint32_t next_off; /* The offset of the next field. */ uint32_t err_off; /* The offset of the error. */ bson_value_t value; /* Internal value for various state. */ -} bson_iter_t BSON_ALIGNED_END (128); +} bson_iter_t; /** @@ -407,72 +416,74 @@ typedef struct { * You may pre-maturely stop the visitation of fields by returning true in your * visitor. Returning false will continue visitation to further fields. */ -BSON_ALIGNED_BEGIN (8) typedef struct { /* run before / after descending into a document */ - bool (*visit_before) (const bson_iter_t *iter, const char *key, void *data); - bool (*visit_after) (const bson_iter_t *iter, const char *key, void *data); + bool (BSON_CALL *visit_before) (const bson_iter_t *iter, const char *key, void *data); + bool (BSON_CALL *visit_after) (const bson_iter_t *iter, const char *key, void *data); /* corrupt BSON, or unsupported type and visit_unsupported_type not set */ - void (*visit_corrupt) (const bson_iter_t *iter, void *data); + void (BSON_CALL *visit_corrupt) (const bson_iter_t *iter, void *data); /* normal bson field callbacks */ - bool (*visit_double) (const bson_iter_t *iter, const char *key, double v_double, void *data); - bool (*visit_utf8) (const bson_iter_t *iter, const char *key, size_t v_utf8_len, const char *v_utf8, void *data); - bool (*visit_document) (const bson_iter_t *iter, const char *key, const bson_t *v_document, void *data); - bool (*visit_array) (const bson_iter_t *iter, const char *key, const bson_t *v_array, void *data); - bool (*visit_binary) (const bson_iter_t *iter, - const char *key, - bson_subtype_t v_subtype, - size_t v_binary_len, - const uint8_t *v_binary, - void *data); + bool (BSON_CALL *visit_double) (const bson_iter_t *iter, const char *key, double v_double, void *data); + bool (BSON_CALL *visit_utf8) ( + const bson_iter_t *iter, const char *key, size_t v_utf8_len, const char *v_utf8, void *data); + bool (BSON_CALL *visit_document) (const bson_iter_t *iter, const char *key, const bson_t *v_document, void *data); + bool (BSON_CALL *visit_array) (const bson_iter_t *iter, const char *key, const bson_t *v_array, void *data); + bool (BSON_CALL *visit_binary) (const bson_iter_t *iter, + const char *key, + bson_subtype_t v_subtype, + size_t v_binary_len, + const uint8_t *v_binary, + void *data); /* normal field with deprecated "Undefined" BSON type */ - bool (*visit_undefined) (const bson_iter_t *iter, const char *key, void *data); - bool (*visit_oid) (const bson_iter_t *iter, const char *key, const bson_oid_t *v_oid, void *data); - bool (*visit_bool) (const bson_iter_t *iter, const char *key, bool v_bool, void *data); - bool (*visit_date_time) (const bson_iter_t *iter, const char *key, int64_t msec_since_epoch, void *data); - bool (*visit_null) (const bson_iter_t *iter, const char *key, void *data); - bool (*visit_regex) ( + bool (BSON_CALL *visit_undefined) (const bson_iter_t *iter, const char *key, void *data); + bool (BSON_CALL *visit_oid) (const bson_iter_t *iter, const char *key, const bson_oid_t *v_oid, void *data); + bool (BSON_CALL *visit_bool) (const bson_iter_t *iter, const char *key, bool v_bool, void *data); + bool (BSON_CALL *visit_date_time) (const bson_iter_t *iter, const char *key, int64_t msec_since_epoch, void *data); + bool (BSON_CALL *visit_null) (const bson_iter_t *iter, const char *key, void *data); + bool (BSON_CALL *visit_regex) ( const bson_iter_t *iter, const char *key, const char *v_regex, const char *v_options, void *data); - bool (*visit_dbpointer) (const bson_iter_t *iter, - const char *key, - size_t v_collection_len, - const char *v_collection, - const bson_oid_t *v_oid, - void *data); - bool (*visit_code) (const bson_iter_t *iter, const char *key, size_t v_code_len, const char *v_code, void *data); - bool (*visit_symbol) ( + bool (BSON_CALL *visit_dbpointer) (const bson_iter_t *iter, + const char *key, + size_t v_collection_len, + const char *v_collection, + const bson_oid_t *v_oid, + void *data); + bool (BSON_CALL *visit_code) ( + const bson_iter_t *iter, const char *key, size_t v_code_len, const char *v_code, void *data); + bool (BSON_CALL *visit_symbol) ( const bson_iter_t *iter, const char *key, size_t v_symbol_len, const char *v_symbol, void *data); - bool (*visit_codewscope) (const bson_iter_t *iter, - const char *key, - size_t v_code_len, - const char *v_code, - const bson_t *v_scope, - void *data); - bool (*visit_int32) (const bson_iter_t *iter, const char *key, int32_t v_int32, void *data); - bool (*visit_timestamp) ( + bool (BSON_CALL *visit_codewscope) (const bson_iter_t *iter, + const char *key, + size_t v_code_len, + const char *v_code, + const bson_t *v_scope, + void *data); + bool (BSON_CALL *visit_int32) (const bson_iter_t *iter, const char *key, int32_t v_int32, void *data); + bool (BSON_CALL *visit_timestamp) ( const bson_iter_t *iter, const char *key, uint32_t v_timestamp, uint32_t v_increment, void *data); - bool (*visit_int64) (const bson_iter_t *iter, const char *key, int64_t v_int64, void *data); - bool (*visit_maxkey) (const bson_iter_t *iter, const char *key, void *data); - bool (*visit_minkey) (const bson_iter_t *iter, const char *key, void *data); + bool (BSON_CALL *visit_int64) (const bson_iter_t *iter, const char *key, int64_t v_int64, void *data); + bool (BSON_CALL *visit_maxkey) (const bson_iter_t *iter, const char *key, void *data); + bool (BSON_CALL *visit_minkey) (const bson_iter_t *iter, const char *key, void *data); /* if set, called instead of visit_corrupt when an apparently valid BSON * includes an unrecognized field type (reading future version of BSON) */ - void (*visit_unsupported_type) (const bson_iter_t *iter, const char *key, uint32_t type_code, void *data); - bool (*visit_decimal128) (const bson_iter_t *iter, - const char *key, - const bson_decimal128_t *v_decimal128, - void *data); + void (BSON_CALL *visit_unsupported_type) (const bson_iter_t *iter, const char *key, uint32_t type_code, void *data); + bool (BSON_CALL *visit_decimal128) (const bson_iter_t *iter, + const char *key, + const bson_decimal128_t *v_decimal128, + void *data); void *padding[7]; -} bson_visitor_t BSON_ALIGNED_END (8); +} bson_visitor_t; -#define BSON_ERROR_BUFFER_SIZE 504 +#define BSON_ERROR_BUFFER_SIZE 503 -BSON_ALIGNED_BEGIN (8) +BSON_ALIGNED_BEGIN (BSON_ALIGN_OF_PTR) // Aligned for backwards-compatibility. typedef struct _bson_error_t { uint32_t domain; uint32_t code; char message[BSON_ERROR_BUFFER_SIZE]; -} bson_error_t BSON_ALIGNED_END (8); + uint8_t reserved; // For internal use only! +} bson_error_t BSON_ALIGNED_END (BSON_ALIGN_OF_PTR); BSON_STATIC_ASSERT2 (error_t, sizeof (bson_error_t) == 512); diff -pruN 1.30.4-1/src/libbson/src/bson/bson-utf8.c 2.0.2-1/src/libbson/src/bson/bson-utf8.c --- 1.30.4-1/src/libbson/src/bson/bson-utf8.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-utf8.c 2025-06-19 15:42:22.000000000 +0000 @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include @@ -226,7 +226,7 @@ bson_utf8_escape_for_json (const char *u return NULL; } } else { - if (mcommon_in_range_signed (uint32_t, utf8_len) && (uint32_t) utf8_len < UINT32_MAX) { + if (mlib_in_range (uint32_t, utf8_len) && (uint32_t) utf8_len < UINT32_MAX) { len32 = utf8_len; allow_nul = true; } else { diff -pruN 1.30.4-1/src/libbson/src/bson/bson-value.c 2.0.2-1/src/libbson/src/bson/bson-value.c --- 1.30.4-1/src/libbson/src/bson/bson-value.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-value.c 2025-06-19 15:42:22.000000000 +0000 @@ -19,7 +19,7 @@ #include #include #include -#include +#include void @@ -36,7 +36,7 @@ bson_value_copy (const bson_value_t *src dst->value.v_double = src->value.v_double; break; case BSON_TYPE_UTF8: - BSON_ASSERT (mcommon_in_range_size_t_unsigned (src->value.v_utf8.len)); + BSON_ASSERT (mlib_in_range (size_t, src->value.v_utf8.len)); size_t utf8_len_sz = (size_t) src->value.v_utf8.len; if (utf8_len_sz == SIZE_MAX) { // If the string is at maximum length, do not NULL terminate. The source necessarily cannot fit it. @@ -79,7 +79,7 @@ bson_value_copy (const bson_value_t *src dst->value.v_regex.options = bson_strdup (src->value.v_regex.options); break; case BSON_TYPE_DBPOINTER: - BSON_ASSERT (mcommon_in_range_size_t_unsigned (src->value.v_dbpointer.collection_len)); + BSON_ASSERT (mlib_in_range (size_t, src->value.v_dbpointer.collection_len)); size_t dbpointer_len_sz = (size_t) src->value.v_dbpointer.collection_len; BSON_ASSERT (dbpointer_len_sz <= SIZE_MAX - 1); dst->value.v_dbpointer.collection_len = src->value.v_dbpointer.collection_len; @@ -90,7 +90,7 @@ bson_value_copy (const bson_value_t *src bson_oid_copy (&src->value.v_dbpointer.oid, &dst->value.v_dbpointer.oid); break; case BSON_TYPE_CODE: - BSON_ASSERT (mcommon_in_range_size_t_unsigned (src->value.v_code.code_len)); + BSON_ASSERT (mlib_in_range (size_t, src->value.v_code.code_len)); size_t code_len_sz = (size_t) src->value.v_code.code_len; BSON_ASSERT (code_len_sz <= SIZE_MAX - 1); dst->value.v_code.code_len = src->value.v_code.code_len; @@ -99,7 +99,7 @@ bson_value_copy (const bson_value_t *src dst->value.v_code.code[dst->value.v_code.code_len] = '\0'; break; case BSON_TYPE_SYMBOL: - BSON_ASSERT (mcommon_in_range_size_t_unsigned (src->value.v_symbol.len)); + BSON_ASSERT (mlib_in_range (size_t, src->value.v_symbol.len)); size_t symbol_len_sz = (size_t) src->value.v_symbol.len; BSON_ASSERT (symbol_len_sz <= SIZE_MAX - 1); dst->value.v_symbol.len = src->value.v_symbol.len; @@ -108,7 +108,7 @@ bson_value_copy (const bson_value_t *src dst->value.v_symbol.symbol[dst->value.v_symbol.len] = '\0'; break; case BSON_TYPE_CODEWSCOPE: - BSON_ASSERT (mcommon_in_range_size_t_unsigned (src->value.v_codewscope.code_len)); + BSON_ASSERT (mlib_in_range (size_t, src->value.v_codewscope.code_len)); size_t codewscope_len_sz = (size_t) src->value.v_codewscope.code_len; BSON_ASSERT (codewscope_len_sz <= SIZE_MAX - 1); dst->value.v_codewscope.code_len = src->value.v_codewscope.code_len; diff -pruN 1.30.4-1/src/libbson/src/bson/bson-vector-private.h 2.0.2-1/src/libbson/src/bson/bson-vector-private.h --- 1.30.4-1/src/libbson/src/bson/bson-vector-private.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-vector-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,60 @@ +/* + * Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#ifndef BSON_VECTOR_PRIVATE_H +#define BSON_VECTOR_PRIVATE_H + +#include +#include + +BSON_BEGIN_DECLS + + +typedef enum { + BSON_VECTOR_ELEMENT_SIGNED_INT = 0, + BSON_VECTOR_ELEMENT_UNSIGNED_INT = 1, + BSON_VECTOR_ELEMENT_FLOAT = 2, +} bson_vector_element_type_t; + +typedef enum { + BSON_VECTOR_ELEMENT_1_BIT = 0, + BSON_VECTOR_ELEMENT_8_BITS = 3, + BSON_VECTOR_ELEMENT_32_BITS = 7, +} bson_vector_element_size_t; + + +static BSON_INLINE uint8_t +bson_vector_header_byte_0 (bson_vector_element_type_t element_type, bson_vector_element_size_t element_size) +{ + BSON_ASSERT ((unsigned) element_type <= 0x0f); + BSON_ASSERT ((unsigned) element_size <= 0x0f); + return (uint8_t) (((unsigned) element_type << 4) | (unsigned) element_size); +} + +// See also `bson_vector_padding_from_header_byte_1` defined in for use by public inline functions. +static BSON_INLINE uint8_t +bson_vector_header_byte_1 (size_t padding) +{ + BSON_ASSERT (padding <= 7); + return (uint8_t) padding; +} + + +BSON_END_DECLS + +#endif /* BSON_VECTOR_PRIVATE_H */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson-vector.c 2.0.2-1/src/libbson/src/bson/bson-vector.c --- 1.30.4-1/src/libbson/src/bson/bson-vector.c 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-vector.c 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,681 @@ +/* + * Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include +#include + + +static BSON_INLINE bool +bson_vector_binary_header_impl_init (bson_vector_binary_header_impl_t *header_out, + const uint8_t *binary_data, + uint32_t binary_data_len) +{ + if (binary_data_len >= BSON_VECTOR_HEADER_LEN) { + memcpy (header_out->bytes, binary_data, BSON_VECTOR_HEADER_LEN); + return true; + } else { + return false; + } +} + +static BSON_INLINE bool +bson_vector_int8_validate (bson_vector_binary_header_impl_t header) +{ + return header.bytes[0] == bson_vector_header_byte_0 (BSON_VECTOR_ELEMENT_SIGNED_INT, BSON_VECTOR_ELEMENT_8_BITS) && + header.bytes[1] == bson_vector_header_byte_1 (0); +} + +static BSON_INLINE bool +bson_vector_float32_validate (bson_vector_binary_header_impl_t header, uint32_t binary_data_len) +{ + return (binary_data_len - BSON_VECTOR_HEADER_LEN) % sizeof (float) == 0 && + header.bytes[0] == bson_vector_header_byte_0 (BSON_VECTOR_ELEMENT_FLOAT, BSON_VECTOR_ELEMENT_32_BITS) && + header.bytes[1] == bson_vector_header_byte_1 (0); +} + +static BSON_INLINE bool +bson_vector_packed_bit_validate (bson_vector_binary_header_impl_t header, + const uint8_t *binary_data, + uint32_t binary_data_len) +{ + if (header.bytes[0] == bson_vector_header_byte_0 (BSON_VECTOR_ELEMENT_UNSIGNED_INT, BSON_VECTOR_ELEMENT_1_BIT)) { + size_t padding = bson_vector_padding_from_header_byte_1 (header.bytes[1]); + if (header.bytes[1] != bson_vector_header_byte_1 (padding)) { + return false; + } + uint32_t vector_data_len = binary_data_len - BSON_VECTOR_HEADER_LEN; + if (vector_data_len == 0) { + return padding == 0; + } else { + // We need to read the last byte of the binary block to validate that unused bits are zero. + uint8_t last_data_byte = binary_data[binary_data_len - 1]; + uint8_t mask_of_unused_bits = (uint8_t) ((1u << padding) - 1u); + return (last_data_byte & mask_of_unused_bits) == 0; + } + } else { + return false; + } +} + + +bool +bson_vector_int8_view_init (bson_vector_int8_view_t *view_out, uint8_t *binary_data, uint32_t binary_data_len) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (binary_data); + bson_vector_binary_header_impl_t header; + if (bson_vector_binary_header_impl_init (&header, binary_data, binary_data_len) && + bson_vector_int8_validate (header)) { + if (view_out) { + *view_out = (bson_vector_int8_view_t){ + .binary.data = binary_data, .binary.data_len = binary_data_len, .binary.header_copy = header}; + } + return true; + } else { + return false; + } +} + +bool +bson_vector_int8_const_view_init (bson_vector_int8_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (binary_data); + bson_vector_binary_header_impl_t header; + if (bson_vector_binary_header_impl_init (&header, binary_data, binary_data_len) && + bson_vector_int8_validate (header)) { + if (view_out) { + *view_out = (bson_vector_int8_const_view_t){ + .binary.data = binary_data, .binary.data_len = binary_data_len, .binary.header_copy = header}; + } + return true; + } else { + return false; + } +} + +bool +bson_vector_float32_view_init (bson_vector_float32_view_t *view_out, uint8_t *binary_data, uint32_t binary_data_len) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (binary_data); + bson_vector_binary_header_impl_t header; + if (bson_vector_binary_header_impl_init (&header, binary_data, binary_data_len) && + bson_vector_float32_validate (header, binary_data_len)) { + if (view_out) { + *view_out = (bson_vector_float32_view_t){ + .binary.data = binary_data, .binary.data_len = binary_data_len, .binary.header_copy = header}; + } + return true; + } else { + return false; + } +} + +bool +bson_vector_float32_const_view_init (bson_vector_float32_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (binary_data); + bson_vector_binary_header_impl_t header; + if (bson_vector_binary_header_impl_init (&header, binary_data, binary_data_len) && + bson_vector_float32_validate (header, binary_data_len)) { + if (view_out) { + *view_out = (bson_vector_float32_const_view_t){ + .binary.data = binary_data, .binary.data_len = binary_data_len, .binary.header_copy = header}; + } + return true; + } else { + return false; + } +} + +bool +bson_vector_packed_bit_view_init (bson_vector_packed_bit_view_t *view_out, + uint8_t *binary_data, + uint32_t binary_data_len) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (binary_data); + bson_vector_binary_header_impl_t header; + if (bson_vector_binary_header_impl_init (&header, binary_data, binary_data_len) && + bson_vector_packed_bit_validate (header, binary_data, binary_data_len)) { + if (view_out) { + *view_out = (bson_vector_packed_bit_view_t){ + .binary.data = binary_data, .binary.data_len = binary_data_len, .binary.header_copy = header}; + } + return true; + } else { + return false; + } +} + +bool +bson_vector_packed_bit_const_view_init (bson_vector_packed_bit_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (binary_data); + bson_vector_binary_header_impl_t header; + if (bson_vector_binary_header_impl_init (&header, binary_data, binary_data_len) && + bson_vector_packed_bit_validate (header, binary_data, binary_data_len)) { + if (view_out) { + *view_out = (bson_vector_packed_bit_const_view_t){ + .binary.data = binary_data, .binary.data_len = binary_data_len, .binary.header_copy = header}; + } + return true; + } else { + return false; + } +} + + +bool +bson_vector_int8_view_from_iter (bson_vector_int8_view_t *view_out, bson_iter_t *iter) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (iter); + if (BSON_ITER_HOLDS_BINARY (iter)) { + uint32_t binary_len; + uint8_t *binary; + bson_iter_overwrite_binary (iter, BSON_SUBTYPE_VECTOR, &binary_len, &binary); + return binary && bson_vector_int8_view_init (view_out, binary, binary_len); + } else { + return false; + } +} + +bool +bson_vector_int8_const_view_from_iter (bson_vector_int8_const_view_t *view_out, const bson_iter_t *iter) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (iter); + if (BSON_ITER_HOLDS_BINARY (iter)) { + bson_subtype_t subtype; + uint32_t binary_len; + const uint8_t *binary; + bson_iter_binary (iter, &subtype, &binary_len, &binary); + return binary && subtype == BSON_SUBTYPE_VECTOR && + bson_vector_int8_const_view_init (view_out, binary, binary_len); + } else { + return false; + } +} + +bool +bson_vector_float32_view_from_iter (bson_vector_float32_view_t *view_out, bson_iter_t *iter) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (iter); + if (BSON_ITER_HOLDS_BINARY (iter)) { + uint32_t binary_len; + uint8_t *binary; + bson_iter_overwrite_binary (iter, BSON_SUBTYPE_VECTOR, &binary_len, &binary); + return binary && bson_vector_float32_view_init (view_out, binary, binary_len); + } else { + return false; + } +} + +bool +bson_vector_float32_const_view_from_iter (bson_vector_float32_const_view_t *view_out, const bson_iter_t *iter) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (iter); + if (BSON_ITER_HOLDS_BINARY (iter)) { + bson_subtype_t subtype; + uint32_t binary_len; + const uint8_t *binary; + bson_iter_binary (iter, &subtype, &binary_len, &binary); + return binary && subtype == BSON_SUBTYPE_VECTOR && + bson_vector_float32_const_view_init (view_out, binary, binary_len); + } else { + return false; + } +} + +bool +bson_vector_packed_bit_view_from_iter (bson_vector_packed_bit_view_t *view_out, bson_iter_t *iter) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (iter); + if (BSON_ITER_HOLDS_BINARY (iter)) { + uint32_t binary_len; + uint8_t *binary; + bson_iter_overwrite_binary (iter, BSON_SUBTYPE_VECTOR, &binary_len, &binary); + return binary && bson_vector_packed_bit_view_init (view_out, binary, binary_len); + } else { + return false; + } +} + +bool +bson_vector_packed_bit_const_view_from_iter (bson_vector_packed_bit_const_view_t *view_out, const bson_iter_t *iter) +{ + BSON_OPTIONAL_PARAM (view_out); + BSON_ASSERT_PARAM (iter); + if (BSON_ITER_HOLDS_BINARY (iter)) { + bson_subtype_t subtype; + uint32_t binary_len; + const uint8_t *binary; + bson_iter_binary (iter, &subtype, &binary_len, &binary); + return binary && subtype == BSON_SUBTYPE_VECTOR && + bson_vector_packed_bit_const_view_init (view_out, binary, binary_len); + } else { + return false; + } +} + + +bool +bson_append_vector_int8_uninit ( + bson_t *bson, const char *key, int key_length, size_t element_count, bson_vector_int8_view_t *view_out) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (view_out); + + uint32_t length = bson_vector_int8_binary_data_length (element_count); + if (length < BSON_VECTOR_HEADER_LEN) { + return false; + } + uint8_t *binary; + if (bson_append_binary_uninit (bson, key, key_length, BSON_SUBTYPE_VECTOR, &binary, length)) { + bson_vector_binary_header_impl_t header = { + .bytes[0] = bson_vector_header_byte_0 (BSON_VECTOR_ELEMENT_SIGNED_INT, BSON_VECTOR_ELEMENT_8_BITS), + .bytes[1] = bson_vector_header_byte_1 (0)}; + memcpy (binary, header.bytes, BSON_VECTOR_HEADER_LEN); + *view_out = + (bson_vector_int8_view_t){.binary.data = binary, .binary.data_len = length, .binary.header_copy = header}; + return true; + } else { + return false; + } +} + +bool +bson_append_vector_float32_uninit ( + bson_t *bson, const char *key, int key_length, size_t element_count, bson_vector_float32_view_t *view_out) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (view_out); + + uint32_t length = bson_vector_float32_binary_data_length (element_count); + if (length < BSON_VECTOR_HEADER_LEN) { + return false; + } + uint8_t *binary; + if (bson_append_binary_uninit (bson, key, key_length, BSON_SUBTYPE_VECTOR, &binary, length)) { + bson_vector_binary_header_impl_t header = { + .bytes[0] = bson_vector_header_byte_0 (BSON_VECTOR_ELEMENT_FLOAT, BSON_VECTOR_ELEMENT_32_BITS), + .bytes[1] = bson_vector_header_byte_1 (0)}; + memcpy (binary, header.bytes, BSON_VECTOR_HEADER_LEN); + *view_out = + (bson_vector_float32_view_t){.binary.data = binary, .binary.data_len = length, .binary.header_copy = header}; + return true; + } else { + return false; + } +} + +bool +bson_append_vector_packed_bit_uninit ( + bson_t *bson, const char *key, int key_length, size_t element_count, bson_vector_packed_bit_view_t *view_out) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (view_out); + + uint32_t length = bson_vector_packed_bit_binary_data_length (element_count); + if (length < BSON_VECTOR_HEADER_LEN) { + return false; + } + uint8_t *binary; + if (bson_append_binary_uninit (bson, key, key_length, BSON_SUBTYPE_VECTOR, &binary, length)) { + size_t padding = (size_t) 7 & -element_count; + bson_vector_binary_header_impl_t header = { + .bytes[0] = bson_vector_header_byte_0 (BSON_VECTOR_ELEMENT_UNSIGNED_INT, BSON_VECTOR_ELEMENT_1_BIT), + .bytes[1] = bson_vector_header_byte_1 (padding)}; + memcpy (binary, header.bytes, BSON_VECTOR_HEADER_LEN); + if (element_count > 0 && padding > 0) { + // We must explicitly zero bits in the final byte that aren't part of any element. + // No reason to read-modify-write here, it's better to write the whole byte. + binary[length - 1u] = 0u; + } + *view_out = (bson_vector_packed_bit_view_t){ + .binary.data = binary, .binary.data_len = length, .binary.header_copy = header}; + return true; + } else { + return false; + } +} + +static bool +bson_vector_from_array_expect_key (const bson_iter_t *iter, uint32_t numeric_key, bson_error_t *error) +{ + char buffer[16]; + const char *key; + bson_uint32_to_string (numeric_key, &key, buffer, sizeof buffer); + if (0 == strcmp (key, bson_iter_key (iter))) { + return true; + } else { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_KEY, + "expected BSON array key '%s', found key '%s'", + key, + bson_iter_key (iter)); + return false; + } +} + +static void +bson_vector_set_error_max_size (bson_error_t *error) +{ + bson_set_error ( + error, BSON_ERROR_VECTOR, BSON_VECTOR_ERROR_MAX_SIZE, "maximum BSON document size would be exceeded"); +} + +bool +bson_append_vector_int8_from_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, bson_error_t *error) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + BSON_ASSERT_PARAM (iter); + + uint32_t element_count = 0; + { + bson_iter_t validation_iter = *iter; + while (bson_iter_next (&validation_iter)) { + if (!bson_vector_from_array_expect_key (&validation_iter, element_count, error)) { + return false; + } + if (!BSON_ITER_HOLDS_INT (&validation_iter)) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE, + "expected int32 or int64 in BSON array key '%s', found item type 0x%02X", + bson_iter_key (&validation_iter), + (unsigned) bson_iter_type (&validation_iter)); + return false; + } + int64_t element_as_int64 = bson_iter_as_int64 (&validation_iter); + if (element_as_int64 < INT8_MIN || element_as_int64 > INT8_MAX) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_VALUE, + "BSON array key '%s' value %" PRId64 " is out of range for vector of int8", + bson_iter_key (&validation_iter), + element_as_int64); + return false; + } + element_count++; + } + } + + bson_vector_int8_view_t view; + if (!bson_append_vector_int8_uninit (bson, key, key_length, element_count, &view)) { + bson_vector_set_error_max_size (error); + return false; + } + bson_iter_t copy_iter = *iter; + for (uint32_t i = 0; i < element_count; i++) { + BSON_ASSERT (bson_iter_next (©_iter)); + int8_t element = (int8_t) bson_iter_as_int64 (©_iter); + BSON_ASSERT (bson_vector_int8_view_write (view, &element, 1, i)); + } + return true; +} + +bool +bson_append_vector_float32_from_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, bson_error_t *error) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + BSON_ASSERT_PARAM (iter); + + uint32_t element_count = 0; + { + bson_iter_t validation_iter = *iter; + while (bson_iter_next (&validation_iter)) { + if (!bson_vector_from_array_expect_key (&validation_iter, element_count, error)) { + return false; + } + if (!BSON_ITER_HOLDS_DOUBLE (&validation_iter)) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE, + "expected 'double' number type in BSON array key '%s', found item type 0x%02X", + bson_iter_key (&validation_iter), + (unsigned) bson_iter_type (&validation_iter)); + return false; + } + element_count++; + } + } + + bson_vector_float32_view_t view; + if (!bson_append_vector_float32_uninit (bson, key, key_length, element_count, &view)) { + bson_vector_set_error_max_size (error); + return false; + } + bson_iter_t copy_iter = *iter; + for (uint32_t i = 0; i < element_count; i++) { + BSON_ASSERT (bson_iter_next (©_iter)); + float element = (float) bson_iter_double (©_iter); + BSON_ASSERT (bson_vector_float32_view_write (view, &element, 1, i)); + } + return true; +} + +bool +bson_append_vector_packed_bit_from_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, bson_error_t *error) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + BSON_ASSERT_PARAM (iter); + + uint32_t element_count = 0; + { + bson_iter_t validation_iter = *iter; + while (bson_iter_next (&validation_iter)) { + if (!bson_vector_from_array_expect_key (&validation_iter, element_count, error)) { + return false; + } + if (!BSON_ITER_HOLDS_INT (&validation_iter) && !BSON_ITER_HOLDS_BOOL (&validation_iter)) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE, + "expected int32, int64, or bool in BSON array key '%s', found item type 0x%02X", + bson_iter_key (&validation_iter), + (unsigned) bson_iter_type (&validation_iter)); + return false; + } + int64_t element_as_int64 = bson_iter_as_int64 (&validation_iter); + if (element_as_int64 < 0 || element_as_int64 > 1) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_VALUE, + "BSON array key '%s' value %" PRId64 " is out of range for vector of packed_bit", + bson_iter_key (&validation_iter), + element_as_int64); + return false; + } + element_count++; + } + } + + bson_vector_packed_bit_view_t view; + if (!bson_append_vector_packed_bit_uninit (bson, key, key_length, element_count, &view)) { + bson_vector_set_error_max_size (error); + return false; + } + bson_iter_t copy_iter = *iter; + for (uint32_t i = 0; i < element_count; i++) { + BSON_ASSERT (bson_iter_next (©_iter)); + bool element_as_bool = (bool) bson_iter_as_int64 (©_iter); + BSON_ASSERT (bson_vector_packed_bit_view_pack_bool (view, &element_as_bool, 1, i)); + } + return true; +} + + +bool +bson_array_builder_append_vector_int8_elements (bson_array_builder_t *builder, bson_vector_int8_const_view_t view) +{ + BSON_ASSERT_PARAM (builder); + size_t length = bson_vector_int8_const_view_length (view); + for (size_t i = 0; i < length; i++) { + // Note, the zero initializer is only needed due to a false positive -Wmaybe-uninitialized warning in uncommon + // configurations where the compiler does not have visibility into memcpy(). + int8_t element = 0; + BSON_ASSERT (bson_vector_int8_const_view_read (view, &element, 1, i)); + if (!bson_array_builder_append_int32 (builder, (int32_t) element)) { + return false; + } + } + return true; +} + +bool +bson_array_builder_append_vector_float32_elements (bson_array_builder_t *builder, bson_vector_float32_const_view_t view) +{ + BSON_ASSERT_PARAM (builder); + size_t length = bson_vector_float32_const_view_length (view); + for (size_t i = 0; i < length; i++) { + float element; + BSON_ASSERT (bson_vector_float32_const_view_read (view, &element, 1, i)); + if (!bson_array_builder_append_double (builder, (double) element)) { + return false; + } + } + return true; +} + +bool +bson_array_builder_append_vector_packed_bit_elements (bson_array_builder_t *builder, + bson_vector_packed_bit_const_view_t view) +{ + BSON_ASSERT_PARAM (builder); + size_t length = bson_vector_packed_bit_const_view_length (view); + for (size_t i = 0; i < length; i++) { + bool element; + BSON_ASSERT (bson_vector_packed_bit_const_view_unpack_bool (view, &element, 1, i)); + if (!bson_array_builder_append_int32 (builder, element ? 1 : 0)) { + return false; + } + } + return true; +} + + +bool +bson_array_builder_append_vector_elements (bson_array_builder_t *builder, const bson_iter_t *iter) +{ + BSON_ASSERT_PARAM (builder); + BSON_ASSERT_PARAM (iter); + { + bson_vector_int8_const_view_t view; + if (bson_vector_int8_const_view_from_iter (&view, iter)) { + return bson_array_builder_append_vector_int8_elements (builder, view); + } + } + { + bson_vector_float32_const_view_t view; + if (bson_vector_float32_const_view_from_iter (&view, iter)) { + return bson_array_builder_append_vector_float32_elements (builder, view); + } + } + { + bson_vector_packed_bit_const_view_t view; + if (bson_vector_packed_bit_const_view_from_iter (&view, iter)) { + return bson_array_builder_append_vector_packed_bit_elements (builder, view); + } + } + return false; +} + + +bool +bson_append_array_from_vector_int8 (bson_t *bson, const char *key, int key_length, bson_vector_int8_const_view_t view) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + bson_array_builder_t *child; + if (bson_append_array_builder_begin (bson, key, key_length, &child)) { + bool ok = bson_array_builder_append_vector_int8_elements (child, view); + return bson_append_array_builder_end (bson, child) && ok; + } else { + return false; + } +} + +bool +bson_append_array_from_vector_float32 (bson_t *bson, + const char *key, + int key_length, + bson_vector_float32_const_view_t view) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + bson_array_builder_t *child; + if (bson_append_array_builder_begin (bson, key, key_length, &child)) { + bool ok = bson_array_builder_append_vector_float32_elements (child, view); + return bson_append_array_builder_end (bson, child) && ok; + } else { + return false; + } +} + +bool +bson_append_array_from_vector_packed_bit (bson_t *bson, + const char *key, + int key_length, + bson_vector_packed_bit_const_view_t view) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + bson_array_builder_t *child; + if (bson_append_array_builder_begin (bson, key, key_length, &child)) { + bool ok = bson_array_builder_append_vector_packed_bit_elements (child, view); + return bson_append_array_builder_end (bson, child) && ok; + } else { + return false; + } +} + + +bool +bson_append_array_from_vector (bson_t *bson, const char *key, int key_length, const bson_iter_t *iter) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + BSON_ASSERT_PARAM (iter); + bson_array_builder_t *child; + if (bson_append_array_builder_begin (bson, key, key_length, &child)) { + bool ok = bson_array_builder_append_vector_elements (child, iter); + return bson_append_array_builder_end (bson, child) && ok; + } else { + return false; + } +} diff -pruN 1.30.4-1/src/libbson/src/bson/bson-vector.h 2.0.2-1/src/libbson/src/bson/bson-vector.h --- 1.30.4-1/src/libbson/src/bson/bson-vector.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson-vector.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,613 @@ +/* + * Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#ifndef BSON_VECTOR_H +#define BSON_VECTOR_H + +#include +#include +#include + +BSON_BEGIN_DECLS + + +// Length of the required header for BSON_SUBTYPE_VECTOR, in bytes +#define BSON_VECTOR_HEADER_LEN 2 + +// Forward declaration (typedef bson_array_builder_t in bson.h) +struct _bson_array_builder_t; + +/** @brief Error codes for domain BSON_ERROR_VECTOR */ +typedef enum { + BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE = 1, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_VALUE, + BSON_VECTOR_ERROR_ARRAY_KEY, + BSON_VECTOR_ERROR_MAX_SIZE, +} bson_vector_error_code_t; + + +/** @brief Implementation detail. A copy of the BSON_SUBTYPE_VECTOR header, suitable for pass-by-value. */ +typedef struct bson_vector_binary_header_impl_t { + uint8_t bytes[BSON_VECTOR_HEADER_LEN]; +} bson_vector_binary_header_impl_t; + +/** @brief Implementation detail. A reference to non-owned const BSON Binary data of subtype BSON_SUBTYPE_VECTOR */ +typedef struct bson_vector_binary_const_view_impl_t { + const uint8_t *data; + uint32_t data_len; + bson_vector_binary_header_impl_t header_copy; +} bson_vector_binary_const_view_impl_t; + +/** @brief Implementation detail. A reference to non-owned BSON Binary data of subtype BSON_SUBTYPE_VECTOR */ +typedef struct bson_vector_binary_view_impl_t { + uint8_t *data; + uint32_t data_len; + bson_vector_binary_header_impl_t header_copy; +} bson_vector_binary_view_impl_t; + +/** @brief Implementation detail. Obtain a const reference from a non-const reference without re-validating. */ +static BSON_INLINE bson_vector_binary_const_view_impl_t +bson_vector_binary_view_impl_as_const (bson_vector_binary_view_impl_t view) +{ + bson_vector_binary_const_view_impl_t result; + result.data = view.data; + result.data_len = view.data_len; + result.header_copy = view.header_copy; + return result; +} + + +/** @brief A reference to non-owned BSON Binary data holding a valid Vector of int8 element type */ +typedef struct bson_vector_int8_view_t { + bson_vector_binary_view_impl_t binary; +} bson_vector_int8_view_t; + +/** @brief A reference to non-owned const BSON Binary data holding a valid Vector of int8 element type */ +typedef struct bson_vector_int8_const_view_t { + bson_vector_binary_const_view_impl_t binary; +} bson_vector_int8_const_view_t; + +/** @brief A reference to non-owned BSON Binary data holding a valid Vector of float32 element type */ +typedef struct bson_vector_float32_view_t { + bson_vector_binary_view_impl_t binary; +} bson_vector_float32_view_t; + +/** @brief A reference to non-owned const BSON Binary data holding a valid Vector of float32 element type */ +typedef struct bson_vector_float32_const_view_t { + bson_vector_binary_const_view_impl_t binary; +} bson_vector_float32_const_view_t; + +/** @brief A reference to non-owned BSON Binary data holding a valid Vector of packed_bit */ +typedef struct bson_vector_packed_bit_view_t { + bson_vector_binary_view_impl_t binary; +} bson_vector_packed_bit_view_t; + +/** @brief A reference to non-owned const BSON Binary data holding a valid Vector of packed_bit */ +typedef struct bson_vector_packed_bit_const_view_t { + bson_vector_binary_const_view_impl_t binary; +} bson_vector_packed_bit_const_view_t; + + +static BSON_INLINE bson_vector_int8_const_view_t +bson_vector_int8_view_as_const (bson_vector_int8_view_t view) +{ + bson_vector_int8_const_view_t result; + result.binary = bson_vector_binary_view_impl_as_const (view.binary); + return result; +} + +static BSON_INLINE bson_vector_float32_const_view_t +bson_vector_float32_view_as_const (bson_vector_float32_view_t view) +{ + bson_vector_float32_const_view_t result; + result.binary = bson_vector_binary_view_impl_as_const (view.binary); + return result; +} + +static BSON_INLINE bson_vector_packed_bit_const_view_t +bson_vector_packed_bit_view_as_const (bson_vector_packed_bit_view_t view) +{ + bson_vector_packed_bit_const_view_t result; + result.binary = bson_vector_binary_view_impl_as_const (view.binary); + return result; +} + + +BSON_EXPORT (bool) +bson_vector_int8_view_init (bson_vector_int8_view_t *view_out, uint8_t *binary_data, uint32_t binary_data_len); + +BSON_EXPORT (bool) +bson_vector_int8_const_view_init (bson_vector_int8_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len); + +BSON_EXPORT (bool) +bson_vector_float32_view_init (bson_vector_float32_view_t *view_out, uint8_t *binary_data, uint32_t binary_data_len); + + +BSON_EXPORT (bool) +bson_vector_float32_const_view_init (bson_vector_float32_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len); + +BSON_EXPORT (bool) +bson_vector_packed_bit_view_init (bson_vector_packed_bit_view_t *view_out, + uint8_t *binary_data, + uint32_t binary_data_len); + +BSON_EXPORT (bool) +bson_vector_packed_bit_const_view_init (bson_vector_packed_bit_const_view_t *view_out, + const uint8_t *binary_data, + uint32_t binary_data_len); + + +BSON_EXPORT (bool) +bson_vector_int8_view_from_iter (bson_vector_int8_view_t *view_out, bson_iter_t *iter); + +BSON_EXPORT (bool) +bson_vector_int8_const_view_from_iter (bson_vector_int8_const_view_t *view_out, const bson_iter_t *iter); + +BSON_EXPORT (bool) +bson_vector_float32_view_from_iter (bson_vector_float32_view_t *view_out, bson_iter_t *iter); + +BSON_EXPORT (bool) +bson_vector_float32_const_view_from_iter (bson_vector_float32_const_view_t *view_out, const bson_iter_t *iter); + +BSON_EXPORT (bool) +bson_vector_packed_bit_view_from_iter (bson_vector_packed_bit_view_t *view_out, bson_iter_t *iter); + +BSON_EXPORT (bool) +bson_vector_packed_bit_const_view_from_iter (bson_vector_packed_bit_const_view_t *view_out, const bson_iter_t *iter); + + +BSON_EXPORT (bool) +bson_array_builder_append_vector_int8_elements (struct _bson_array_builder_t *builder, + bson_vector_int8_const_view_t view); + +BSON_EXPORT (bool) +bson_array_builder_append_vector_float32_elements (struct _bson_array_builder_t *builder, + bson_vector_float32_const_view_t view); + +BSON_EXPORT (bool) +bson_array_builder_append_vector_packed_bit_elements (struct _bson_array_builder_t *builder, + bson_vector_packed_bit_const_view_t view); + +BSON_EXPORT (bool) +bson_array_builder_append_vector_elements (struct _bson_array_builder_t *builder, const bson_iter_t *iter); + + +BSON_EXPORT (bool) +bson_append_vector_int8_uninit ( + bson_t *bson, const char *key, int key_length, size_t element_count, bson_vector_int8_view_t *view_out); + +#define BSON_APPEND_VECTOR_INT8_UNINIT(b, key, count, view) \ + bson_append_vector_int8_uninit (b, key, (int) strlen (key), count, view) + +BSON_EXPORT (bool) +bson_append_vector_float32_uninit ( + bson_t *bson, const char *key, int key_length, size_t element_count, bson_vector_float32_view_t *view_out); + +#define BSON_APPEND_VECTOR_FLOAT32_UNINIT(b, key, count, view) \ + bson_append_vector_float32_uninit (b, key, (int) strlen (key), count, view) + +BSON_EXPORT (bool) +bson_append_vector_packed_bit_uninit ( + bson_t *bson, const char *key, int key_length, size_t element_count, bson_vector_packed_bit_view_t *view_out); + +#define BSON_APPEND_VECTOR_PACKED_BIT_UNINIT(b, key, count, view) \ + bson_append_vector_packed_bit_uninit (b, key, (int) strlen (key), count, view) + + +BSON_EXPORT (bool) +bson_append_vector_int8_from_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, bson_error_t *error); + +#define BSON_APPEND_VECTOR_INT8_FROM_ARRAY(b, key, iter, err) \ + bson_append_vector_int8_from_array (b, key, (int) strlen (key), iter, err) + +BSON_EXPORT (bool) +bson_append_vector_float32_from_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, bson_error_t *error); + +#define BSON_APPEND_VECTOR_FLOAT32_FROM_ARRAY(b, key, iter, err) \ + bson_append_vector_float32_from_array (b, key, (int) strlen (key), iter, err) + +BSON_EXPORT (bool) +bson_append_vector_packed_bit_from_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, bson_error_t *error); + +#define BSON_APPEND_VECTOR_PACKED_BIT_FROM_ARRAY(b, key, iter, err) \ + bson_append_vector_packed_bit_from_array (b, key, (int) strlen (key), iter, err) + + +BSON_EXPORT (bool) +bson_append_array_from_vector_int8 (bson_t *bson, const char *key, int key_length, bson_vector_int8_const_view_t view); + +#define BSON_APPEND_ARRAY_FROM_VECTOR_INT8(b, key, view) \ + bson_append_array_from_vector_int8 (b, key, (int) strlen (key), view) + +BSON_EXPORT (bool) +bson_append_array_from_vector_float32 (bson_t *bson, + const char *key, + int key_length, + bson_vector_float32_const_view_t view); + +#define BSON_APPEND_ARRAY_FROM_VECTOR_FLOAT32(b, key, view) \ + bson_append_array_from_vector_float32 (b, key, (int) strlen (key), view) + +BSON_EXPORT (bool) +bson_append_array_from_vector_packed_bit (bson_t *bson, + const char *key, + int key_length, + bson_vector_packed_bit_const_view_t view); + +#define BSON_APPEND_ARRAY_FROM_VECTOR_PACKED_BIT(b, key, view) \ + bson_append_array_from_vector_packed_bit (b, key, (int) strlen (key), view) + + +static BSON_INLINE const int8_t * +bson_vector_int8_const_view_pointer (bson_vector_int8_const_view_t view) +{ + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + return (const int8_t *) (view.binary.data + BSON_VECTOR_HEADER_LEN); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END +} + +static BSON_INLINE int8_t * +bson_vector_int8_view_pointer (bson_vector_int8_view_t view) +{ + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + return (int8_t *) (view.binary.data + BSON_VECTOR_HEADER_LEN); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END +} + + +static BSON_INLINE uint32_t +bson_vector_int8_binary_data_length (size_t element_count) +{ + const size_t max_representable = (size_t) UINT32_MAX - (size_t) BSON_VECTOR_HEADER_LEN; + return element_count > max_representable ? 0u : (uint32_t) element_count + (uint32_t) BSON_VECTOR_HEADER_LEN; +} + +static BSON_INLINE uint32_t +bson_vector_float32_binary_data_length (size_t element_count) +{ + const size_t max_representable = ((size_t) UINT32_MAX - (size_t) BSON_VECTOR_HEADER_LEN) / sizeof (float); + return element_count > max_representable + ? 0u + : (uint32_t) element_count * sizeof (float) + (uint32_t) BSON_VECTOR_HEADER_LEN; +} + +static BSON_INLINE uint32_t +bson_vector_packed_bit_binary_data_length (size_t element_count) +{ + const size_t max_representable = + (size_t) BSON_MIN ((uint64_t) SIZE_MAX, ((uint64_t) UINT32_MAX - (uint64_t) BSON_VECTOR_HEADER_LEN) * 8u); + return element_count > max_representable + ? 0u + : (uint32_t) (((uint64_t) element_count + 7u) / 8u) + (uint32_t) BSON_VECTOR_HEADER_LEN; +} + + +static BSON_INLINE size_t +bson_vector_int8_const_view_length (bson_vector_int8_const_view_t view) +{ + return view.binary.data_len - (uint32_t) BSON_VECTOR_HEADER_LEN; +} + +static BSON_INLINE size_t +bson_vector_int8_view_length (bson_vector_int8_view_t view) +{ + return bson_vector_int8_const_view_length (bson_vector_int8_view_as_const (view)); +} + +static BSON_INLINE size_t +bson_vector_float32_const_view_length (bson_vector_float32_const_view_t view) +{ + return (view.binary.data_len - (uint32_t) BSON_VECTOR_HEADER_LEN) / (uint32_t) sizeof (float); +} + +static BSON_INLINE size_t +bson_vector_float32_view_length (bson_vector_float32_view_t view) +{ + return bson_vector_float32_const_view_length (bson_vector_float32_view_as_const (view)); +} + +static BSON_INLINE size_t +bson_vector_packed_bit_const_view_length_bytes (bson_vector_packed_bit_const_view_t view) +{ + return view.binary.data_len - (uint32_t) BSON_VECTOR_HEADER_LEN; +} + +static BSON_INLINE size_t +bson_vector_packed_bit_view_length_bytes (bson_vector_packed_bit_view_t view) +{ + return bson_vector_packed_bit_const_view_length_bytes (bson_vector_packed_bit_view_as_const (view)); +} + +// Implementation detail, not part of documented API. +static BSON_INLINE size_t +bson_vector_padding_from_header_byte_1 (uint8_t byte_1) +{ + return byte_1 & 7; +} + +static BSON_INLINE size_t +bson_vector_packed_bit_const_view_padding (bson_vector_packed_bit_const_view_t view) +{ + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + return bson_vector_padding_from_header_byte_1 (view.binary.header_copy.bytes[1]); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END +} + +static BSON_INLINE size_t +bson_vector_packed_bit_view_padding (bson_vector_packed_bit_view_t view) +{ + return bson_vector_packed_bit_const_view_padding (bson_vector_packed_bit_view_as_const (view)); +} + +static BSON_INLINE size_t +bson_vector_packed_bit_const_view_length (bson_vector_packed_bit_const_view_t view) +{ + return bson_vector_packed_bit_const_view_length_bytes (view) * 8u - bson_vector_packed_bit_const_view_padding (view); +} + +static BSON_INLINE size_t +bson_vector_packed_bit_view_length (bson_vector_packed_bit_view_t view) +{ + return bson_vector_packed_bit_const_view_length (bson_vector_packed_bit_view_as_const (view)); +} + + +static BSON_INLINE bool +bson_vector_int8_const_view_read (bson_vector_int8_const_view_t view, + int8_t *BSON_RESTRICT values_out, + size_t element_count, + size_t vector_offset_elements) +{ + size_t length = bson_vector_int8_const_view_length (view); + if (BSON_LIKELY (vector_offset_elements <= length && element_count <= length - vector_offset_elements)) { + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + memcpy (values_out, bson_vector_int8_const_view_pointer (view) + vector_offset_elements, element_count); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + return true; + } else { + return false; + } +} + +static BSON_INLINE bool +bson_vector_int8_view_read (bson_vector_int8_view_t view, + int8_t *BSON_RESTRICT values_out, + size_t element_count, + uint32_t vector_offset_elements) +{ + return bson_vector_int8_const_view_read ( + bson_vector_int8_view_as_const (view), values_out, element_count, vector_offset_elements); +} + +static BSON_INLINE bool +bson_vector_int8_view_write (bson_vector_int8_view_t view, + const int8_t *BSON_RESTRICT values, + size_t element_count, + size_t vector_offset_elements) +{ + size_t length = bson_vector_int8_view_length (view); + if (BSON_LIKELY (vector_offset_elements <= length && element_count <= length - vector_offset_elements)) { + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + memcpy (bson_vector_int8_view_pointer (view) + vector_offset_elements, values, element_count); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + return true; + } else { + return false; + } +} + + +BSON_STATIC_ASSERT2 (float_is_float32, sizeof (float) == 4); + +static BSON_INLINE bool +bson_vector_float32_const_view_read (bson_vector_float32_const_view_t view, + float *BSON_RESTRICT values_out, + size_t element_count, + size_t vector_offset_elements) +{ + size_t length = bson_vector_float32_const_view_length (view); + if (BSON_LIKELY (vector_offset_elements <= length && element_count <= length - vector_offset_elements)) { + size_t byte_offset = BSON_VECTOR_HEADER_LEN + vector_offset_elements * 4; + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN +#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN + memcpy (values_out, view.binary.data + byte_offset, element_count * 4); +#else + size_t i; + for (i = 0; i < element_count; i++) { + float aligned_tmp; + memcpy (&aligned_tmp, view.binary.data + byte_offset + i * 4, 4); + values_out[i] = BSON_FLOAT_FROM_LE (aligned_tmp); + } +#endif + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + return true; + } else { + return false; + } +} + +static BSON_INLINE bool +bson_vector_float32_view_read (bson_vector_float32_view_t view, + float *BSON_RESTRICT values_out, + size_t element_count, + size_t vector_offset_elements) +{ + return bson_vector_float32_const_view_read ( + bson_vector_float32_view_as_const (view), values_out, element_count, vector_offset_elements); +} + +static BSON_INLINE bool +bson_vector_float32_view_write (bson_vector_float32_view_t view, + const float *BSON_RESTRICT values, + size_t element_count, + size_t vector_offset_elements) +{ + size_t length = bson_vector_float32_view_length (view); + if (BSON_LIKELY (vector_offset_elements <= length && element_count <= length - vector_offset_elements)) { + size_t byte_offset = BSON_VECTOR_HEADER_LEN + vector_offset_elements * 4; + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN +#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN + memcpy (view.binary.data + byte_offset, values, element_count * 4); +#else + size_t i; + for (i = 0; i < element_count; i++) { + float aligned_tmp = BSON_FLOAT_TO_LE (values[i]); + memcpy (view.binary.data + byte_offset + i * 4, &aligned_tmp, 4); + } +#endif + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + return true; + } else { + return false; + } +} + + +static BSON_INLINE bool +bson_vector_packed_bit_const_view_read_packed (bson_vector_packed_bit_const_view_t view, + uint8_t *BSON_RESTRICT packed_values_out, + size_t byte_count, + size_t vector_offset_bytes) +{ + size_t length_bytes = bson_vector_packed_bit_const_view_length_bytes (view); + if (BSON_LIKELY (vector_offset_bytes <= length_bytes && byte_count <= length_bytes - vector_offset_bytes)) { + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + memcpy (packed_values_out, view.binary.data + BSON_VECTOR_HEADER_LEN + vector_offset_bytes, byte_count); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + return true; + } else { + return false; + } +} + +static BSON_INLINE bool +bson_vector_packed_bit_view_read_packed (bson_vector_packed_bit_view_t view, + uint8_t *BSON_RESTRICT packed_values_out, + size_t byte_count, + size_t vector_offset_bytes) +{ + return bson_vector_packed_bit_const_view_read_packed ( + bson_vector_packed_bit_view_as_const (view), packed_values_out, byte_count, vector_offset_bytes); +} + +static BSON_INLINE bool +bson_vector_packed_bit_view_write_packed (bson_vector_packed_bit_view_t view, + const uint8_t *BSON_RESTRICT packed_values, + size_t byte_count, + size_t vector_offset_bytes) +{ + size_t length_bytes = bson_vector_packed_bit_view_length_bytes (view); + if (BSON_LIKELY (vector_offset_bytes <= length_bytes && byte_count <= length_bytes - vector_offset_bytes)) { + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + if (byte_count == length_bytes - vector_offset_bytes && byte_count >= 1u) { + // This write touches the last byte in the vector: + // special-case that byte so we can ensure unused bits remain set to zero. + size_t other_bytes = byte_count - 1u; + memcpy (view.binary.data + BSON_VECTOR_HEADER_LEN + vector_offset_bytes, packed_values, other_bytes); + view.binary.data[BSON_VECTOR_HEADER_LEN + vector_offset_bytes + other_bytes] = + (UINT8_C (0xFF) << bson_vector_packed_bit_view_padding (view)) & packed_values[other_bytes]; + } else { + memcpy (view.binary.data + BSON_VECTOR_HEADER_LEN + vector_offset_bytes, packed_values, byte_count); + } + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + return true; + } else { + return false; + } +} + + +static BSON_INLINE bool +bson_vector_packed_bit_const_view_unpack_bool (bson_vector_packed_bit_const_view_t view, + bool *BSON_RESTRICT unpacked_values_out, + size_t element_count, + size_t vector_offset_elements) +{ + size_t length = bson_vector_packed_bit_const_view_length (view); + if (BSON_LIKELY (vector_offset_elements <= length && element_count <= length - vector_offset_elements)) { + size_t i; + for (i = 0; i < element_count; i++) { + size_t element_index = vector_offset_elements + i; + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + uint8_t packed_byte = view.binary.data[BSON_VECTOR_HEADER_LEN + (element_index >> 3)]; + unpacked_values_out[i] = 0 != (packed_byte & ((uint8_t) 0x80 >> (element_index & 7))); + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + } + return true; + } else { + return false; + } +} + +static BSON_INLINE bool +bson_vector_packed_bit_view_unpack_bool (bson_vector_packed_bit_view_t view, + bool *BSON_RESTRICT unpacked_values_out, + size_t element_count, + size_t vector_offset_elements) +{ + return bson_vector_packed_bit_const_view_unpack_bool ( + bson_vector_packed_bit_view_as_const (view), unpacked_values_out, element_count, vector_offset_elements); +} + +static BSON_INLINE bool +bson_vector_packed_bit_view_pack_bool (bson_vector_packed_bit_view_t view, + const bool *BSON_RESTRICT unpacked_values, + size_t element_count, + size_t vector_offset_elements) +{ + size_t length = bson_vector_packed_bit_view_length (view); + if (BSON_LIKELY (vector_offset_elements <= length && element_count <= length - vector_offset_elements)) { + while (element_count > 0) { + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_BEGIN + uint8_t *BSON_RESTRICT packed_byte = BSON_VECTOR_HEADER_LEN + (vector_offset_elements >> 3) + view.binary.data; + if (element_count >= 8 && (vector_offset_elements & 7) == 0) { + uint8_t complete_byte = 0; + unsigned i; + for (i = 0; i < 8; i++) { + complete_byte |= unpacked_values[i] ? ((uint8_t) 0x80 >> i) : 0; + } + *packed_byte = complete_byte; + unpacked_values += 8; + vector_offset_elements += 8; + element_count -= 8; + } else { + uint8_t mask = (uint8_t) 0x80 >> (vector_offset_elements & 7); + *packed_byte = (*packed_byte & ~mask) | (*unpacked_values ? mask : 0); + unpacked_values++; + vector_offset_elements++; + element_count--; + } + BSON_DISABLE_UNSAFE_BUFFER_USAGE_WARNING_END + } + return true; + } else { + return false; + } +} + + +BSON_END_DECLS + +#endif /* BSON_VECTOR_H */ diff -pruN 1.30.4-1/src/libbson/src/bson/bson.c 2.0.2-1/src/libbson/src/bson/bson.c --- 1.30.4-1/src/libbson/src/bson/bson.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson.c 2025-06-19 15:42:22.000000000 +0000 @@ -15,6 +15,8 @@ */ +#include +#include #include #include #include @@ -23,39 +25,10 @@ #include #include #include -#include #include #include -#ifdef BSON_MEMCHECK -#pragma message( \ - "Do not define BSON_MEMCHECK. BSON_MEMCHECK changes the data layout of bson_t. BSON_MEMCHECK is deprecated may be removed in a future major release") -#endif - - -typedef enum { - BSON_VALIDATE_PHASE_START, - BSON_VALIDATE_PHASE_TOP, - BSON_VALIDATE_PHASE_LF_REF_KEY, - BSON_VALIDATE_PHASE_LF_REF_UTF8, - BSON_VALIDATE_PHASE_LF_ID_KEY, - BSON_VALIDATE_PHASE_LF_DB_KEY, - BSON_VALIDATE_PHASE_LF_DB_UTF8, - BSON_VALIDATE_PHASE_NOT_DBREF, -} bson_validate_phase_t; - - -/* - * Structures. - */ -typedef struct { - bson_validate_flags_t flags; - ssize_t err_offset; - bson_validate_phase_t phase; - bson_error_t error; -} bson_validate_state_t; - /* * Globals. @@ -131,9 +104,6 @@ _bson_impl_inline_grow (bson_impl_inline data = bson_malloc (req); memcpy (data, impl->data, impl->len); -#ifdef BSON_MEMCHECK - bson_free (impl->canary); -#endif alloc->flags &= ~BSON_FLAG_INLINE; alloc->parent = NULL; alloc->depth = 0; @@ -289,17 +259,12 @@ _bson_data (const bson_t *bson) /* IN */ static BSON_INLINE void _bson_encode_length (bson_t *bson) /* IN */ { -#if BSON_BYTE_ORDER == BSON_LITTLE_ENDIAN - memcpy (_bson_data (bson), &bson->len, sizeof (bson->len)); -#else - uint32_t length_le = BSON_UINT32_TO_LE (bson->len); - memcpy (_bson_data (bson), &length_le, sizeof (length_le)); -#endif + mlib_write_u32le (_bson_data (bson), bson->len); } typedef struct _bson_append_bytes_arg { - const uint8_t *bytes; // Not null. + const uint8_t *bytes; // Optional. uint32_t length; // > 0. } _bson_append_bytes_arg; @@ -370,7 +335,9 @@ BSON_STATIC_ASSERT2 (max_alloc_grow_fits } else { \ uint8_t *data = _bson_data ((_bson)) + ((_bson)->len - 1u); \ for (const _bson_append_bytes_arg *arg = (_list).args; arg != (_list).current; ++arg) { \ - memcpy (data, arg->bytes, arg->length); \ + if (arg->bytes) { \ + memcpy (data, arg->bytes, arg->length); \ + } \ (_bson)->len += arg->length; \ data += arg->length; \ } \ @@ -745,16 +712,15 @@ append_failure: /* *-------------------------------------------------------------------------- * - * bson_append_binary -- + * _bson_append_binary -- * - * Append binary data to @bson. The field will have the - * BSON_TYPE_BINARY type. + * Append a BSON_TYPE_BINARY field, optionally copying @binary into the field. * * Parameters: * @subtype: the BSON Binary Subtype. See bsonspec.org for more * information. - * @binary: a pointer to the raw binary data. - * @length: the size of @binary in bytes. + * @binary: Optional pointer to the raw binary data. + * @length: the size of the field's binary data in bytes. * * Returns: * true if successful; otherwise false. @@ -765,22 +731,19 @@ append_failure: *-------------------------------------------------------------------------- */ -bool -bson_append_binary (bson_t *bson, /* IN */ - const char *key, /* IN */ - int key_length, /* IN */ - bson_subtype_t subtype, /* IN */ - const uint8_t *binary, /* IN */ - uint32_t length) /* IN */ +static bool +_bson_append_binary (bson_t *bson, /* IN */ + const char *key, /* IN */ + int key_length, /* IN */ + bson_subtype_t subtype, /* IN */ + const uint8_t *binary, /* IN */ + uint32_t length) /* IN */ { static const uint8_t type = BSON_TYPE_BINARY; BSON_ASSERT_PARAM (bson); BSON_ASSERT_PARAM (key); - - if (!binary && length > 0u) { - return false; - } + BSON_OPTIONAL_PARAM (binary); BSON_APPEND_BYTES_LIST_DECLARE (args); @@ -824,6 +787,87 @@ append_failure: /* *-------------------------------------------------------------------------- * + * bson_append_binary -- + * + * Append binary data to @bson. The field will have the + * BSON_TYPE_BINARY type. + * + * Parameters: + * @subtype: the BSON Binary Subtype. See bsonspec.org for more + * information. + * @binary: a pointer to the raw binary data. + * @length: the size of @binary in bytes. + * + * Returns: + * true if successful; otherwise false. + * + * Side effects: + * None. + * + *-------------------------------------------------------------------------- + */ + +bool +bson_append_binary (bson_t *bson, /* IN */ + const char *key, /* IN */ + int key_length, /* IN */ + bson_subtype_t subtype, /* IN */ + const uint8_t *binary, /* IN */ + uint32_t length) /* IN */ +{ + if (!binary && length > 0u) { + return false; + } + return _bson_append_binary (bson, key, key_length, subtype, binary, length); +} + + +/* + *-------------------------------------------------------------------------- + * + * bson_append_binary_uninit -- + * + * Append binary data to @bson by framing an uninitialized field to be written by the caller. + * The field will have the BSON_TYPE_BINARY type. On success, the caller MUST write to all + * bytes in the binary data field. The returned `*binary` pointer may be invalidated by + * subsequent modifications to @bson. + * + * Parameters: + * @subtype: the BSON Binary Subtype. See bsonspec.org for more + * information. + * @binary: Output parameter for a temporary pointer where the binary item's contents must be written. + * @length: the size of @binary in bytes. + * + * Returns: + * true if successful; otherwise false. + * + * Side effects: + * None. + * + *-------------------------------------------------------------------------- + */ + +bool +bson_append_binary_uninit (bson_t *bson, /* IN */ + const char *key, /* IN */ + int key_length, /* IN */ + bson_subtype_t subtype, /* IN */ + uint8_t **binary, /* IN */ + uint32_t length) /* IN */ +{ + BSON_ASSERT_PARAM (binary); + if (_bson_append_binary (bson, key, key_length, subtype, NULL, length)) { + *binary = _bson_data (bson) + bson->len - 1u - length; + return true; + } else { + return false; + } +} + + +/* + *-------------------------------------------------------------------------- + * * bson_append_bool -- * * Append a new field to @bson with the name @key. The value is @@ -1823,9 +1867,6 @@ bson_init (bson_t *bson) BSON_ASSERT (bson); -#ifdef BSON_MEMCHECK - impl->canary = bson_malloc (1); -#endif impl->flags = BSON_FLAG_INLINE | BSON_FLAG_STATIC; impl->len = 5; impl->data[0] = 5; @@ -1859,7 +1900,6 @@ bool bson_init_static (bson_t *bson, const uint8_t *data, size_t length) { bson_impl_alloc_t *impl = (bson_impl_alloc_t *) bson; - uint32_t len_le; BSON_ASSERT (bson); BSON_ASSERT (data); @@ -1868,9 +1908,9 @@ bson_init_static (bson_t *bson, const ui return false; } - memcpy (&len_le, data, sizeof (len_le)); + const uint32_t hdr_len = mlib_read_u32le (data); - if ((size_t) BSON_UINT32_FROM_LE (len_le) != length) { + if (hdr_len != length) { return false; } @@ -1905,9 +1945,6 @@ bson_new (void) impl = (bson_impl_inline_t *) bson; impl->flags = BSON_FLAG_INLINE; impl->len = 5; -#ifdef BSON_MEMCHECK - impl->canary = bson_malloc (1); -#endif impl->data[0] = 5; impl->data[1] = 0; impl->data[2] = 0; @@ -1960,22 +1997,21 @@ bson_sized_new (size_t size) bson_t * bson_new_from_data (const uint8_t *data, size_t length) { - uint32_t len_le; - bson_t *bson; - BSON_ASSERT (data); if ((length < 5) || (length > BSON_MAX_SIZE) || data[length - 1]) { + // Invalid length, or not null-terminated return NULL; } - memcpy (&len_le, data, sizeof (len_le)); + const int32_t hdr = mlib_read_i32le (data); - if (length != (size_t) BSON_UINT32_FROM_LE (len_le)) { + if (mlib_cmp (hdr, !=, length)) { + // Header's declared length is not equal to the length of the data buffer we were given return NULL; } - bson = bson_sized_new (length); + bson_t *const bson = bson_sized_new (length); memcpy (_bson_data (bson), data, length); bson->len = (uint32_t) length; @@ -1987,7 +2023,6 @@ bson_t * bson_new_from_buffer (uint8_t **buf, size_t *buf_len, bson_realloc_func realloc_func, void *realloc_func_ctx) { bson_impl_alloc_t *impl; - uint32_t len_le; uint32_t length; bson_t *bson; @@ -2003,20 +2038,17 @@ bson_new_from_buffer (uint8_t **buf, siz if (!*buf) { length = 5; - len_le = BSON_UINT32_TO_LE (length); *buf_len = 5; *buf = realloc_func (*buf, *buf_len, realloc_func_ctx); - memcpy (*buf, &len_le, sizeof (len_le)); + mlib_write_u32le (*buf, length); (*buf)[4] = '\0'; } else { if ((*buf_len < 5) || (*buf_len > BSON_MAX_SIZE)) { bson_free (bson); return NULL; } - - memcpy (&len_le, *buf, sizeof (len_le)); - length = BSON_UINT32_FROM_LE (len_le); - if ((size_t) length > *buf_len) { + length = mlib_read_u32le (*buf); + if (length > *buf_len) { bson_free (bson); return NULL; } @@ -2061,13 +2093,7 @@ bson_copy_to (const bson_t *src, bson_t BSON_ASSERT (dst); if ((src->flags & BSON_FLAG_INLINE)) { -#ifdef BSON_MEMCHECK - dst->len = src->len; - dst->canary = bson_malloc (1); - memcpy (dst->padding, src->padding, sizeof dst->padding); -#else memcpy (dst, src, sizeof *dst); -#endif dst->flags = (BSON_FLAG_STATIC | BSON_FLAG_INLINE); return; } @@ -2137,22 +2163,6 @@ bson_copy_to_excluding_noinit_va (const void -bson_copy_to_excluding (const bson_t *src, bson_t *dst, const char *first_exclude, ...) -{ - va_list args; - - BSON_ASSERT (src); - BSON_ASSERT (dst); - BSON_ASSERT (first_exclude); - - bson_init (dst); - - va_start (args, first_exclude); - bson_copy_to_excluding_noinit_va (src, dst, first_exclude, args); - va_end (args); -} - -void bson_copy_to_excluding_noinit (const bson_t *src, bson_t *dst, const char *first_exclude, ...) { va_list args; @@ -2177,12 +2187,6 @@ bson_destroy (bson_t *bson) bson_free (*((bson_impl_alloc_t *) bson)->buf); } -#ifdef BSON_MEMCHECK - if (bson->flags & BSON_FLAG_INLINE) { - bson_free (bson->canary); - } -#endif - if (!(bson->flags & BSON_FLAG_STATIC)) { bson_free (bson); } @@ -2249,13 +2253,7 @@ bson_steal (bson_t *dst, bson_t *src) /* for consistency, src is always invalid after steal, even if inline */ src->len = 0; -#ifdef BSON_MEMCHECK - bson_free (src->canary); -#endif } else { -#ifdef BSON_MEMCHECK - bson_free (dst->canary); -#endif memcpy (dst, src, sizeof (bson_t)); alloc = (bson_impl_alloc_t *) dst; alloc->flags |= BSON_FLAG_STATIC; @@ -2438,12 +2436,6 @@ bson_as_canonical_extended_json (const b char * -bson_as_json (const bson_t *bson, size_t *length) -{ - return bson_as_legacy_extended_json (bson, length); -} - -char * bson_as_legacy_extended_json (const bson_t *bson, size_t *length) { const bson_json_opts_t opts = {BSON_JSON_MODE_LEGACY, BSON_MAX_LEN_UNLIMITED, false}; @@ -2460,12 +2452,6 @@ bson_as_relaxed_extended_json (const bso char * -bson_array_as_json (const bson_t *bson, size_t *length) -{ - return bson_array_as_legacy_extended_json (bson, length); -} - -char * bson_array_as_legacy_extended_json (const bson_t *bson, size_t *length) { const bson_json_opts_t opts = {BSON_JSON_MODE_LEGACY, BSON_MAX_LEN_UNLIMITED, true}; @@ -2489,196 +2475,6 @@ bson_array_as_canonical_extended_json (c } -#define VALIDATION_ERR(_flag, _msg, ...) bson_set_error (&state->error, BSON_ERROR_INVALID, _flag, _msg, __VA_ARGS__) - -static bool -_bson_iter_validate_utf8 (const bson_iter_t *iter, const char *key, size_t v_utf8_len, const char *v_utf8, void *data) -{ - bson_validate_state_t *state = data; - bool allow_null; - - if ((state->flags & BSON_VALIDATE_UTF8)) { - allow_null = !!(state->flags & BSON_VALIDATE_UTF8_ALLOW_NULL); - - if (!bson_utf8_validate (v_utf8, v_utf8_len, allow_null)) { - state->err_offset = iter->off; - VALIDATION_ERR (BSON_VALIDATE_UTF8, "invalid utf8 string for key \"%s\"", key); - return true; - } - } - - if ((state->flags & BSON_VALIDATE_DOLLAR_KEYS)) { - if (state->phase == BSON_VALIDATE_PHASE_LF_REF_UTF8) { - state->phase = BSON_VALIDATE_PHASE_LF_ID_KEY; - } else if (state->phase == BSON_VALIDATE_PHASE_LF_DB_UTF8) { - state->phase = BSON_VALIDATE_PHASE_NOT_DBREF; - } - } - - return false; -} - - -static void -_bson_iter_validate_corrupt (const bson_iter_t *iter, void *data) -{ - bson_validate_state_t *state = data; - - state->err_offset = iter->err_off; - VALIDATION_ERR (BSON_VALIDATE_NONE, "%s", "corrupt BSON"); -} - - -static bool -_bson_iter_validate_before (const bson_iter_t *iter, const char *key, void *data) -{ - bson_validate_state_t *state = data; - - if ((state->flags & BSON_VALIDATE_EMPTY_KEYS)) { - if (key[0] == '\0') { - state->err_offset = iter->off; - VALIDATION_ERR (BSON_VALIDATE_EMPTY_KEYS, "%s", "empty key"); - return true; - } - } - - if ((state->flags & BSON_VALIDATE_DOLLAR_KEYS)) { - if (key[0] == '$') { - if (state->phase == BSON_VALIDATE_PHASE_LF_REF_KEY && strcmp (key, "$ref") == 0) { - state->phase = BSON_VALIDATE_PHASE_LF_REF_UTF8; - } else if (state->phase == BSON_VALIDATE_PHASE_LF_ID_KEY && strcmp (key, "$id") == 0) { - state->phase = BSON_VALIDATE_PHASE_LF_DB_KEY; - } else if (state->phase == BSON_VALIDATE_PHASE_LF_DB_KEY && strcmp (key, "$db") == 0) { - state->phase = BSON_VALIDATE_PHASE_LF_DB_UTF8; - } else { - state->err_offset = iter->off; - VALIDATION_ERR (BSON_VALIDATE_DOLLAR_KEYS, "keys cannot begin with \"$\": \"%s\"", key); - return true; - } - } else if (state->phase == BSON_VALIDATE_PHASE_LF_ID_KEY || state->phase == BSON_VALIDATE_PHASE_LF_REF_UTF8 || - state->phase == BSON_VALIDATE_PHASE_LF_DB_UTF8) { - state->err_offset = iter->off; - VALIDATION_ERR (BSON_VALIDATE_DOLLAR_KEYS, "invalid key within DBRef subdocument: \"%s\"", key); - return true; - } else { - state->phase = BSON_VALIDATE_PHASE_NOT_DBREF; - } - } - - if ((state->flags & BSON_VALIDATE_DOT_KEYS)) { - if (strstr (key, ".")) { - state->err_offset = iter->off; - VALIDATION_ERR (BSON_VALIDATE_DOT_KEYS, "keys cannot contain \".\": \"%s\"", key); - return true; - } - } - - return false; -} - - -static bool -_bson_iter_validate_codewscope ( - const bson_iter_t *iter, const char *key, size_t v_code_len, const char *v_code, const bson_t *v_scope, void *data) -{ - bson_validate_state_t *state = data; - size_t offset = 0; - - BSON_UNUSED (key); - BSON_UNUSED (v_code_len); - BSON_UNUSED (v_code); - - if (!bson_validate (v_scope, state->flags, &offset)) { - state->err_offset = iter->off + offset; - VALIDATION_ERR (BSON_VALIDATE_NONE, "%s", "corrupt code-with-scope"); - return false; - } - - return true; -} - - -static bool -_bson_iter_validate_document (const bson_iter_t *iter, const char *key, const bson_t *v_document, void *data); - - -static const bson_visitor_t bson_validate_funcs = { - _bson_iter_validate_before, - NULL, /* visit_after */ - _bson_iter_validate_corrupt, - NULL, /* visit_double */ - _bson_iter_validate_utf8, - _bson_iter_validate_document, - _bson_iter_validate_document, /* visit_array */ - NULL, /* visit_binary */ - NULL, /* visit_undefined */ - NULL, /* visit_oid */ - NULL, /* visit_bool */ - NULL, /* visit_date_time */ - NULL, /* visit_null */ - NULL, /* visit_regex */ - NULL, /* visit_dbpoint */ - NULL, /* visit_code */ - NULL, /* visit_symbol */ - _bson_iter_validate_codewscope, -}; - - -static bool -_bson_iter_validate_document (const bson_iter_t *iter, const char *key, const bson_t *v_document, void *data) -{ - bson_validate_state_t *state = data; - bson_iter_t child; - bson_validate_phase_t phase = state->phase; - - BSON_UNUSED (key); - - if (!bson_iter_init (&child, v_document)) { - state->err_offset = iter->off; - return true; - } - - if (state->phase == BSON_VALIDATE_PHASE_START) { - state->phase = BSON_VALIDATE_PHASE_TOP; - } else { - state->phase = BSON_VALIDATE_PHASE_LF_REF_KEY; - } - - (void) bson_iter_visit_all (&child, &bson_validate_funcs, state); - - if (state->phase == BSON_VALIDATE_PHASE_LF_ID_KEY || state->phase == BSON_VALIDATE_PHASE_LF_REF_UTF8 || - state->phase == BSON_VALIDATE_PHASE_LF_DB_UTF8) { - if (state->err_offset <= 0) { - state->err_offset = iter->off; - } - - return true; - } - - state->phase = phase; - - return false; -} - - -static void -_bson_validate_internal (const bson_t *bson, bson_validate_state_t *state) -{ - bson_iter_t iter; - - state->err_offset = -1; - state->phase = BSON_VALIDATE_PHASE_START; - memset (&state->error, 0, sizeof state->error); - - if (!bson_iter_init (&iter, bson)) { - state->err_offset = 0; - VALIDATION_ERR (BSON_VALIDATE_NONE, "%s", "corrupt BSON"); - } else { - _bson_iter_validate_document (&iter, NULL, bson, state); - } -} - - bool bson_validate (const bson_t *bson, bson_validate_flags_t flags, size_t *offset) { @@ -2692,29 +2488,26 @@ bson_validate_with_error (const bson_t * return bson_validate_with_error_and_offset (bson, flags, NULL, error); } - bool bson_validate_with_error_and_offset (const bson_t *bson, bson_validate_flags_t flags, size_t *offset, bson_error_t *error) { - bson_validate_state_t state; - - state.flags = flags; - _bson_validate_internal (bson, &state); + BSON_ASSERT_PARAM (bson); + BSON_OPTIONAL_PARAM (offset); + BSON_OPTIONAL_PARAM (error); - if (state.err_offset >= 0) { - if (offset) { - *offset = (size_t) state.err_offset; - } - if (error) { - memcpy (error, &state.error, sizeof *error); - } - return false; + size_t offset_local = 0; + if (!offset) { + offset = &offset_local; + } + bson_error_t error_local; + if (!error) { + error = &error_local; } - return true; + return _bson_validate_impl_v2 (bson, flags, offset, error); } @@ -2795,6 +2588,7 @@ bson_array_builder_append_value (bson_ar bson_array_builder_append_impl (bson_append_value, value); } + bool bson_array_builder_append_array (bson_array_builder_t *bab, const bson_t *array) { @@ -2803,6 +2597,13 @@ bson_array_builder_append_array (bson_ar bool +bson_array_builder_append_array_from_vector (bson_array_builder_t *bab, const bson_iter_t *iter) +{ + bson_array_builder_append_impl (bson_append_array_from_vector, iter); +} + + +bool bson_array_builder_append_binary (bson_array_builder_t *bab, bson_subtype_t subtype, const uint8_t *binary, @@ -2812,6 +2613,16 @@ bson_array_builder_append_binary (bson_a } +bool +bson_array_builder_append_binary_uninit (bson_array_builder_t *bab, + bson_subtype_t subtype, + uint8_t **binary, + uint32_t length) +{ + bson_array_builder_append_impl (bson_append_binary_uninit, subtype, binary, length); +} + + bool bson_array_builder_append_bool (bson_array_builder_t *bab, bool value) { diff -pruN 1.30.4-1/src/libbson/src/bson/bson.h 2.0.2-1/src/libbson/src/bson/bson.h --- 1.30.4-1/src/libbson/src/bson/bson.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/bson.h 2025-06-19 15:42:22.000000000 +0000 @@ -27,8 +27,6 @@ #include #include -#include // Deprecated. -#include // Deprecated. #include #include #include @@ -36,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -44,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -290,31 +288,13 @@ bson_copy (const bson_t *bson); BSON_EXPORT (void) bson_copy_to (const bson_t *src, bson_t *dst); - -/** - * bson_copy_to_excluding: - * @src: A bson_t. - * @dst: A bson_t to initialize and copy into. - * @first_exclude: First field name to exclude. - * - * Copies @src into @dst excluding any field that is provided. - * This is handy for situations when you need to remove one or - * more fields in a bson_t. Note that bson_init() will be called - * on dst. - */ -BSON_EXPORT (void) -bson_copy_to_excluding (const bson_t *src, bson_t *dst, const char *first_exclude, ...) BSON_GNUC_NULL_TERMINATED - BSON_GNUC_DEPRECATED_FOR (bson_copy_to_excluding_noinit); - /** * bson_copy_to_excluding_noinit: * @src: A bson_t. * @dst: A bson_t to initialize and copy into. * @first_exclude: First field name to exclude. * - * The same as bson_copy_to_excluding, but does not call bson_init() - * on the dst. This version should be preferred in new code, but the - * old function is left for backwards compatibility. + * Does not call bson_init() on the dst. */ BSON_EXPORT (void) bson_copy_to_excluding_noinit (const bson_t *src, bson_t *dst, const char *first_exclude, ...) @@ -519,7 +499,7 @@ bson_as_canonical_extended_json (const b /** - * bson_as_json: + * bson_as_legacy_extended_json: * @bson: A bson_t. * @length: A location for the string length, or NULL. * @@ -531,10 +511,7 @@ bson_as_canonical_extended_json (const b * * Returns: A newly allocated string that should be freed with bson_free(). */ -BSON_EXPORT (char *) -bson_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_as_legacy_extended_json); -// `bson_as_legacy_extended_json` is a non-deprecated form of `bson_as_json`. BSON_EXPORT (char *) bson_as_legacy_extended_json (const bson_t *bson, size_t *length); @@ -561,11 +538,7 @@ BSON_EXPORT (char *) bson_as_relaxed_extended_json (const bson_t *bson, size_t *length); -/* like bson_as_json() but for outermost arrays. */ -BSON_EXPORT (char *) -bson_array_as_json (const bson_t *bson, size_t *length) BSON_GNUC_DEPRECATED_FOR (bson_array_as_legacy_extended_json); - -// `bson_array_as_legacy_extended_json` is a non-deprecated form of `bson_array_as_json`. +/* like bson_as_legacy_extended_json() but for outermost arrays. */ BSON_EXPORT (char *) bson_array_as_legacy_extended_json (const bson_t *bson, size_t *length); @@ -626,10 +599,30 @@ BSON_EXPORT (bool) bson_array_builder_append_array (bson_array_builder_t *bab, const bson_t *array); /** + * bson_append_array_from_vector: + * @bson: A bson_t that will be modified. + * @key: The key for the field. + * @iter: A bson_iter_t pointing to any supported vector in another bson_t. + * + * If @iter points to a supported vector type, converts the vector to a BSON array appended to @bson. + * + * Returns: true if successful; false if append would overflow max size or @iter does not point to a vector in a + * supported format. + */ +BSON_EXPORT (bool) +bson_append_array_from_vector (bson_t *bson, const char *key, int key_length, const bson_iter_t *iter); + +#define BSON_APPEND_ARRAY_FROM_VECTOR(b, key, iter) bson_append_array_from_vector (b, key, (int) strlen (key), iter) + +BSON_EXPORT (bool) +bson_array_builder_append_array_from_vector (bson_array_builder_t *bab, const bson_iter_t *iter); + +/** * bson_append_binary: - * @bson: A bson_t to append. + * @bson: A bson_t. * @key: The key for the field. - * @subtype: The bson_subtype_t of the binary. + * @key_length: Optional length of 'key' in bytes, or -1 to use strlen(key). + * @subtype: The bson_subtype_t of the binary item. * @binary: The binary buffer to append. * @length: The length of @binary. * @@ -650,6 +643,30 @@ bson_array_builder_append_binary (bson_a uint32_t length); /** + * bson_append_binary_uninit: + * @bson: A bson_t. + * @key: The key for the field. + * @key_length: Optional length of 'key' in bytes, or -1 to use strlen(key). + * @binary: Output parameter, pointer for the binary data within bson_t to be written. + * @length: Length of the binary field to allocate, in bytes. + * + * Returns: true if successful; false if append would overflow max size. + */ + +BSON_EXPORT (bool) +bson_append_binary_uninit ( + bson_t *bson, const char *key, int key_length, bson_subtype_t subtype, uint8_t **binary, uint32_t length); + +#define BSON_APPEND_BINARY_UNINIT(b, key, subtype, val, len) \ + bson_append_binary_uninit (b, key, (int) strlen (key), subtype, val, len) + +BSON_EXPORT (bool) +bson_array_builder_append_binary_uninit (bson_array_builder_t *bab, + bson_subtype_t subtype, + uint8_t **binary, + uint32_t length); + +/** * bson_append_bool: * @bson: A bson_t. * @key: The key for the field. diff -pruN 1.30.4-1/src/libbson/src/bson/forwarding/bson.h 2.0.2-1/src/libbson/src/bson/forwarding/bson.h --- 1.30.4-1/src/libbson/src/bson/forwarding/bson.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/forwarding/bson.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* Including bson.h is superseded. Use bson/bson.h instead. */ -#include diff -pruN 1.30.4-1/src/libbson/src/bson/modules/module.modulemap.in 2.0.2-1/src/libbson/src/bson/modules/module.modulemap.in --- 1.30.4-1/src/libbson/src/bson/modules/module.modulemap.in 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/modules/module.modulemap.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -framework module bson [system] { - umbrella header "bson.h" - - export * -} \ No newline at end of file diff -pruN 1.30.4-1/src/libbson/src/bson/validate-private.h 2.0.2-1/src/libbson/src/bson/validate-private.h --- 1.30.4-1/src/libbson/src/bson/validate-private.h 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/validate-private.h 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,37 @@ +#ifndef BSON_VALIDATE_PRIVATE_H_INCLUDED +#define BSON_VALIDATE_PRIVATE_H_INCLUDED + +#include + +enum { + /** + * @brief This compile-time constant represents the maximum document nesting + * depth permitted by the `bson_validate` family of functions. If the nesting + * depth exceeds this limit, the data will be rejected. + * + * This limit is intentionally larger than the default limit of MongoDB + * server, since we cannot anticipate what a libbson user might actually want + * to do with BSON, and to prevent accidentally rejecting data that the + * server might accept. The main purpose of this limit is to prevent stack + * overflow, not to reject invalid data. + */ + BSON_VALIDATION_MAX_NESTING_DEPTH = 500, +}; + +/** + * @brief Private function backing the implementation of validation. + * + * Validation was previously defined in the overburdened `bson-iter.c`, but it + * is now defined in its own file. + * + * @param bson The document to validate. Must be non-null. + * @param flags Validation control flags + * @param offset Receives the offset at which validation failed. Must be non-null. + * @param error Receives the error describing why validation failed. Must be non-null. + * @return true If the given document has no validation errors + * @return false Otherwise + */ +bool +_bson_validate_impl_v2 (const bson_t *bson, bson_validate_flags_t flags, size_t *offset, bson_error_t *error); + +#endif // BSON_VALIDATE_PRIVATE_H_INCLUDED diff -pruN 1.30.4-1/src/libbson/src/bson/validate.c 2.0.2-1/src/libbson/src/bson/validate.c --- 1.30.4-1/src/libbson/src/bson/validate.c 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson/validate.c 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,566 @@ +/** + * @file bson/validate.c + * @brief Implementation of BSON document validation + * @date 2025-05-28 + * + * This file implements the backend for the `bson_validate` family of functions. + * + * The `_validate_...` functions all accept `validator* self` as their first parameter, + * and must `return false` AND set `self->error` if-and-only-if they encounter a validation error. + * If a function returns true, it is assumed that validation of that item succeeded. + * + * For brevity, the `require...` macros are defined, which check conditions, set errors, + * and `return false` inline. + * + * @copyright Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include +#include + +/** + * @brief User parameters for validation behavior. These correspond to the various + * flags that can be given when the user requests validation + */ +typedef struct { + /** + * @brief Should we allow invalid UTF-8 in string components? + * + * This affects the behavior of validation of key strings and string-like + * elements that require UTF-8 encoding. + * + * Technically invalid UTF-8 is invalid in BSON, but applications may already + * rely on this being accepted. + */ + bool allow_invalid_utf8; + /** + * @brief Should we allow a zero-valued codepoint in text? + * + * Unicode U+0000 is a valid codepoint, but a lot of software doesn't like + * it and handles it poorly. By default, we reject it, but the user may + * want to allow it. + * + * Note that because element keys rely on null termination, element keys + * cannot contain U+0000 by construction. + */ + bool allow_null_in_utf8; + /// Should we allow element key strings to be empty strings? + bool allow_empty_keys; + /// Should we allow ASCII dot "." in element key strings? + bool allow_dot_in_keys; + /** + * @brief Check for special element keys that begin with an ASCII dollar "$" + * + * By default, we ignore them and treat them as regular elements. If this is + * enabled, we reject key strings that start with a dollar, unless it is a + * special extended JSON DBRef document. + * + * This also enables DBRef validation, which checks the structure of a document + * whose first key is "$ref". + */ + bool check_special_dollar_keys; +} validation_params; + +/** + * @brief State for a validator. + */ +typedef struct { + /// The parameters that control validation behavior + const validation_params *params; + /// Error storage that is updated if any validation encounters an error + bson_error_t error; + /// The zero-based index of the byte where validation stopped in case of an error. + size_t error_offset; +} validator; + +// Undef these macros, if they are defined. +#ifdef require_with_error +#undef require_with_error +#endif +#ifdef require +#undef require +#endif +#ifdef require_advance +#undef require_advance +#endif + +/** + * @brief Check that the given condition is satisfied, or set an error and return `false` + * + * @param Condition The condition that should evaluate to `true` + * @param Offset The byte offset where an error should be indicated. + * @param Code The error code that should be set if the condition fails + * @param ... The error string and format arguments to be used in the error message + * + * This macro assumes a `validator* self` is in scope. This macro will evaluate `return false` + * if the given condition is not true. + */ +#define require_with_error(Condition, Offset, Code, ...) \ + if (!(Condition)) { \ + self->error_offset = (Offset); \ + bson_set_error (&self->error, BSON_ERROR_INVALID, Code, __VA_ARGS__); \ + return false; \ + } else \ + ((void) 0) + +/** + * @brief Check that the given condition is satisfied, or `return false` immediately. + * + * This macro does not modify the validator state. It only does an early-return. + */ +#define require(Cond) \ + if (!(Cond)) { \ + return false; \ + } else \ + ((void) 0) + +/** + * @brief Advance the pointed-to iterator, check for errors, and test whether we are done. + * + * @param DoneVar An l-value of type `bool` that is set to `true` if the iterator hit the end of + * the document, otherwise `false` + * @param IteratorPointer An expression of type `bson_iter_t*`, which will be advanced. + * + * If advancing the iterator results in a decoding error, then this macro sets an error + * on the `validator* self` that is in scope and will immediately `return false`. + */ +#define require_advance(DoneVar, IteratorPointer) \ + if ((DoneVar = !bson_iter_next (IteratorPointer))) { \ + /* The iterator indicates that it stopped */ \ + if ((IteratorPointer)->err_off) { \ + /* The iterator stopped because of a decoding error */ \ + require_with_error (false, (IteratorPointer)->err_off, BSON_VALIDATE_CORRUPT, "corrupt BSON"); \ + } \ + } else \ + ((void) 0) + +// Test if the element's key is equal to the given string +static bool +_key_is (bson_iter_t const *iter, const char *const key) +{ + BSON_ASSERT_PARAM (iter); + BSON_ASSERT_PARAM (key); + return !strcmp (bson_iter_key (iter), key); +} + +/** + * @brief Validate a document or array object, recursively. + * + * @param self The validator which will be updated and used to do the validation + * @param bson The object to be validated + * @param depth The validation depth. We indicate an error if this exceeds a limit. + * @return true If the object is valid + * @return false Otherwise + */ +static bool +_validate_doc (validator *self, const bson_t *bson, int depth); + +/** + * @brief Validate a UTF-8 string, if-and-only-if UTF-8 validation is requested + * + * @param self Pointer to the validator object + * @param offset The byte-offset of the string, used to set the error offset + * @param u8 Pointer to the first byte in a UTF-8 string + * @param u8len The length of the array pointed-to by `u8` + * @return true If the UTF-8 string is valid, or if UTF-8 validation is disabled + * @return false If UTF-8 validation is requested, AND (the UTF-8 string is invalid OR (UTF-8 strings should not contain + * null characters and the UTF-8 string contains a null character)) + */ +static bool +_maybe_validate_utf8 (validator *self, size_t offset, const char *u8, size_t u8len) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (u8); + if (self->params->allow_invalid_utf8) { + // We are not doing UTF-8 checks, so always succeed + return true; + } + // Validate UTF-8 + const bool u8okay = bson_utf8_validate (u8, u8len, self->params->allow_null_in_utf8); + if (u8okay) { + // Valid UTF-8, no more checks + return true; + } + // Validation error. It may be invalid UTF-8, or it could be valid UTF-8 with a disallowed null + if (!self->params->allow_null_in_utf8) { + // We are disallowing null in UTF-8. Check whether it is invalid UTF-8, or is + // valid UTF-8 with a null character + const bool u8okay_with_null = bson_utf8_validate (u8, u8len, true); + if (u8okay_with_null) { + // The UTF-8 is valid, but contains a null character. + require_with_error ( + false, offset, BSON_VALIDATE_UTF8_ALLOW_NULL, "UTF-8 string contains a U+0000 (null) character"); + } + } + // The UTF-8 is invalid, regardless of whether it contains a null character + require_with_error (false, offset, BSON_VALIDATE_UTF8, "Text element is not valid UTF-8"); +} + +// Same as `_maybe_validate_u8`, but relies on a null-terminated C string to get the string length +static bool +_maybe_validate_utf8_cstring (validator *self, size_t offset, const char *const u8) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (u8); + return _maybe_validate_utf8 (self, offset, u8, strlen (u8)); +} + +/** + * @brief Validate a string-like element (UTF-8, Symbol, or Code) + * + * This function relies on the representation of the text-like elements within + * the iterator struct to reduce code dup around text validation. + */ +static bool +_validate_stringlike_element (validator *self, bson_iter_t const *iter) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + // iter->d1 is the offset to the string header. Subtract 1 to exclude the null terminator + const uint32_t u8len = mlib_read_u32le (iter->raw + iter->d1) - 1; + // iter->d2 is the offset to the first byte of the string + const char *u8 = (const char *) iter->raw + iter->d2; + return _maybe_validate_utf8 (self, iter->off, u8, u8len); +} + +static bool +_validate_regex_elem (validator *self, bson_iter_t const *iter) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + mlib_check (BSON_ITER_HOLDS_REGEX (iter)); + const char *opts; + const char *const rx = bson_iter_regex (iter, &opts); + mlib_check (rx); + mlib_check (opts); + return _maybe_validate_utf8_cstring (self, iter->off, rx) // + && _maybe_validate_utf8_cstring (self, iter->off, opts); +} + +static bool +_validate_codewscope_elem (validator *self, bson_iter_t const *iter, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + mlib_check (BSON_ITER_HOLDS_CODEWSCOPE (iter)); + // Extract the code and the scope object + uint8_t const *doc; + uint32_t doc_len; + uint32_t u8len; + const char *const u8 = bson_iter_codewscope (iter, &u8len, &doc_len, &doc); + bson_t scope; + require_with_error ( + bson_init_static (&scope, doc, doc_len), iter->off, BSON_VALIDATE_CORRUPT, "corrupt scope document"); + + // Validate the code string + require (_maybe_validate_utf8 (self, iter->off, u8, u8len)); + + // Now we validate the scope object. + // Don't validate the scope document using the parent parameters, because it should + // be treated as an opaque closure of JS variables. + validation_params const scope_params = { + // JS object keys can contain dots + .allow_dot_in_keys = true, + // JS object keys can be empty + .allow_empty_keys = true, + // JS strings can contain null bytes + .allow_null_in_utf8 = true, + // JS strings need to encode properly + .allow_invalid_utf8 = false, + // JS allows object keys to have dollars + .check_special_dollar_keys = false, + }; + validator scope_validator = {.params = &scope_params}; + // We could do more validation that the scope keys are valid JS identifiers, + // but that would require using a full Unicode database. + if (_validate_doc (&scope_validator, &scope, depth)) { + // No error + return true; + } + // Validation error. Copy the error message, adding the name of the bad element + bson_set_error (&self->error, + scope_validator.error.domain, + scope_validator.error.code, + "Error in scope document for element \"%s\": %s", + bson_iter_key (iter), + scope_validator.error.message); + // Adjust the error offset by the offset of the iterator + self->error_offset = scope_validator.error_offset + iter->off; + return false; +} + +// Validate an element's key string according to the validation rules +static bool +_validate_element_key (validator *self, bson_iter_t const *iter) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + + const char *const key = bson_iter_key (iter); + mlib_check (key); + const size_t key_len = bson_iter_key_len (iter); + + // Check the UTF-8 of the key + require (_maybe_validate_utf8 (self, iter->off, key, key_len)); + + // Check for special keys + if (self->params->check_special_dollar_keys) { + // dollar-keys are checked during the startup of _validate_doc. If we get here, there's a problem. + require_with_error ( + key[0] != '$', iter->off, BSON_VALIDATE_DOLLAR_KEYS, "Disallowed '$' in element key: \"%s\"", key); + } + + if (!self->params->allow_empty_keys) { + require_with_error (key_len != 0, iter->off, BSON_VALIDATE_EMPTY_KEYS, "Element key cannot be an empty string"); + } + + if (!self->params->allow_dot_in_keys) { + require_with_error ( + !strstr (key, "."), iter->off, BSON_VALIDATE_DOT_KEYS, "Disallowed '.' in element key: \"%s\"", key); + } + + return true; +} + +// Extract a document referred-to by the given iterator. It must point to a +// document or array element. Returns `false` if `bson_init_static` returns false +static bool +_get_subdocument (bson_t *subdoc, bson_iter_t const *iter) +{ + BSON_ASSERT_PARAM (subdoc); + BSON_ASSERT_PARAM (iter); + uint32_t len = mlib_read_u32le (iter->raw + iter->d1); + uint8_t const *data = (uint8_t const *) iter->raw + iter->d1; + return bson_init_static (subdoc, data, len); +} + +// Validate the value of an element, without checking its key +static bool +_validate_element_value (validator *self, bson_iter_t const *iter, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + + const bson_type_t type = bson_iter_type (iter); + switch (type) { + default: + case BSON_TYPE_EOD: + BSON_UNREACHABLE ("Validation execution encountered an element of type 0x0, but this should not happen as tag " + "validation is handled before we get to this point."); + case BSON_TYPE_DOUBLE: + case BSON_TYPE_NULL: + case BSON_TYPE_OID: + case BSON_TYPE_INT32: + case BSON_TYPE_INT64: + case BSON_TYPE_MINKEY: + case BSON_TYPE_MAXKEY: + case BSON_TYPE_TIMESTAMP: + case BSON_TYPE_UNDEFINED: + case BSON_TYPE_DECIMAL128: + case BSON_TYPE_DATE_TIME: + case BSON_TYPE_BOOL: + // No validation on these simple scalar elements. `bson_iter_next` does validation + // on these objects for us. + return true; + case BSON_TYPE_BINARY: + // Note: BSON binary validation is handled by bson_iter_next, which checks the + // internal structure properly. If we get here, then the binary data is okay. + return true; + case BSON_TYPE_DBPOINTER: + // DBPointer contains more than just a string, but we only need to validate + // the string component, which happens to align with the repr of other stringlike + // elements. bson_iter_next will do the validation on the element's size. + //! fallthrough + case BSON_TYPE_SYMBOL: + case BSON_TYPE_CODE: + case BSON_TYPE_UTF8: + return _validate_stringlike_element (self, iter); + case BSON_TYPE_DOCUMENT: + case BSON_TYPE_ARRAY: { + bson_t doc; + require_with_error (_get_subdocument (&doc, iter), iter->off, BSON_VALIDATE_CORRUPT, "corrupt BSON"); + if (_validate_doc (self, &doc, depth)) { + // No error + return true; + } + // Error in subdocument. Adjust the error offset for the current iterator position, + // plus the key length, plus 2 for the tag and key's null terminator. + self->error_offset += iter->off + bson_iter_key_len (iter) + 2; + return false; + } + + case BSON_TYPE_REGEX: + return _validate_regex_elem (self, iter); + case BSON_TYPE_CODEWSCOPE: + return _validate_codewscope_elem (self, iter, depth); + } +} + +// Validate a single BSON element referred-to by the given iterator +static bool +_validate_element (validator *self, bson_iter_t *iter, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + return _validate_element_key (self, iter) && _validate_element_value (self, iter, depth); +} + +/** + * @brief Validate the elements of a document, beginning with the element pointed-to + * by the given iterator. + */ +static bool +_validate_remaining_elements (validator *self, bson_iter_t *iter, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + bool done = false; + while (!done) { + require (_validate_element (self, iter, depth)); + require_advance (done, iter); + } + return true; +} + +// Do validation for a DBRef document, indicated by a leading $ref key +static bool +_validate_dbref (validator *self, bson_iter_t *iter, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + + // The iterator must be pointing to the initial $ref element + mlib_check (_key_is (iter, "$ref")); + // Check that $ref is a UTF-8 element + require_with_error ( + BSON_ITER_HOLDS_UTF8 (iter), iter->off, BSON_VALIDATE_DOLLAR_KEYS, "$ref element must be a UTF-8 element"); + require (_validate_element_value (self, iter, depth)); + + // We require an $id as the next element + bool done; + require_advance (done, iter); + require_with_error ( + !done && _key_is (iter, "$id"), iter->off, BSON_VALIDATE_DOLLAR_KEYS, "Expected an $id element following $ref"); + // While $id is typically a OID value, it is not constraint to any specific type, so + // we just validate it as an arbitrary value. + require (_validate_element_value (self, iter, depth)); + + // We should stop, or we should have a $db, or we may have other elements + require_advance (done, iter); + if (done) { + // No more elements. Nothing left to check + return true; + } + // If it's a $db, check that it's a UTF-8 string + if (_key_is (iter, "$db")) { + require_with_error (BSON_ITER_HOLDS_UTF8 (iter), + iter->off, + BSON_VALIDATE_DOLLAR_KEYS, + "$db element in DBRef must be a UTF-8 element"); + require (_validate_element_value (self, iter, depth)); + // Advance past the $db + require_advance (done, iter); + if (done) { + // Nothing left to do + return true; + } + } + // All subsequent elements should be validated as normal, and we don't expect + // any more $-keys + return _validate_remaining_elements (self, iter, depth); +} + +// If we are validating special $-keys, validate a document whose first element is a $-key +static bool +_validate_dollar_doc (validator *self, bson_iter_t *iter, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (iter); + if (_key_is (iter, "$ref")) { + return _validate_dbref (self, iter, depth); + } + // Have the element key validator issue an error message about the bad $-key + bool okay = _validate_element_key (self, iter); + mlib_check (!okay); + return false; +} + +static bool +_validate_doc (validator *self, const bson_t *bson, int depth) +{ + BSON_ASSERT_PARAM (self); + BSON_ASSERT_PARAM (bson); + + require_with_error ( + depth <= BSON_VALIDATION_MAX_NESTING_DEPTH, 0, BSON_VALIDATE_CORRUPT, "BSON document nesting depth is too deep"); + // We increment the depth here, otherwise we'd have `depth + 1` in several places. + ++depth; + + // Initialize an iterator into the document to be validated + bson_iter_t iter; + require_with_error ( + bson_iter_init (&iter, bson), 0, BSON_VALIDATE_CORRUPT, "Document header corruption, unable to iterate"); + bool done; + require_advance (done, &iter); + if (done) { + // Nothing to check (empty doc/array) + return true; + } + + // Check if the first key starts with a dollar + if (self->params->check_special_dollar_keys) { + const char *const key = bson_iter_key (&iter); + if (key[0] == '$') { + return _validate_dollar_doc (self, &iter, depth); + } + } + + return _validate_remaining_elements (self, &iter, depth); +} + +// This private function is called by `bson_validate_with_error_and_offset` +bool +_bson_validate_impl_v2 (const bson_t *bson, bson_validate_flags_t flags, size_t *offset, bson_error_t *error) +{ + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (offset); + BSON_ASSERT_PARAM (error); + + // Clear the error + *error = (bson_error_t){0}; + + // Initialize validation parameters + validation_params const params = { + .allow_invalid_utf8 = !(flags & BSON_VALIDATE_UTF8), + .allow_null_in_utf8 = flags & BSON_VALIDATE_UTF8_ALLOW_NULL, + .check_special_dollar_keys = (flags & BSON_VALIDATE_DOLLAR_KEYS), + .allow_dot_in_keys = !(flags & BSON_VALIDATE_DOT_KEYS), + .allow_empty_keys = !(flags & BSON_VALIDATE_EMPTY_KEYS), + }; + + // Start the validator on the root document + validator v = {.params = ¶ms}; + bool okay = _validate_doc (&v, bson, 0); + *offset = v.error_offset; + *error = v.error; + mlib_check (okay == (v.error.code == 0) && + "Validation routine should return `false` if-and-only-if it sets an error code"); + return okay; +} diff -pruN 1.30.4-1/src/libbson/src/bson-config.cmake 2.0.2-1/src/libbson/src/bson-config.cmake --- 1.30.4-1/src/libbson/src/bson-config.cmake 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/bson-config.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -include(CMakeFindDependencyMacro) -find_dependency(Threads) # Required for Threads::Threads - -# Import common targets first: -include("${CMAKE_CURRENT_LIST_DIR}/bson-targets.cmake") - -# Now import the targets of each link-kind that's available. Only the targets of -# libbson libraries that were actually installed alongside this file will be -# imported. -file(GLOB target_files "${CMAKE_CURRENT_LIST_DIR}/bson_*-targets.cmake") -foreach(inc IN LISTS target_files) - include("${inc}") -endforeach() diff -pruN 1.30.4-1/src/libbson/src/jsonsl/jsonsl.c 2.0.2-1/src/libbson/src/jsonsl/jsonsl.c --- 1.30.4-1/src/libbson/src/jsonsl/jsonsl.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/jsonsl/jsonsl.c 2025-06-19 15:42:22.000000000 +0000 @@ -9,77 +9,6 @@ #include #include -#ifdef JSONSL_USE_METRICS -#define XMETRICS \ - X(STRINGY_INSIGNIFICANT) \ - X(STRINGY_SLOWPATH) \ - X(ALLOWED_WHITESPACE) \ - X(QUOTE_FASTPATH) \ - X(SPECIAL_FASTPATH) \ - X(SPECIAL_WSPOP) \ - X(SPECIAL_SLOWPATH) \ - X(GENERIC) \ - X(STRUCTURAL_TOKEN) \ - X(SPECIAL_SWITCHFIRST) \ - X(STRINGY_CATCH) \ - X(NUMBER_FASTPATH) \ - X(ESCAPES) \ - X(TOTAL) \ - -struct jsonsl_metrics_st { -#define X(m) \ - unsigned long metric_##m; - XMETRICS -#undef X -}; - -static struct jsonsl_metrics_st GlobalMetrics = { 0 }; -static unsigned long GenericCounter[0x100] = { 0 }; -static unsigned long StringyCatchCounter[0x100] = { 0 }; - -#define INCR_METRIC(m) \ - GlobalMetrics.metric_##m++; - -#define INCR_GENERIC(c) \ - INCR_METRIC(GENERIC); \ - GenericCounter[c]++; \ - -#define INCR_STRINGY_CATCH(c) \ - INCR_METRIC(STRINGY_CATCH); \ - StringyCatchCounter[c]++; - -JSONSL_API -void jsonsl_dump_global_metrics(void) -{ - int ii; - printf("JSONSL Metrics:\n"); -#define X(m) \ - printf("\t%-30s %20lu (%0.2f%%)\n", #m, GlobalMetrics.metric_##m, \ - (float)((float)(GlobalMetrics.metric_##m/(float)GlobalMetrics.metric_TOTAL)) * 100); - XMETRICS -#undef X - printf("Generic Characters:\n"); - for (ii = 0; ii < 0xff; ii++) { - if (GenericCounter[ii]) { - printf("\t[ %c ] %lu\n", ii, GenericCounter[ii]); - } - } - printf("Weird string loop\n"); - for (ii = 0; ii < 0xff; ii++) { - if (StringyCatchCounter[ii]) { - printf("\t[ %c ] %lu\n", ii, StringyCatchCounter[ii]); - } - } -} - -#else -#define INCR_METRIC(m) -#define INCR_GENERIC(c) -#define INCR_STRINGY_CATCH(c) -JSONSL_API -void jsonsl_dump_global_metrics(void) { } -#endif /* JSONSL_USE_METRICS */ - #define CASE_DIGITS \ case '1': \ case '2': \ @@ -99,7 +28,6 @@ static int is_allowed_escape(unsigned); static int is_simple_char(unsigned); static char get_escape_equiv(unsigned); -JSONSL_API jsonsl_t jsonsl_new(int nlevels) { unsigned int ii; @@ -123,7 +51,6 @@ jsonsl_t jsonsl_new(int nlevels) return jsn; } -JSONSL_API void jsonsl_reset(jsonsl_t jsn) { jsn->tok_last = 0; @@ -135,7 +62,6 @@ void jsonsl_reset(jsonsl_t jsn) jsn->expecting = 0; } -JSONSL_API void jsonsl_destroy(jsonsl_t jsn) { if (jsn) { @@ -170,8 +96,6 @@ jsonsl__str_fastparse(jsonsl_t jsn, *bytes >= 0x100 || #endif /* JSONSL_USE_WCHAR */ (is_simple_char(*bytes))) { - INCR_METRIC(TOTAL); - INCR_METRIC(STRINGY_INSIGNIFICANT); } else { /* Once we're done here, re-calculate the position variables */ jsn->pos += (bytes - *bytes_p); @@ -200,8 +124,6 @@ jsonsl__num_fastparse(jsonsl_t jsn, for (; nbytes; nbytes--, bytes++) { jsonsl_uchar_t c = *bytes; if (isdigit(c)) { - INCR_METRIC(TOTAL); - INCR_METRIC(NUMBER_FASTPATH); state->nelem = (state->nelem * 10) + (c - 0x30); } else { exhausted = 0; @@ -217,7 +139,6 @@ jsonsl__num_fastparse(jsonsl_t jsn, return FASTPARSE_BREAK; } -JSONSL_API void jsonsl_feed(jsonsl_t jsn, const jsonsl_char_t *bytes, size_t nbytes) { @@ -237,15 +158,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c state->ignore_callback = jsn->stack[jsn->level-1].ignore_callback; \ state->pos_begin = jsn->pos; -#define STACK_POP_NOPOS \ - state->pos_cur = jsn->pos; \ - state = jsn->stack + (--jsn->level); - - -#define STACK_POP \ - STACK_POP_NOPOS; \ - state->pos_cur = jsn->pos; - #define CALLBACK_AND_POP_NOPOS(T) \ state->pos_cur = jsn->pos; \ DO_CALLBACK(T, POP); \ @@ -314,7 +226,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c for (; nbytes; nbytes--, jsn->pos++, c++) { unsigned state_type; - INCR_METRIC(TOTAL); GT_AGAIN: state_type = state->type; @@ -347,7 +258,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c INVOKE_ERROR(WEIRD_WHITESPACE); } } - INCR_METRIC(STRINGY_SLOWPATH); } else if (state_type == JSONSL_T_SPECIAL) { /* Fast track for signed/unsigned */ @@ -476,7 +386,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c } #endif } - INCR_METRIC(SPECIAL_FASTPATH); CONTINUE_NEXT_CHAR(); } @@ -529,7 +438,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c */ goto GT_STRUCTURAL_TOKEN; } else if (is_allowed_whitespace(CUR_CHAR)) { - INCR_METRIC(ALLOWED_WHITESPACE); /* So we're not special. Harmless insignificant whitespace * passthrough */ @@ -539,8 +447,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c goto GT_SPECIAL_BEGIN; } - INCR_GENERIC(CUR_CHAR); - if (CUR_CHAR == '"') { GT_QUOTE: jsn->can_insert = 0; @@ -601,7 +507,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c } /* switch(state->type) */ } else if (CUR_CHAR == '\\') { GT_ESCAPE: - INCR_METRIC(ESCAPES); /* Escape */ if ( (state->type & JSONSL_Tf_STRINGY) == 0 ) { INVOKE_ERROR(ESCAPE_OUTSIDE_STRING); @@ -614,7 +519,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c GT_STRUCTURAL_TOKEN: switch (CUR_CHAR) { case ':': - INCR_METRIC(STRUCTURAL_TOKEN); if (jsn->expecting != CUR_CHAR) { INVOKE_ERROR(STRAY_TOKEN); } @@ -624,7 +528,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c CONTINUE_NEXT_CHAR(); case ',': - INCR_METRIC(STRUCTURAL_TOKEN); /** * The comma is one of the more generic tokens. * In the context of an OBJECT, the can_insert flag @@ -653,7 +556,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c /* hashes are more common */ case '{': case '[': - INCR_METRIC(STRUCTURAL_TOKEN); if (!jsn->can_insert) { INVOKE_ERROR(CANT_INSERT); } @@ -681,7 +583,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c /* closing of list or object */ case '}': case ']': - INCR_METRIC(STRUCTURAL_TOKEN); if (jsn->tok_last == ',' && jsn->options.allow_trailing_comma == 0) { INVOKE_ERROR(TRAILING_COMMA); } @@ -754,7 +655,6 @@ jsonsl_feed(jsonsl_t jsn, const jsonsl_c } } -JSONSL_API const char* jsonsl_strerror(jsonsl_error_t err) { if (err == JSONSL_ERROR_SUCCESS) { @@ -768,7 +668,6 @@ const char* jsonsl_strerror(jsonsl_error return ""; } -JSONSL_API const char *jsonsl_strtype(jsonsl_type_t type) { #define X(o,c) \ @@ -786,7 +685,6 @@ const char *jsonsl_strtype(jsonsl_type_t * * */ -#ifndef JSONSL_NO_JPR static jsonsl_jpr_type_t populate_component(char *in, @@ -879,7 +777,6 @@ populate_component(char *in, return ret; } -JSONSL_API jsonsl_jpr_t jsonsl_jpr_new(const char *path, jsonsl_error_t *errp) { @@ -1030,7 +927,6 @@ jsonsl__match_continue(jsonsl_jpr_t jpr, } } -JSONSL_API jsonsl_jpr_match_t jsonsl_path_match(jsonsl_jpr_t jpr, const struct jsonsl_state_st *parent, @@ -1061,7 +957,6 @@ jsonsl_path_match(jsonsl_jpr_t jpr, return jsonsl__match_continue(jpr, comp, parent->level, child->type); } -JSONSL_API jsonsl_jpr_match_t jsonsl_jpr_match(jsonsl_jpr_t jpr, unsigned int parent_type, @@ -1139,7 +1034,6 @@ jsonsl_jpr_match(jsonsl_jpr_t jpr, return JSONSL_MATCH_NOMATCH; } -JSONSL_API void jsonsl_jpr_match_state_init(jsonsl_t jsn, jsonsl_jpr_t *jprs, size_t njprs) @@ -1160,7 +1054,6 @@ void jsonsl_jpr_match_state_init(jsonsl_ } } -JSONSL_API void jsonsl_jpr_match_state_cleanup(jsonsl_t jsn) { if (jsn->jpr_count == 0) { @@ -1187,7 +1080,6 @@ void jsonsl_jpr_match_state_cleanup(json * main lexer itself. * */ -JSONSL_API jsonsl_jpr_t jsonsl_jpr_match_state(jsonsl_t jsn, struct jsonsl_state_st *state, const char *key, @@ -1252,7 +1144,6 @@ jsonsl_jpr_t jsonsl_jpr_match_state(json return NULL; } -JSONSL_API const char *jsonsl_strmatchtype(jsonsl_jpr_match_t match) { #define X(T,v) \ @@ -1263,8 +1154,6 @@ const char *jsonsl_strmatchtype(jsonsl_j return ""; } -#endif /* JSONSL_WITH_JPR */ - static char * jsonsl__writeutf8(uint32_t pt, char *out) { @@ -1330,7 +1219,6 @@ jsonsl__get_uescape_16(const char *s) /** * Utility function to convert escape sequences */ -JSONSL_API size_t jsonsl_util_unescape_ex(const char *in, char *out, size_t len, @@ -1658,14 +1546,9 @@ static int is_simple_char(unsigned c) { } /* Clean up all our macros! */ -#undef INCR_METRIC -#undef INCR_GENERIC -#undef INCR_STRINGY_CATCH #undef CASE_DIGITS #undef INVOKE_ERROR #undef STACK_PUSH -#undef STACK_POP_NOPOS -#undef STACK_POP #undef CALLBACK_AND_POP_NOPOS #undef CALLBACK_AND_POP #undef SPECIAL_POP diff -pruN 1.30.4-1/src/libbson/src/jsonsl/jsonsl.h 2.0.2-1/src/libbson/src/jsonsl/jsonsl.h --- 1.30.4-1/src/libbson/src/jsonsl/jsonsl.h 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/src/jsonsl/jsonsl.h 2025-06-19 15:42:22.000000000 +0000 @@ -73,19 +73,6 @@ typedef int ssize_t; #define JSONSL_JPR_COMPONENT_USER_FIELDS #endif -#ifndef JSONSL_API -/** - * We require a /DJSONSL_DLL so that users already using this as a static - * or embedded library don't get confused - */ -#if defined(_WIN32) && defined(JSONSL_DLL) -#define JSONSL_API __declspec(dllexport) -#else -#define JSONSL_API -#endif /* _WIN32 */ - -#endif /* !JSONSL_API */ - #ifndef JSONSL_INLINE #if defined(_MSC_VER) #define JSONSL_INLINE __inline @@ -554,13 +541,11 @@ struct jsonsl_st { int can_insert; unsigned int levels_max; -#ifndef JSONSL_NO_JPR size_t jpr_count; jsonsl_jpr_t *jprs; /* Root pointer for JPR matching information */ size_t *jpr_root; -#endif /* JSONSL_NO_JPR */ /*@}*/ /** @@ -577,7 +562,6 @@ struct jsonsl_st { * * @param nlevels maximum recursion depth */ -JSONSL_API jsonsl_t jsonsl_new(int nlevels); /** @@ -587,7 +571,6 @@ jsonsl_t jsonsl_new(int nlevels); * @param bytes new data to be fed * @param nbytes size of new data */ -JSONSL_API void jsonsl_feed(jsonsl_t jsn, const jsonsl_char_t *bytes, size_t nbytes); /** @@ -597,7 +580,6 @@ void jsonsl_feed(jsonsl_t jsn, const jso * * @param jsn the lexer */ -JSONSL_API void jsonsl_reset(jsonsl_t jsn); /** @@ -605,7 +587,6 @@ void jsonsl_reset(jsonsl_t jsn); * * @param jsn the lexer */ -JSONSL_API void jsonsl_destroy(jsonsl_t jsn); /** @@ -675,22 +656,10 @@ void jsonsl_enable_all_callbacks(jsonsl_ * of the error or type, respectively. They will never * return NULL */ -JSONSL_API const char* jsonsl_strerror(jsonsl_error_t err); -JSONSL_API const char* jsonsl_strtype(jsonsl_type_t jt); /** - * Dumps global metrics to the screen. This is a noop unless - * jsonsl was compiled with JSONSL_USE_METRICS - */ -JSONSL_API -void jsonsl_dump_global_metrics(void); - -/* This macro just here for editors to do code folding */ -#ifndef JSONSL_NO_JPR - -/** * @name JSON Pointer API * * JSONPointer API. This isn't really related to the lexer (at least not yet) @@ -803,13 +772,11 @@ struct jsonsl_jpr_st { * * @return a new jsonsl_jpr_t object, or NULL on error. */ -JSONSL_API jsonsl_jpr_t jsonsl_jpr_new(const char *path, jsonsl_error_t *errp); /** * Destroy a JPR object */ -JSONSL_API void jsonsl_jpr_destroy(jsonsl_jpr_t jpr); /** @@ -830,7 +797,6 @@ void jsonsl_jpr_destroy(jsonsl_jpr_t jpr * @return a status constant. This indicates whether a match was excluded, possible, * or successful. */ -JSONSL_API jsonsl_jpr_match_t jsonsl_jpr_match(jsonsl_jpr_t jpr, unsigned int parent_type, unsigned int parent_level, @@ -861,7 +827,6 @@ jsonsl_jpr_match_t jsonsl_jpr_match(json * Since this function also checks the state of the child, it should only * be called on PUSH callbacks, and not POP callbacks */ -JSONSL_API jsonsl_jpr_match_t jsonsl_path_match(jsonsl_jpr_t jpr, const struct jsonsl_state_st *parent, @@ -885,7 +850,6 @@ jsonsl_path_match(jsonsl_jpr_t jpr, * @param jprs An array of jsonsl_jpr_t objects * @param njprs How many elements in the jprs array. */ -JSONSL_API void jsonsl_jpr_match_state_init(jsonsl_t jsn, jsonsl_jpr_t *jprs, size_t njprs); @@ -910,7 +874,6 @@ void jsonsl_jpr_match_state_init(jsonsl_ * does not mean matching has failed, it can still be part of the match: check * the out parameter). */ -JSONSL_API jsonsl_jpr_t jsonsl_jpr_match_state(jsonsl_t jsn, struct jsonsl_state_st *state, const char *key, @@ -923,13 +886,11 @@ jsonsl_jpr_t jsonsl_jpr_match_state(json * match_state_init() and match_state() * @param jsn The lexer */ -JSONSL_API void jsonsl_jpr_match_state_cleanup(jsonsl_t jsn); /** * Return a string representation of the match result returned by match() */ -JSONSL_API const char *jsonsl_strmatchtype(jsonsl_jpr_match_t match); /* @}*/ @@ -982,7 +943,6 @@ const char *jsonsl_strmatchtype(jsonsl_j * (i.e. \uXXXX) will occupy six bytes in the source, but at the most * two bytes when escaped. */ -JSONSL_API size_t jsonsl_util_unescape_ex(const char *in, char *out, size_t len, @@ -997,8 +957,6 @@ size_t jsonsl_util_unescape_ex(const cha #define jsonsl_util_unescape(in, out, len, toEscape, err) \ jsonsl_util_unescape_ex(in, out, len, toEscape, NULL, err, NULL) -#endif /* JSONSL_NO_JPR */ - #ifdef __cplusplus } #endif /* __cplusplus */ diff -pruN 1.30.4-1/src/libbson/tests/json/bson_binary_vector/float32.json 2.0.2-1/src/libbson/tests/json/bson_binary_vector/float32.json --- 1.30.4-1/src/libbson/tests/json/bson_binary_vector/float32.json 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/json/bson_binary_vector/float32.json 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,65 @@ +{ + "description": "Tests of Binary subtype 9, Vectors, with dtype FLOAT32", + "test_key": "vector", + "tests": [ + { + "description": "Simple Vector FLOAT32", + "valid": true, + "vector": [127.0, 7.0], + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "padding": 0, + "canonical_bson": "1C00000005766563746F72000A0000000927000000FE420000E04000" + }, + { + "description": "Vector with decimals and negative value FLOAT32", + "valid": true, + "vector": [127.7, -7.7], + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "padding": 0, + "canonical_bson": "1C00000005766563746F72000A0000000927006666FF426666F6C000" + }, + { + "description": "Empty Vector FLOAT32", + "valid": true, + "vector": [], + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "padding": 0, + "canonical_bson": "1400000005766563746F72000200000009270000" + }, + { + "description": "Infinity Vector FLOAT32", + "valid": true, + "vector": [{"$numberDouble": "-Infinity"}, 0.0, {"$numberDouble": "Infinity"} ], + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "padding": 0, + "canonical_bson": "2000000005766563746F72000E000000092700000080FF000000000000807F00" + }, + { + "description": "FLOAT32 with padding", + "valid": false, + "vector": [127.0, 7.0], + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "padding": 3, + "canonical_bson": "1C00000005766563746F72000A0000000927030000FE420000E04000" + }, + { + "description": "Insufficient vector data with 3 bytes FLOAT32", + "valid": false, + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "canonical_bson": "1700000005766563746F7200050000000927002A2A2A00" + }, + { + "description": "Insufficient vector data with 5 bytes FLOAT32", + "valid": false, + "dtype_hex": "0x27", + "dtype_alias": "FLOAT32", + "canonical_bson": "1900000005766563746F7200070000000927002A2A2A2A2A00" + } + ] +} diff -pruN 1.30.4-1/src/libbson/tests/json/bson_binary_vector/int8.json 2.0.2-1/src/libbson/tests/json/bson_binary_vector/int8.json --- 1.30.4-1/src/libbson/tests/json/bson_binary_vector/int8.json 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/json/bson_binary_vector/int8.json 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,57 @@ +{ + "description": "Tests of Binary subtype 9, Vectors, with dtype INT8", + "test_key": "vector", + "tests": [ + { + "description": "Simple Vector INT8", + "valid": true, + "vector": [127, 7], + "dtype_hex": "0x03", + "dtype_alias": "INT8", + "padding": 0, + "canonical_bson": "1600000005766563746F7200040000000903007F0700" + }, + { + "description": "Empty Vector INT8", + "valid": true, + "vector": [], + "dtype_hex": "0x03", + "dtype_alias": "INT8", + "padding": 0, + "canonical_bson": "1400000005766563746F72000200000009030000" + }, + { + "description": "Overflow Vector INT8", + "valid": false, + "vector": [128], + "dtype_hex": "0x03", + "dtype_alias": "INT8", + "padding": 0 + }, + { + "description": "Underflow Vector INT8", + "valid": false, + "vector": [-129], + "dtype_hex": "0x03", + "dtype_alias": "INT8", + "padding": 0 + }, + { + "description": "INT8 with padding", + "valid": false, + "vector": [127, 7], + "dtype_hex": "0x03", + "dtype_alias": "INT8", + "padding": 3, + "canonical_bson": "1600000005766563746F7200040000000903037F0700" + }, + { + "description": "INT8 with float inputs", + "valid": false, + "vector": [127.77, 7.77], + "dtype_hex": "0x03", + "dtype_alias": "INT8", + "padding": 0 + } + ] +} diff -pruN 1.30.4-1/src/libbson/tests/json/bson_binary_vector/packed_bit.json 2.0.2-1/src/libbson/tests/json/bson_binary_vector/packed_bit.json --- 1.30.4-1/src/libbson/tests/json/bson_binary_vector/packed_bit.json 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/json/bson_binary_vector/packed_bit.json 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,83 @@ +{ + "description": "Tests of Binary subtype 9, Vectors, with dtype PACKED_BIT", + "test_key": "vector", + "tests": [ + { + "description": "Padding specified with no vector data PACKED_BIT", + "valid": false, + "vector": [], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 1, + "canonical_bson": "1400000005766563746F72000200000009100100" + }, + { + "description": "Simple Vector PACKED_BIT", + "valid": true, + "vector": [127, 7], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 0, + "canonical_bson": "1600000005766563746F7200040000000910007F0700" + }, + { + "description": "Empty Vector PACKED_BIT", + "valid": true, + "vector": [], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 0, + "canonical_bson": "1400000005766563746F72000200000009100000" + }, + { + "description": "PACKED_BIT with padding", + "valid": true, + "vector": [127, 7], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 3, + "canonical_bson": "1600000005766563746F7200040000000910037F0700" + }, + { + "description": "Overflow Vector PACKED_BIT", + "valid": false, + "vector": [256], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 0 + }, + { + "description": "Underflow Vector PACKED_BIT", + "valid": false, + "vector": [-1], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 0 + }, + { + "description": "Vector with float values PACKED_BIT", + "valid": false, + "vector": [127.5], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 0 + }, + { + "description": "Exceeding maximum padding PACKED_BIT", + "valid": false, + "vector": [1], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": 8, + "canonical_bson": "1500000005766563746F7200030000000910080100" + }, + { + "description": "Negative padding PACKED_BIT", + "valid": false, + "vector": [1], + "dtype_hex": "0x10", + "dtype_alias": "PACKED_BIT", + "padding": -1 + } + ] +} diff -pruN 1.30.4-1/src/libbson/tests/json/bson_corpus/binary.json 2.0.2-1/src/libbson/tests/json/bson_corpus/binary.json --- 1.30.4-1/src/libbson/tests/json/bson_corpus/binary.json 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/json/bson_corpus/binary.json 2025-06-19 15:42:22.000000000 +0000 @@ -74,6 +74,36 @@ "description": "$type query operator (conflicts with legacy $binary form with $type field)", "canonical_bson": "180000000378001000000010247479706500020000000000", "canonical_extjson": "{\"x\" : { \"$type\" : {\"$numberInt\": \"2\"}}}" + }, + { + "description": "subtype 0x09 Vector FLOAT32", + "canonical_bson": "170000000578000A0000000927000000FE420000E04000", + "canonical_extjson": "{\"x\": {\"$binary\": {\"base64\": \"JwAAAP5CAADgQA==\", \"subType\": \"09\"}}}" + }, + { + "description": "subtype 0x09 Vector INT8", + "canonical_bson": "11000000057800040000000903007F0700", + "canonical_extjson": "{\"x\": {\"$binary\": {\"base64\": \"AwB/Bw==\", \"subType\": \"09\"}}}" + }, + { + "description": "subtype 0x09 Vector PACKED_BIT", + "canonical_bson": "11000000057800040000000910007F0700", + "canonical_extjson": "{\"x\": {\"$binary\": {\"base64\": \"EAB/Bw==\", \"subType\": \"09\"}}}" + }, + { + "description": "subtype 0x09 Vector (Zero-length) FLOAT32", + "canonical_bson": "0F0000000578000200000009270000", + "canonical_extjson": "{\"x\": {\"$binary\": {\"base64\": \"JwA=\", \"subType\": \"09\"}}}" + }, + { + "description": "subtype 0x09 Vector (Zero-length) INT8", + "canonical_bson": "0F0000000578000200000009030000", + "canonical_extjson": "{\"x\": {\"$binary\": {\"base64\": \"AwA=\", \"subType\": \"09\"}}}" + }, + { + "description": "subtype 0x09 Vector (Zero-length) PACKED_BIT", + "canonical_bson": "0F0000000578000200000009100000", + "canonical_extjson": "{\"x\": {\"$binary\": {\"base64\": \"EAA=\", \"subType\": \"09\"}}}" } ], "decodeErrors": [ diff -pruN 1.30.4-1/src/libbson/tests/json/bson_corpus/top.json 2.0.2-1/src/libbson/tests/json/bson_corpus/top.json --- 1.30.4-1/src/libbson/tests/json/bson_corpus/top.json 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/json/bson_corpus/top.json 2025-06-19 15:42:22.000000000 +0000 @@ -96,11 +96,11 @@ }, { "description": "Bad $regularExpression (pattern is number, not string)", - "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": 42, \"$options\" : \"\"}}}" + "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": 42, \"options\" : \"\"}}}" }, { "description": "Bad $regularExpression (options are number, not string)", - "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": \"a\", \"$options\" : 0}}}" + "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": \"a\", \"options\" : 0}}}" }, { "description" : "Bad $regularExpression (missing pattern field)", diff -pruN 1.30.4-1/src/libbson/tests/test-atomic.c 2.0.2-1/src/libbson/tests/test-atomic.c --- 1.30.4-1/src/libbson/tests/test-atomic.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-atomic.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,127 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#include - -#include "TestSuite.h" - -#define ATOMIC(Kind, Operation) BSON_CONCAT4 (bson_atomic_, Kind, _, Operation) - - -#define TEST_KIND_WITH_MEMORDER(Kind, TypeName, MemOrder, Assert) \ - do { \ - int i; \ - TypeName got; \ - TypeName value = 0; \ - got = ATOMIC (Kind, fetch) (&value, MemOrder); \ - Assert (got, ==, 0); \ - got = ATOMIC (Kind, fetch_add) (&value, 42, MemOrder); \ - Assert (got, ==, 0); \ - Assert (value, ==, 42); \ - got = ATOMIC (Kind, fetch_sub) (&value, 7, MemOrder); \ - Assert (got, ==, 42); \ - Assert (value, ==, 35); \ - got = ATOMIC (Kind, exchange) (&value, 77, MemOrder); \ - Assert (got, ==, 35); \ - Assert (value, ==, 77); \ - /* Compare-exchange fail: */ \ - got = ATOMIC (Kind, compare_exchange_strong) (&value, 4, 9, MemOrder); \ - Assert (got, ==, 77); \ - Assert (value, ==, 77); \ - /* Compare-exchange succeed: */ \ - got = ATOMIC (Kind, compare_exchange_strong) (&value, 77, 9, MemOrder); \ - Assert (got, ==, 77); \ - Assert (value, ==, 9); \ - /* Compare-exchange fail: */ \ - got = ATOMIC (Kind, compare_exchange_weak) (&value, 8, 12, MemOrder); \ - Assert (got, ==, 9); \ - Assert (value, ==, 9); \ - /* Compare-exchange-weak succeed: */ \ - /* 'weak' may fail spuriously, so it must *eventually* succeed */ \ - for (i = 0; i < 10000 && value != 53; ++i) { \ - got = ATOMIC (Kind, compare_exchange_weak) (&value, 9, 53, MemOrder); \ - Assert (got, ==, 9); \ - } \ - /* Check that it evenutally succeeded */ \ - Assert (value, ==, 53); \ - } while (0) - -#define TEST_INTEGER_KIND(Kind, TypeName, Assert) \ - do { \ - TEST_KIND_WITH_MEMORDER (Kind, TypeName, bson_memory_order_relaxed, Assert); \ - TEST_KIND_WITH_MEMORDER (Kind, TypeName, bson_memory_order_acq_rel, Assert); \ - TEST_KIND_WITH_MEMORDER (Kind, TypeName, bson_memory_order_acquire, Assert); \ - TEST_KIND_WITH_MEMORDER (Kind, TypeName, bson_memory_order_release, Assert); \ - TEST_KIND_WITH_MEMORDER (Kind, TypeName, bson_memory_order_consume, Assert); \ - TEST_KIND_WITH_MEMORDER (Kind, TypeName, bson_memory_order_seq_cst, Assert); \ - } while (0) - - -static void -test_integers (void) -{ - TEST_INTEGER_KIND (int64, int64_t, ASSERT_CMPINT64); - TEST_INTEGER_KIND (int32, int32_t, ASSERT_CMPINT32); - TEST_INTEGER_KIND (int16, int16_t, ASSERT_CMPINT); - TEST_INTEGER_KIND (int8, int8_t, ASSERT_CMPINT); - TEST_INTEGER_KIND (int, int, ASSERT_CMPINT); -} - - -static void -test_pointers (void) -{ - int u = 12; - int v = 9; - int w = 91; - int *ptr = &v; - int *other; - int *prev; - other = bson_atomic_ptr_fetch ((void *) &ptr, bson_memory_order_relaxed); - ASSERT_CMPVOID (other, ==, ptr); - prev = bson_atomic_ptr_exchange ((void *) &other, &u, bson_memory_order_relaxed); - ASSERT_CMPVOID (prev, ==, &v); - ASSERT_CMPVOID (other, ==, &u); - prev = bson_atomic_ptr_compare_exchange_strong ((void *) &other, &v, &w, bson_memory_order_relaxed); - ASSERT_CMPVOID (prev, ==, &u); - ASSERT_CMPVOID (other, ==, &u); - prev = bson_atomic_ptr_compare_exchange_strong ((void *) &other, &u, &w, bson_memory_order_relaxed); - ASSERT_CMPVOID (prev, ==, &u); - ASSERT_CMPVOID (other, ==, &w); -} - - -static void -test_thread_fence (void) -{ - bson_atomic_thread_fence (); -} - -static void -test_thrd_yield (void) -{ - bson_thrd_yield (); -} - -void -test_atomic_install (TestSuite *suite) -{ - TestSuite_Add (suite, "/atomic/integers", test_integers); - TestSuite_Add (suite, "/atomic/pointers", test_pointers); - TestSuite_Add (suite, "/atomic/thread_fence", test_thread_fence); - TestSuite_Add (suite, "/atomic/thread_yield", test_thrd_yield); -} diff -pruN 1.30.4-1/src/libbson/tests/test-b64.c 2.0.2-1/src/libbson/tests/test-b64.c --- 1.30.4-1/src/libbson/tests/test-b64.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-b64.c 2025-06-19 15:42:22.000000000 +0000 @@ -18,7 +18,7 @@ #include "TestSuite.h" #include -#include +#include static void _test_encode_helper (char *input, size_t input_len, char *expected_output, int expected_output_len) @@ -34,7 +34,7 @@ _test_encode_helper (char *input, size_t ASSERT_CMPSIZE_T (target_size, ==, (size_t) expected_output_len + 1); /* returned value does not count trailing NULL. */ ret = mcommon_b64_ntop ((uint8_t *) input, input_len, output, target_size); - ASSERT (mcommon_cmp_equal_us (target_size - 1u, ret)); + ASSERT (mlib_cmp (target_size - 1u, ==, ret)); ASSERT_CMPSTR (output, expected_output); bson_free (output); } diff -pruN 1.30.4-1/src/libbson/tests/test-bson-cmp.c 2.0.2-1/src/libbson/tests/test-bson-cmp.c --- 1.30.4-1/src/libbson/tests/test-bson-cmp.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-bson-cmp.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,308 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "TestSuite.h" - -#include - -static void -test_bson_cmp_equal (void) -{ - BSON_ASSERT (bson_cmp_equal_ss (0, 0)); - BSON_ASSERT (!bson_cmp_equal_ss (0, -1)); - BSON_ASSERT (!bson_cmp_equal_ss (0, 1)); - BSON_ASSERT (!bson_cmp_equal_ss (-1, 0)); - BSON_ASSERT (bson_cmp_equal_ss (-1, -1)); - BSON_ASSERT (!bson_cmp_equal_ss (-1, 1)); - BSON_ASSERT (!bson_cmp_equal_ss (1, 0)); - BSON_ASSERT (!bson_cmp_equal_ss (1, -1)); - BSON_ASSERT (bson_cmp_equal_ss (1, 1)); - - BSON_ASSERT (bson_cmp_equal_uu (0u, 0u)); - BSON_ASSERT (!bson_cmp_equal_uu (0u, 1u)); - BSON_ASSERT (!bson_cmp_equal_uu (1u, 0u)); - BSON_ASSERT (bson_cmp_equal_uu (1u, 1u)); - - BSON_ASSERT (bson_cmp_equal_su (0, 0u)); - BSON_ASSERT (!bson_cmp_equal_su (0, 1u)); - BSON_ASSERT (!bson_cmp_equal_su (-1, 0u)); - BSON_ASSERT (!bson_cmp_equal_su (-1, 1u)); - BSON_ASSERT (!bson_cmp_equal_su (1, 0u)); - BSON_ASSERT (bson_cmp_equal_su (1, 1u)); - - BSON_ASSERT (bson_cmp_equal_us (0u, 0)); - BSON_ASSERT (!bson_cmp_equal_us (0u, -1)); - BSON_ASSERT (!bson_cmp_equal_us (0u, 1)); - BSON_ASSERT (!bson_cmp_equal_us (1u, 0)); - BSON_ASSERT (!bson_cmp_equal_us (1u, -1)); - BSON_ASSERT (bson_cmp_equal_us (1u, 1)); -} - -static void -test_bson_cmp_not_equal (void) -{ - BSON_ASSERT (!bson_cmp_not_equal_ss (0, 0)); - BSON_ASSERT (bson_cmp_not_equal_ss (0, -1)); - BSON_ASSERT (bson_cmp_not_equal_ss (0, 1)); - BSON_ASSERT (bson_cmp_not_equal_ss (-1, 0)); - BSON_ASSERT (!bson_cmp_not_equal_ss (-1, -1)); - BSON_ASSERT (bson_cmp_not_equal_ss (-1, 1)); - BSON_ASSERT (bson_cmp_not_equal_ss (1, 0)); - BSON_ASSERT (bson_cmp_not_equal_ss (1, -1)); - BSON_ASSERT (!bson_cmp_not_equal_ss (1, 1)); - - BSON_ASSERT (!bson_cmp_not_equal_uu (0u, 0u)); - BSON_ASSERT (bson_cmp_not_equal_uu (0u, 1u)); - BSON_ASSERT (bson_cmp_not_equal_uu (1u, 0u)); - BSON_ASSERT (!bson_cmp_not_equal_uu (1u, 1u)); - - BSON_ASSERT (!bson_cmp_not_equal_su (0, 0u)); - BSON_ASSERT (bson_cmp_not_equal_su (0, 1u)); - BSON_ASSERT (bson_cmp_not_equal_su (-1, 0u)); - BSON_ASSERT (bson_cmp_not_equal_su (-1, 1u)); - BSON_ASSERT (bson_cmp_not_equal_su (1, 0u)); - BSON_ASSERT (!bson_cmp_not_equal_su (1, 1u)); - - BSON_ASSERT (!bson_cmp_not_equal_us (0u, 0)); - BSON_ASSERT (bson_cmp_not_equal_us (0u, -1)); - BSON_ASSERT (bson_cmp_not_equal_us (0u, 1)); - BSON_ASSERT (bson_cmp_not_equal_us (1u, 0)); - BSON_ASSERT (bson_cmp_not_equal_us (1u, -1)); - BSON_ASSERT (!bson_cmp_not_equal_us (1u, 1)); -} - -static void -test_bson_cmp_less (void) -{ - BSON_ASSERT (!bson_cmp_less_ss (0, 0)); - BSON_ASSERT (!bson_cmp_less_ss (0, -1)); - BSON_ASSERT (bson_cmp_less_ss (0, 1)); - BSON_ASSERT (bson_cmp_less_ss (-1, 0)); - BSON_ASSERT (!bson_cmp_less_ss (-1, -1)); - BSON_ASSERT (bson_cmp_less_ss (-1, 1)); - BSON_ASSERT (!bson_cmp_less_ss (1, 0)); - BSON_ASSERT (!bson_cmp_less_ss (1, -1)); - BSON_ASSERT (!bson_cmp_less_ss (1, 1)); - - BSON_ASSERT (!bson_cmp_less_uu (0u, 0u)); - BSON_ASSERT (bson_cmp_less_uu (0u, 1u)); - BSON_ASSERT (!bson_cmp_less_uu (1u, 0u)); - BSON_ASSERT (!bson_cmp_less_uu (1u, 1u)); - - BSON_ASSERT (!bson_cmp_less_su (0, 0u)); - BSON_ASSERT (bson_cmp_less_su (0, 1u)); - BSON_ASSERT (bson_cmp_less_su (-1, 0u)); - BSON_ASSERT (bson_cmp_less_su (-1, 1u)); - BSON_ASSERT (!bson_cmp_less_su (1, 0u)); - BSON_ASSERT (!bson_cmp_less_su (1, 1u)); - - BSON_ASSERT (!bson_cmp_less_us (0u, 0)); - BSON_ASSERT (!bson_cmp_less_us (0u, -1)); - BSON_ASSERT (bson_cmp_less_us (0u, 1)); - BSON_ASSERT (!bson_cmp_less_us (1u, 0)); - BSON_ASSERT (!bson_cmp_less_us (1u, -1)); - BSON_ASSERT (!bson_cmp_less_us (1u, 1)); -} - -static void -test_bson_cmp_greater (void) -{ - BSON_ASSERT (!bson_cmp_greater_ss (0, 0)); - BSON_ASSERT (bson_cmp_greater_ss (0, -1)); - BSON_ASSERT (!bson_cmp_greater_ss (0, 1)); - BSON_ASSERT (!bson_cmp_greater_ss (-1, 0)); - BSON_ASSERT (!bson_cmp_greater_ss (-1, -1)); - BSON_ASSERT (!bson_cmp_greater_ss (-1, 1)); - BSON_ASSERT (bson_cmp_greater_ss (1, 0)); - BSON_ASSERT (bson_cmp_greater_ss (1, -1)); - BSON_ASSERT (!bson_cmp_greater_ss (1, 1)); - - BSON_ASSERT (!bson_cmp_greater_uu (0u, 0u)); - BSON_ASSERT (!bson_cmp_greater_uu (0u, 1u)); - BSON_ASSERT (bson_cmp_greater_uu (1u, 0u)); - BSON_ASSERT (!bson_cmp_greater_uu (1u, 1u)); - - BSON_ASSERT (!bson_cmp_greater_su (0, 0u)); - BSON_ASSERT (!bson_cmp_greater_su (0, 1u)); - BSON_ASSERT (!bson_cmp_greater_su (-1, 0u)); - BSON_ASSERT (!bson_cmp_greater_su (-1, 1u)); - BSON_ASSERT (bson_cmp_greater_su (1, 0u)); - BSON_ASSERT (!bson_cmp_greater_su (1, 1u)); - - BSON_ASSERT (!bson_cmp_greater_us (0u, 0)); - BSON_ASSERT (bson_cmp_greater_us (0u, -1)); - BSON_ASSERT (!bson_cmp_greater_us (0u, 1)); - BSON_ASSERT (bson_cmp_greater_us (1u, 0)); - BSON_ASSERT (bson_cmp_greater_us (1u, -1)); - BSON_ASSERT (!bson_cmp_greater_us (1u, 1)); -} - -static void -test_bson_cmp_less_equal (void) -{ - BSON_ASSERT (bson_cmp_less_equal_ss (0, 0)); - BSON_ASSERT (!bson_cmp_less_equal_ss (0, -1)); - BSON_ASSERT (bson_cmp_less_equal_ss (0, 1)); - BSON_ASSERT (bson_cmp_less_equal_ss (-1, 0)); - BSON_ASSERT (bson_cmp_less_equal_ss (-1, -1)); - BSON_ASSERT (bson_cmp_less_equal_ss (-1, 1)); - BSON_ASSERT (!bson_cmp_less_equal_ss (1, 0)); - BSON_ASSERT (!bson_cmp_less_equal_ss (1, -1)); - BSON_ASSERT (bson_cmp_less_equal_ss (1, 1)); - - BSON_ASSERT (bson_cmp_less_equal_uu (0u, 0u)); - BSON_ASSERT (bson_cmp_less_equal_uu (0u, 1u)); - BSON_ASSERT (!bson_cmp_less_equal_uu (1u, 0u)); - BSON_ASSERT (bson_cmp_less_equal_uu (1u, 1u)); - - BSON_ASSERT (bson_cmp_less_equal_su (0, 0u)); - BSON_ASSERT (bson_cmp_less_equal_su (0, 1u)); - BSON_ASSERT (bson_cmp_less_equal_su (-1, 0u)); - BSON_ASSERT (bson_cmp_less_equal_su (-1, 1u)); - BSON_ASSERT (!bson_cmp_less_equal_su (1, 0u)); - BSON_ASSERT (bson_cmp_less_equal_su (1, 1u)); - - BSON_ASSERT (bson_cmp_less_equal_us (0u, 0)); - BSON_ASSERT (!bson_cmp_less_equal_us (0u, -1)); - BSON_ASSERT (bson_cmp_less_equal_us (0u, 1)); - BSON_ASSERT (!bson_cmp_less_equal_us (1u, 0)); - BSON_ASSERT (!bson_cmp_less_equal_us (1u, -1)); - BSON_ASSERT (bson_cmp_less_equal_us (1u, 1)); -} - -static void -test_bson_cmp_greater_equal (void) -{ - BSON_ASSERT (bson_cmp_greater_equal_ss (0, 0)); - BSON_ASSERT (bson_cmp_greater_equal_ss (0, -1)); - BSON_ASSERT (!bson_cmp_greater_equal_ss (0, 1)); - BSON_ASSERT (!bson_cmp_greater_equal_ss (-1, 0)); - BSON_ASSERT (bson_cmp_greater_equal_ss (-1, -1)); - BSON_ASSERT (!bson_cmp_greater_equal_ss (-1, 1)); - BSON_ASSERT (bson_cmp_greater_equal_ss (1, 0)); - BSON_ASSERT (bson_cmp_greater_equal_ss (1, -1)); - BSON_ASSERT (bson_cmp_greater_equal_ss (1, 1)); - - BSON_ASSERT (bson_cmp_greater_equal_uu (0u, 0u)); - BSON_ASSERT (!bson_cmp_greater_equal_uu (0u, 1u)); - BSON_ASSERT (bson_cmp_greater_equal_uu (1u, 0u)); - BSON_ASSERT (bson_cmp_greater_equal_uu (1u, 1u)); - - BSON_ASSERT (bson_cmp_greater_equal_su (0, 0u)); - BSON_ASSERT (!bson_cmp_greater_equal_su (0, 1u)); - BSON_ASSERT (!bson_cmp_greater_equal_su (-1, 0u)); - BSON_ASSERT (!bson_cmp_greater_equal_su (-1, 1u)); - BSON_ASSERT (bson_cmp_greater_equal_su (1, 0u)); - BSON_ASSERT (bson_cmp_greater_equal_su (1, 1u)); - - BSON_ASSERT (bson_cmp_greater_equal_us (0u, 0)); - BSON_ASSERT (bson_cmp_greater_equal_us (0u, -1)); - BSON_ASSERT (!bson_cmp_greater_equal_us (0u, 1)); - BSON_ASSERT (bson_cmp_greater_equal_us (1u, 0)); - BSON_ASSERT (bson_cmp_greater_equal_us (1u, -1)); - BSON_ASSERT (bson_cmp_greater_equal_us (1u, 1)); -} - -/* Sanity check: ensure ssize_t limits are as expected relative to size_t. */ -BSON_STATIC_ASSERT2 (ssize_t_size_min_check, SSIZE_MIN + 1 == -SSIZE_MAX); -BSON_STATIC_ASSERT2 (ssize_t_size_max_check, (size_t) SSIZE_MAX <= SIZE_MAX); - -static void -test_bson_in_range (void) -{ - const int64_t int8_min = INT8_MIN; - const int64_t int8_max = INT8_MAX; - const int64_t int32_min = INT32_MIN; - const int64_t int32_max = INT32_MAX; - - const uint64_t uint8_max = UINT8_MAX; - const uint64_t uint32_max = UINT32_MAX; - - const ssize_t ssize_min = SSIZE_MIN; - const ssize_t ssize_max = SSIZE_MAX; - - BSON_ASSERT (!bson_in_range_signed (int8_t, int8_min - 1)); - BSON_ASSERT (bson_in_range_signed (int8_t, int8_min)); - BSON_ASSERT (bson_in_range_signed (int8_t, 0)); - BSON_ASSERT (bson_in_range_signed (int8_t, int8_max)); - BSON_ASSERT (!bson_in_range_signed (int8_t, int8_max + 1)); - - BSON_ASSERT (bson_in_range_unsigned (int8_t, 0u)); - BSON_ASSERT (bson_in_range_unsigned (int8_t, (uint64_t) int8_max)); - BSON_ASSERT (!bson_in_range_unsigned (int8_t, (uint64_t) (int8_max + 1))); - - BSON_ASSERT (!bson_in_range_signed (uint8_t, int8_min - 1)); - BSON_ASSERT (!bson_in_range_signed (uint8_t, int8_min)); - BSON_ASSERT (bson_in_range_signed (uint8_t, 0)); - BSON_ASSERT (bson_in_range_signed (uint8_t, int8_max)); - BSON_ASSERT (bson_in_range_signed (uint8_t, int8_max + 1)); - BSON_ASSERT (bson_in_range_signed (uint8_t, (int64_t) uint8_max)); - BSON_ASSERT (!bson_in_range_signed (uint8_t, (int64_t) uint8_max + 1)); - - BSON_ASSERT (bson_in_range_unsigned (uint8_t, 0u)); - BSON_ASSERT (bson_in_range_unsigned (uint8_t, uint8_max)); - BSON_ASSERT (!bson_in_range_unsigned (uint8_t, uint8_max + 1u)); - - BSON_ASSERT (!bson_in_range_signed (int32_t, int32_min - 1)); - BSON_ASSERT (bson_in_range_signed (int32_t, int32_min)); - BSON_ASSERT (bson_in_range_signed (int32_t, 0)); - BSON_ASSERT (bson_in_range_signed (int32_t, int32_max)); - BSON_ASSERT (!bson_in_range_signed (int32_t, int32_max + 1)); - - BSON_ASSERT (bson_in_range_unsigned (int32_t, 0u)); - BSON_ASSERT (bson_in_range_unsigned (int32_t, (uint64_t) int32_max)); - BSON_ASSERT (!bson_in_range_unsigned (int32_t, (uint64_t) (int32_max + 1))); - - BSON_ASSERT (!bson_in_range_signed (uint32_t, int32_min - 1)); - BSON_ASSERT (!bson_in_range_signed (uint32_t, int32_min)); - BSON_ASSERT (bson_in_range_signed (uint32_t, 0)); - BSON_ASSERT (bson_in_range_signed (uint32_t, int32_max)); - BSON_ASSERT (bson_in_range_signed (uint32_t, int32_max + 1)); - BSON_ASSERT (bson_in_range_signed (uint32_t, (int64_t) uint32_max)); - BSON_ASSERT (!bson_in_range_signed (uint32_t, (int64_t) uint32_max + 1)); - - BSON_ASSERT (bson_in_range_unsigned (uint32_t, 0u)); - BSON_ASSERT (bson_in_range_unsigned (uint32_t, uint32_max)); - BSON_ASSERT (!bson_in_range_unsigned (uint32_t, uint32_max + 1u)); - - BSON_ASSERT (bson_in_range_signed (ssize_t, ssize_min)); - BSON_ASSERT (bson_in_range_signed (ssize_t, 0)); - BSON_ASSERT (bson_in_range_signed (ssize_t, ssize_max)); - - BSON_ASSERT (bson_in_range_unsigned (ssize_t, 0u)); - BSON_ASSERT (bson_in_range_unsigned (ssize_t, (size_t) ssize_max)); - BSON_ASSERT (!bson_in_range_unsigned (ssize_t, (size_t) ssize_max + 1u)); - - BSON_ASSERT (!bson_in_range_signed (size_t, ssize_min)); - BSON_ASSERT (bson_in_range_signed (size_t, 0)); - BSON_ASSERT (bson_in_range_signed (size_t, ssize_max)); - - BSON_ASSERT (bson_in_range_unsigned (size_t, 0u)); - BSON_ASSERT (bson_in_range_unsigned (size_t, (size_t) ssize_max)); - BSON_ASSERT (bson_in_range_unsigned (size_t, (size_t) ssize_max + 1u)); -} - -void -test_bson_cmp_install (TestSuite *suite) -{ - TestSuite_Add (suite, "/bson/cmp/equal", test_bson_cmp_equal); - TestSuite_Add (suite, "/bson/cmp/not_equal", test_bson_cmp_not_equal); - TestSuite_Add (suite, "/bson/cmp/less", test_bson_cmp_less); - TestSuite_Add (suite, "/bson/cmp/greater", test_bson_cmp_greater); - TestSuite_Add (suite, "/bson/cmp/less_equal", test_bson_cmp_less_equal); - TestSuite_Add (suite, "/bson/cmp/greater_equal", test_bson_cmp_greater_equal); - TestSuite_Add (suite, "/bson/cmp/in_range", test_bson_in_range); -} diff -pruN 1.30.4-1/src/libbson/tests/test-bson-error.c 2.0.2-1/src/libbson/tests/test-bson-error.c --- 1.30.4-1/src/libbson/tests/test-bson-error.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-bson-error.c 2025-06-19 15:42:22.000000000 +0000 @@ -24,10 +24,11 @@ test_bson_error_basic (void) { bson_error_t error; - bson_set_error (&error, 123, 456, "%s %d", "localhost", 27017); - BSON_ASSERT (!strcmp (error.message, "localhost 27017")); + bson_set_error (&error, 123, 456, "%s:%d", "localhost", 27017); + ASSERT_CMPSTR (error.message, "localhost:27017"); ASSERT_CMPUINT32 (error.domain, ==, 123u); ASSERT_CMPUINT32 (error.code, ==, 456u); + ASSERT_CMPUINT (error.reserved, ==, 1u); // BSON_ERROR_CATEGORY } static void @@ -39,6 +40,10 @@ test_bson_strerror_r (void) char *errmsg = bson_strerror_r (errno, errmsg_buf, sizeof errmsg_buf); // Check a message is returned. Do not check platform-dependent contents: ASSERT (errmsg); + const char *unknown_msg = "Unknown error"; + if (strstr (errmsg, unknown_msg)) { + test_error ("Expected error message to contain platform-dependent content, not: '%s'", errmsg); + } } void diff -pruN 1.30.4-1/src/libbson/tests/test-bson-sync.c 2.0.2-1/src/libbson/tests/test-bson-sync.c --- 1.30.4-1/src/libbson/tests/test-bson-sync.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-bson-sync.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* - * Copyright 2009-present MongoDB, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#include -#include // BEGIN_IGNORE_DEPRECATIONS - -#include "TestSuite.h" - -static void -test_bson_sync_synchronize (void) -{ - BEGIN_IGNORE_DEPRECATIONS - - // This doesn't test for correct functionality, only that it exists and can be called - bson_sync_synchronize (); - - END_IGNORE_DEPRECATIONS -} - -void -test_bson_sync_install (TestSuite *suite) -{ - TestSuite_Add (suite, "/bson/sync/synchronize", test_bson_sync_synchronize); -} diff -pruN 1.30.4-1/src/libbson/tests/test-bson-vector.c 2.0.2-1/src/libbson/tests/test-bson-vector.c --- 1.30.4-1/src/libbson/tests/test-bson-vector.c 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-bson-vector.c 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,1572 @@ +/* + * Copyright 2009-present MongoDB, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include + +#include "bsonutil/bson-parser.h" +#include "TestSuite.h" +#include "test-conveniences.h" +#include "json-test.h" + +#ifdef _MSC_VER +#define SSCANF sscanf_s +#else +#define SSCANF sscanf +#endif + +struct view_abi_reference_type { + void *data; + uint32_t data_len; + uint8_t header_0; + uint8_t header_1; +}; + +/* ABI: Make sure vector views have the expected size. */ +#define EXPECTED_VECTOR_VIEW_SIZE (sizeof (struct view_abi_reference_type)) +BSON_STATIC_ASSERT2 (sizeof_bson_vector_int8_const_view_t, + sizeof (bson_vector_int8_const_view_t) == EXPECTED_VECTOR_VIEW_SIZE); +BSON_STATIC_ASSERT2 (sizeof_bson_vector_int8_view_t, sizeof (bson_vector_int8_view_t) == EXPECTED_VECTOR_VIEW_SIZE); +BSON_STATIC_ASSERT2 (sizeof_bson_vector_float32_const_view_t, + sizeof (bson_vector_float32_const_view_t) == EXPECTED_VECTOR_VIEW_SIZE); +BSON_STATIC_ASSERT2 (sizeof_bson_vector_float32_view_t, + sizeof (bson_vector_float32_view_t) == EXPECTED_VECTOR_VIEW_SIZE); +BSON_STATIC_ASSERT2 (sizeof_bson_vector_packed_bit_const_view_t, + sizeof (bson_vector_packed_bit_const_view_t) == EXPECTED_VECTOR_VIEW_SIZE); +BSON_STATIC_ASSERT2 (sizeof_bson_vector_packed_bit_view_t, + sizeof (bson_vector_packed_bit_view_t) == EXPECTED_VECTOR_VIEW_SIZE); +#undef EXPECTED_VECTOR_VIEW_SIZE + +typedef struct vector_json_test_case_t { + char *scenario_description, *scenario_test_key; + char *test_description, *test_dtype_hex_str, *test_dtype_alias_str, *test_canonical_bson_str; + bson_t *test_vector_array; + int64_t *test_padding; + bool *test_valid; +} vector_json_test_case_t; + +static bool +append_vector_packed_bit_from_packed_array ( + bson_t *bson, const char *key, int key_length, const bson_iter_t *iter, int64_t padding, bson_error_t *error) +{ + // (Spec test improvement TODO) This implements something the test covers that our API doesn't. If the test + // were modified to cover element-by-element conversion, this can be replaced with + // bson_append_vector_packed_bit_from_array. + + BSON_ASSERT_PARAM (bson); + BSON_ASSERT_PARAM (key); + BSON_ASSERT_PARAM (iter); + + size_t byte_count = 0; + { + bson_iter_t validation_iter = *iter; + while (bson_iter_next (&validation_iter)) { + if (!BSON_ITER_HOLDS_INT (&validation_iter)) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_TYPE, + "expected int32 or int64 in BSON array key '%s', found item type 0x%02X", + bson_iter_key (&validation_iter), + (unsigned) bson_iter_type (&validation_iter)); + return false; + } + int64_t byte_as_int64 = bson_iter_as_int64 (&validation_iter); + if (byte_as_int64 < 0 || byte_as_int64 > UINT8_MAX) { + bson_set_error (error, + BSON_ERROR_VECTOR, + BSON_VECTOR_ERROR_ARRAY_ELEMENT_VALUE, + "BSON array key '%s' value %" PRId64 " is out of range for packed byte", + bson_iter_key (&validation_iter), + byte_as_int64); + return false; + } + byte_count++; + } + } + + if (padding < 0 || padding > 7) { + bson_set_error (error, + TEST_ERROR_DOMAIN, + TEST_ERROR_CODE, + "'padding' parameter (%" PRId64 + ") for append_vector_packed_bit_from_packed_array is out of range", + padding); + return false; + } + if (byte_count < 1 && padding > 0) { + bson_set_error (error, + TEST_ERROR_DOMAIN, + TEST_ERROR_CODE, + "nonzero 'padding' parameter (%" PRId64 + ") for zero-length append_vector_packed_bit_from_packed_array", + padding); + return false; + } + + bson_vector_packed_bit_view_t view; + if (bson_append_vector_packed_bit_uninit (bson, key, key_length, byte_count * 8u - (size_t) padding, &view)) { + bson_iter_t copy_iter = *iter; + for (size_t i = 0; i < byte_count; i++) { + ASSERT (bson_iter_next (©_iter)); + uint8_t packed_byte = (uint8_t) bson_iter_as_int64 (©_iter); + ASSERT (bson_vector_packed_bit_view_write_packed (view, &packed_byte, 1, i)); + } + return true; + } else { + return false; + } +} + +static void +hex_str_to_bson (bson_t *bson_out, const char *hex_str) +{ + uint32_t size = (uint32_t) strlen (hex_str) / 2u; + uint8_t *buffer = bson_reserve_buffer (bson_out, size); + for (uint32_t i = 0; i < size; i++) { + unsigned int byte; + ASSERT (SSCANF (&hex_str[i * 2], "%2x", &byte) == 1); + buffer[i] = (uint8_t) byte; + } +} + +// Implement spec tests, given parsed arguments +static void +test_bson_vector_json_case (vector_json_test_case_t *test_case) +{ + bson_t expected_bson = BSON_INITIALIZER; + if (test_case->test_canonical_bson_str) { + hex_str_to_bson (&expected_bson, test_case->test_canonical_bson_str); + } + + ASSERT (test_case->test_valid); + ASSERT (test_case->test_dtype_hex_str); + ASSERT (test_case->scenario_test_key); + + bson_t vector_from_array = BSON_INITIALIZER; + bson_error_t vector_from_array_error; + bool vector_from_array_ok; + + // (Spec test improvement TODO) Patch test cases that have unused bits set to '1' when '0' is required. + if (0 == strcmp ("PACKED_BIT with padding", test_case->test_description)) { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &expected_bson, test_case->scenario_test_key)); + uint32_t binary_len; + uint8_t *binary; + bson_iter_overwrite_binary (&iter, BSON_SUBTYPE_VECTOR, &binary_len, &binary); + ASSERT (binary_len > BSON_VECTOR_HEADER_LEN); + binary[binary_len - 1] &= (uint8_t) 0xFF << bson_vector_padding_from_header_byte_1 (binary[1]); + } + + // Try a format conversion from array to the indicated vector format. + // The spec calls the first header byte "dtype" (combining the element type and element size fields) + if (0 == strcmp ("0x03", test_case->test_dtype_hex_str)) { + // int8 vector from int32/int64 array + bson_iter_t iter; + bool padding_ok = !test_case->test_padding || *test_case->test_padding == 0; + vector_from_array_ok = test_case->test_vector_array && padding_ok && + bson_iter_init (&iter, test_case->test_vector_array) && + BSON_APPEND_VECTOR_INT8_FROM_ARRAY ( + &vector_from_array, test_case->scenario_test_key, &iter, &vector_from_array_error); + } else if (0 == strcmp ("0x27", test_case->test_dtype_hex_str)) { + // float32 vector from float64 array + bson_iter_t iter; + bool padding_ok = !test_case->test_padding || *test_case->test_padding == 0; + vector_from_array_ok = test_case->test_vector_array && padding_ok && + bson_iter_init (&iter, test_case->test_vector_array) && + BSON_APPEND_VECTOR_FLOAT32_FROM_ARRAY ( + &vector_from_array, test_case->scenario_test_key, &iter, &vector_from_array_error); + } else if (0 == strcmp ("0x10", test_case->test_dtype_hex_str)) { + // packed_bit from packed bytes in an int array, with "padding" parameter supplied separately. + // Suggested changes to reduce the special cases here: + // - Array-to-Vector should be defined as an element-by-element conversion. This test shouldn't operate on packed + // representations. + // - Include additional JSON tests for packed access, distinct from Array conversion. + // - Tests should keep the unused bits zeroed as required. + // (Spec test improvement TODO) + bson_iter_t iter; + if (!test_case->test_padding) { + test_error ("test '%s' is missing required 'padding' field", test_case->test_description); + } + vector_from_array_ok = test_case->test_vector_array && bson_iter_init (&iter, test_case->test_vector_array) && + append_vector_packed_bit_from_packed_array (&vector_from_array, + test_case->scenario_test_key, + -1, + &iter, + *test_case->test_padding, + &vector_from_array_error); + } else { + test_error ( + "test '%s' has unsupported dtype_hex format '%s'", test_case->test_description, test_case->test_dtype_hex_str); + } + + if (*test_case->test_valid) { + /* + * "To prove correct in a valid case (valid: true), one MUST + * - encode a document from the numeric values, dtype, and padding, along with the "test_key", and assert this + * matches the canonical_bson string. + * - decode the canonical_bson into its binary form, and then assert that the numeric values, dtype, and padding + * all match those provided in the JSON." + */ + + // Check the vector-from-array performed above ("encode") + + if (!test_case->test_vector_array) { + test_error ("test '%s' should be valid, but missing 'vector' field", test_case->test_description); + } + + if (!vector_from_array_ok) { + test_error ("test '%s' should be valid, but vector-from-array failed: %s", + test_case->test_description, + vector_from_array_error.message); + } + + if (0 != bson_compare (&vector_from_array, &expected_bson)) { + test_error ("test '%s' did not exactly match the reference document.\n " + "Actual: %s\n Expected: %s", + test_case->test_description, + tmp_json (&vector_from_array), + tmp_json (&expected_bson)); + } + + // Perform an array-from-vector and check it ("decode") + + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &expected_bson, test_case->scenario_test_key)); + + bson_t array_from_vector = BSON_INITIALIZER; + { + bson_array_builder_t *array_builder = bson_array_builder_new (); + if (!bson_array_builder_append_vector_elements (array_builder, &iter)) { + test_error ("test '%s' should be valid but failed array-from-vector conversion", + test_case->test_description); + } + ASSERT (bson_array_builder_build (array_builder, &array_from_vector)); + bson_array_builder_destroy (array_builder); + } + + if (BSON_ITER_HOLDS_VECTOR_FLOAT32 (&iter)) { + // float32 special case: Due to underspecified rounding and conversion rules we compare value inexactly. + // (Spec test improvement TODO) + + bson_iter_t actual_iter, expected_iter; + ASSERT (bson_iter_init (&actual_iter, &array_from_vector)); + ASSERT (bson_iter_init (&expected_iter, test_case->test_vector_array)); + + for (size_t i = 0;; i++) { + bool actual_next = bson_iter_next (&actual_iter); + bool expected_next = bson_iter_next (&expected_iter); + if (!actual_next && !expected_next) { + break; + } else if (!actual_next) { + test_error ("converted array is shorter than expected"); + } else if (!expected_next) { + test_error ("converted array is longer than expected"); + } + + if (!BSON_ITER_HOLDS_DOUBLE (&actual_iter)) { + test_error ("converted array element %d has unexpected type, should be double", (int) i); + } + double actual_double = bson_iter_double (&actual_iter); + + double expected_double; + if (BSON_ITER_HOLDS_DOUBLE (&expected_iter)) { + expected_double = bson_iter_double (&expected_iter); + } else { + test_error ("test-vector array element %d has unexpected type, should be double, 'inf', or '-inf'.", + (int) i); + } + + bool is_sorta_equal = false; + if (expected_double != expected_double) { + // Expect NaN, any type is fine. + if (actual_double != actual_double) { + is_sorta_equal = true; + } + } else if (expected_double == 0.0 || expected_double * 0.0 != 0.0) { + // Infinity or zero, equality comparison is fine. + is_sorta_equal = expected_double == actual_double; + } else { + // Finite number, allow +/- error relative to the scale of the expected value. + // Note that ASSERT_EQUAL_DOUBLE() in TestSuite exists but its fixed error threshold of 20% seems too + // loose for this application. + static const double allowed_relative_error = 1e-7; + double allowed_absolute_error = fabs (allowed_relative_error * expected_double); + is_sorta_equal = actual_double >= expected_double - allowed_absolute_error && + actual_double <= expected_double + allowed_absolute_error; + } + if (!is_sorta_equal) { + test_error ("test-vector array element %d failed inexact float32 match. Actual: %f Expected: %f", + (int) i, + actual_double, + expected_double); + } + } + + } else if (BSON_ITER_HOLDS_VECTOR_PACKED_BIT (&iter)) { + // packed_bit special case: The tests for packed_bit aren't actually testing vector-to-array conversion as we + // understand it, they're operating on bytes rather than elements. This is the inverse of + // append_vector_packed_bit_from_packed_array() above, and it bypasses the vector-to-array conversion. + // 'array_from_vector' is ignored on this path. + // (Spec test improvement TODO) + + bson_iter_t expected_iter; + ASSERT (bson_iter_init (&expected_iter, test_case->test_vector_array)); + bson_vector_packed_bit_const_view_t actual_view; + ASSERT (bson_vector_packed_bit_const_view_from_iter (&actual_view, &iter)); + + size_t byte_count = 0; + while (bson_iter_next (&expected_iter)) { + int64_t expected_byte; + if (BSON_ITER_HOLDS_INT (&expected_iter)) { + expected_byte = bson_iter_as_int64 (&expected_iter); + } else { + test_error ("test-vector array element %d has unexpected type, should be int.", (int) byte_count); + } + + // (Spec test improvement TODO) Packed writes can't set unused bits to '1' in libbson, but the spec + // tests allow padding bits to take on undefined values. Modify the expected values to keep padding bits + // zeroed. + if (0 == strcmp ("PACKED_BIT with padding", test_case->test_description) && + byte_count == bson_vector_packed_bit_const_view_length_bytes (actual_view) - 1u) { + expected_byte &= ((int64_t) 0xFF << *test_case->test_padding) & 0xFF; + } + + // Note, the zero initializer is only needed due to a false positive -Wmaybe-uninitialized warning in + // uncommon configurations where the compiler does not have visibility into memcpy(). + uint8_t actual_byte = 0; + ASSERT (bson_vector_packed_bit_const_view_read_packed (actual_view, &actual_byte, 1, byte_count)); + + if (expected_byte != (int64_t) actual_byte) { + test_error ("failed to match packed byte %d of packed_bit test-vector. Actual: 0x%02x Expected: 0x%02x", + (int) byte_count, + (unsigned) actual_byte, + (unsigned) expected_byte); + } + byte_count++; + } + ASSERT_CMPSIZE_T (byte_count, ==, bson_vector_packed_bit_const_view_length_bytes (actual_view)); + + } else { + // No special case, expect an exact match. (Used for int8 vectors) + if (0 != bson_compare (&array_from_vector, test_case->test_vector_array)) { + test_error ("bson_binary_vector JSON scenario '%s' test '%s' did not exactly match the reference array " + "after array-from-vector.\n " + "Actual: %s\n Expected: %s", + test_case->scenario_description, + test_case->test_description, + tmp_json (&array_from_vector), + tmp_json (test_case->test_vector_array)); + } + } + + bson_destroy (&array_from_vector); + } else { + /* + * "To prove correct in an invalid case (valid:false), one MUST + * - if the vector field is present, raise an exception when attempting to encode a document from the numeric + * values, dtype, and padding. + * - if the canonical_bson field is present, raise an exception when attempting to deserialize it into the + * corresponding numeric values, as the field contains corrupted data." + */ + + if (vector_from_array_ok) { + test_error ("bson_binary_vector JSON scenario '%s' test '%s' should be invalid but vector-from-array " + "succeeded with result: %s", + test_case->scenario_description, + test_case->test_description, + tmp_json (&vector_from_array)); + } + + if (test_case->test_canonical_bson_str) { + bson_t array_from_vector = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &expected_bson, test_case->scenario_test_key)); + if (BSON_APPEND_ARRAY_FROM_VECTOR (&array_from_vector, "should_fail", &iter)) { + test_error ("bson_binary_vector JSON scenario '%s' test '%s' should be invalid but array-from-vector " + "succeeded with result: %s", + test_case->scenario_description, + test_case->test_description, + tmp_json (&array_from_vector)); + } + bson_destroy (&array_from_vector); + } + } + + bson_destroy (&expected_bson); +} + +// callback for install_json_test_suite_with_check, implements JSON spec tests +static void +test_bson_vector_json_cb (void *test_arg) +{ + BSON_ASSERT_PARAM (test_arg); + bson_t *scenario = (bson_t *) test_arg; + bson_error_t error; + vector_json_test_case_t test_case; + + bson_parser_t *scenario_opts = bson_parser_new (); + bson_t *tests; + bson_parser_utf8 (scenario_opts, "description", &test_case.scenario_description); + bson_parser_utf8 (scenario_opts, "test_key", &test_case.scenario_test_key); + bson_parser_array (scenario_opts, "tests", &tests); + if (!bson_parser_parse (scenario_opts, scenario, &error)) { + test_error ("format error in bson_binary_vector JSON scenario: %s", error.message); + } + + bson_iter_t tests_iter; + ASSERT (bson_iter_init (&tests_iter, tests)); + while (bson_iter_next (&tests_iter)) { + bson_t test_subdoc; + bson_iter_bson (&tests_iter, &test_subdoc); + + bson_parser_t *test_opts = bson_parser_new (); + bson_parser_utf8 (test_opts, "description", &test_case.test_description); + bson_parser_bool (test_opts, "valid", &test_case.test_valid); + bson_parser_array_optional (test_opts, "vector", &test_case.test_vector_array); + bson_parser_utf8 (test_opts, "dtype_hex", &test_case.test_dtype_hex_str); + bson_parser_utf8 (test_opts, "dtype_alias", &test_case.test_dtype_alias_str); + bson_parser_int_optional (test_opts, "padding", &test_case.test_padding); + bson_parser_utf8_optional (test_opts, "canonical_bson", &test_case.test_canonical_bson_str); + if (!bson_parser_parse (test_opts, &test_subdoc, &error)) { + test_error ( + "format error in bson_binary_vector JSON test for '%s': %s", test_case.scenario_description, error.message); + } + + if (test_suite_debug_output ()) { + printf ("bson_binary_vector JSON scenario '%s' test '%s'\n", + test_case.scenario_description, + test_case.test_description); + } + + test_bson_vector_json_case (&test_case); + bson_parser_destroy_with_parsed_fields (test_opts); + } + bson_parser_destroy_with_parsed_fields (scenario_opts); +} + +static void +test_bson_vector_view_api_usage_int8 (void) +{ + bson_t doc = BSON_INITIALIZER; + + // Construct a small vector by writing individual elements + { + bson_vector_int8_view_t view; + const size_t length = 25; + ASSERT (BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "vector", length, &view)); + for (size_t i = 0; i < length; i++) { + int8_t v = (int8_t) i - 9; + bson_vector_int8_view_write (view, &v, 1, i); + } + } + + ASSERT_CMPJSON ( + bson_as_canonical_extended_json (&doc, NULL), + BSON_STR ({"vector" : {"$binary" : {"base64" : "AwD3+Pn6+/z9/v8AAQIDBAUGBwgJCgsMDQ4P", "subType" : "09"}}})); + + // Construct a longer vector by writing individual elements + { + bson_vector_int8_view_t view; + const size_t length = 50000; + ASSERT (bson_append_vector_int8_uninit (&doc, "longer_vector", -1, length, &view)); + for (size_t i = 0; i < length; i++) { + int8_t v = (int8_t) (uint8_t) i; + bson_vector_int8_view_write (view, &v, 1, i); + } + } + + // Fail appending a vector that would be too large to represent + { + bson_vector_int8_view_t view; + const size_t length = UINT32_MAX - 1; + ASSERT (!bson_append_vector_int8_uninit (&doc, "overlong_vector", -1, length, &view)); + } + + // Use a mutable view to partially overwrite "vector" + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + bson_vector_int8_view_t view; + ASSERT (bson_vector_int8_view_from_iter (&view, &iter)); + ASSERT (bson_vector_int8_view_length (view) == 25); + int8_t values[5] = {12, 34, 56, 78, 90}; + ASSERT (bson_vector_int8_view_write (view, values, sizeof values / sizeof values[0], 3)); + } + + // Read the modified small vector into an int8_t array + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + ASSERT (BSON_ITER_HOLDS_BINARY (&iter)); + ASSERT (BSON_ITER_HOLDS_VECTOR (&iter)); + ASSERT (BSON_ITER_HOLDS_VECTOR_INT8 (&iter)); + ASSERT (!BSON_ITER_HOLDS_VECTOR_FLOAT32 (&iter)); + ASSERT (!BSON_ITER_HOLDS_VECTOR_PACKED_BIT (&iter)); + bson_vector_int8_const_view_t view; + ASSERT (bson_vector_int8_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_int8_const_view_length (view) == 25); + int8_t values[25]; + static const int8_t expected_values[25] = {-9, -8, -7, 12, 34, 56, 78, 90, -1, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; + ASSERT (bson_vector_int8_const_view_read (view, values, sizeof values / sizeof values[0], 0)); + ASSERT_MEMCMP (values, expected_values, (int) sizeof expected_values); + } + + // Convert the small vector to a BSON Array, and check the resulting canonical extended JSON. + // Each element will be losslessly converted to int32. + // Convert the output back, and add a "round_trip" key to the original document. + { + bson_t converted = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + ASSERT (BSON_APPEND_ARRAY_FROM_VECTOR (&converted, "array", &iter)); + ASSERT_CMPJSON (bson_as_canonical_extended_json (&converted, NULL), BSON_STR ({ + "array" : [ + {"$numberInt" : "-9"}, {"$numberInt" : "-8"}, {"$numberInt" : "-7"}, {"$numberInt" : "12"}, + {"$numberInt" : "34"}, {"$numberInt" : "56"}, {"$numberInt" : "78"}, {"$numberInt" : "90"}, + {"$numberInt" : "-1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "2"}, + {"$numberInt" : "3"}, {"$numberInt" : "4"}, {"$numberInt" : "5"}, {"$numberInt" : "6"}, + {"$numberInt" : "7"}, {"$numberInt" : "8"}, {"$numberInt" : "9"}, {"$numberInt" : "10"}, + {"$numberInt" : "11"}, {"$numberInt" : "12"}, {"$numberInt" : "13"}, {"$numberInt" : "14"}, + {"$numberInt" : "15"} + ] + })); + + ASSERT (bson_iter_init_find (&iter, &converted, "array")); + ASSERT (BSON_ITER_HOLDS_ARRAY (&iter)); + ASSERT (bson_iter_recurse (&iter, &iter)); + ASSERT (BSON_APPEND_VECTOR_INT8_FROM_ARRAY (&doc, "round_trip", &iter, NULL)); + bson_destroy (&converted); + } + + // The original small vector and round_trip small vector must be identical + { + bson_iter_t a, b; + ASSERT (bson_iter_init_find (&a, &doc, "vector")); + ASSERT (bson_iter_init_find (&b, &doc, "round_trip")); + ASSERT (bson_iter_binary_equal (&a, &b)); + } + + // Try the same round trip conversion with our longer vector + // (Note that BSON arrays special-case keys below "1000") + { + bson_t converted = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "longer_vector")); + ASSERT (BSON_APPEND_ARRAY_FROM_VECTOR (&converted, "array", &iter)); + ASSERT (bson_iter_init_find (&iter, &converted, "array")); + ASSERT (BSON_ITER_HOLDS_ARRAY (&iter)); + ASSERT (bson_iter_recurse (&iter, &iter)); + ASSERT (BSON_APPEND_VECTOR_INT8_FROM_ARRAY (&doc, "longer_round_trip", &iter, NULL)); + bson_destroy (&converted); + } + { + bson_iter_t a, b; + ASSERT (bson_iter_init_find (&a, &doc, "longer_vector")); + ASSERT (bson_iter_init_find (&b, &doc, "longer_round_trip")); + ASSERT (bson_iter_binary_equal (&a, &b)); + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_view_api_usage_float32 (void) +{ + bson_t doc = BSON_INITIALIZER; + + // Construct a small vector by writing individual elements + { + bson_vector_float32_view_t view; + const size_t length = 5; + ASSERT (BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "vector", length, &view)); + for (size_t i = 0; i < length; i++) { + float v = 1.0f + 0.25f * (float) i; + bson_vector_float32_view_write (view, &v, 1, i); + } + } + + ASSERT_CMPJSON ( + bson_as_canonical_extended_json (&doc, NULL), + BSON_STR ({"vector" : {"$binary" : {"base64" : "JwAAAIA/AACgPwAAwD8AAOA/AAAAQA==", "subType" : "09"}}})); + + // Construct a longer vector by writing individual elements + { + bson_vector_float32_view_t view; + const size_t length = 10000; + ASSERT (bson_append_vector_float32_uninit (&doc, "longer_vector", -1, length, &view)); + for (size_t i = 0; i < length; i++) { + float v = (float) i; + bson_vector_float32_view_write (view, &v, 1, i); + } + } + + // Fail appending a vector that would be too large to represent + { + bson_vector_float32_view_t view; + const size_t length = (UINT32_MAX - 1) / 4; + ASSERT (!bson_append_vector_float32_uninit (&doc, "overlong_vector", -1, length, &view)); + } + + // Read the small vector into a float array + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + ASSERT (BSON_ITER_HOLDS_BINARY (&iter)); + ASSERT (BSON_ITER_HOLDS_VECTOR (&iter)); + ASSERT (!BSON_ITER_HOLDS_VECTOR_INT8 (&iter)); + ASSERT (BSON_ITER_HOLDS_VECTOR_FLOAT32 (&iter)); + ASSERT (!BSON_ITER_HOLDS_VECTOR_PACKED_BIT (&iter)); + bson_vector_float32_const_view_t view; + ASSERT (bson_vector_float32_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_float32_const_view_length (view) == 5); + float values[5]; + static const float expected_values[5] = {1.0f, 1.25f, 1.5f, 1.75f, 2.0f}; + ASSERT (bson_vector_float32_const_view_read (view, values, sizeof values / sizeof values[0], 0)); + ASSERT_MEMCMP (values, expected_values, (int) sizeof expected_values); + } + + // Convert the small vector to a BSON Array, and check the resulting canonical extended JSON. + // Each element will be converted from 32-bit to 64-bit float. + // Convert the output back, and add a "round_trip" key to the original document. + { + bson_t converted = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + ASSERT (BSON_APPEND_ARRAY_FROM_VECTOR (&converted, "array", &iter)); + ASSERT_CMPJSON (bson_as_canonical_extended_json (&converted, NULL), BSON_STR ({ + "array" : [ + {"$numberDouble" : "1.0"}, + {"$numberDouble" : "1.25"}, + {"$numberDouble" : "1.5"}, + {"$numberDouble" : "1.75"}, + {"$numberDouble" : "2.0"} + ] + })); + + ASSERT (bson_iter_init_find (&iter, &converted, "array")); + ASSERT (BSON_ITER_HOLDS_ARRAY (&iter)); + ASSERT (bson_iter_recurse (&iter, &iter)); + ASSERT (BSON_APPEND_VECTOR_FLOAT32_FROM_ARRAY (&doc, "round_trip", &iter, NULL)); + bson_destroy (&converted); + } + + // The original small vector and round_trip small vector must be identical + { + bson_iter_t a, b; + ASSERT (bson_iter_init_find (&a, &doc, "vector")); + ASSERT (bson_iter_init_find (&b, &doc, "round_trip")); + ASSERT (bson_iter_binary_equal (&a, &b)); + } + + // Try the same round trip conversion with our longer vector + // (Note that BSON arrays special-case keys below "1000") + { + bson_t converted = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "longer_vector")); + ASSERT (BSON_APPEND_ARRAY_FROM_VECTOR (&converted, "array", &iter)); + ASSERT (bson_iter_init_find (&iter, &converted, "array")); + ASSERT (BSON_ITER_HOLDS_ARRAY (&iter)); + ASSERT (bson_iter_recurse (&iter, &iter)); + ASSERT (BSON_APPEND_VECTOR_FLOAT32_FROM_ARRAY (&doc, "longer_round_trip", &iter, NULL)); + bson_destroy (&converted); + } + { + bson_iter_t a, b; + ASSERT (bson_iter_init_find (&a, &doc, "longer_vector")); + ASSERT (bson_iter_init_find (&b, &doc, "longer_round_trip")); + ASSERT (bson_iter_binary_equal (&a, &b)); + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_view_api_usage_packed_bit (void) +{ + bson_t doc = BSON_INITIALIZER; + + // Construct a small vector by packing individual elements from a 'bool' source + { + bson_vector_packed_bit_view_t view; + const size_t length = 123; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "vector", length, &view)); + for (size_t i = 0; i < length; i++) { + bool v = (i & 1) != 0; + bson_vector_packed_bit_view_pack_bool (view, &v, 1, i); + } + } + + ASSERT_CMPJSON (bson_as_canonical_extended_json (&doc, NULL), + BSON_STR ({"vector" : {"$binary" : {"base64" : "EAVVVVVVVVVVVVVVVVVVVVVA", "subType" : "09"}}})); + + // Construct a longer vector by packing individual elements from a 'bool' source + { + bson_vector_packed_bit_view_t view; + const size_t length = 100002; + ASSERT (bson_append_vector_packed_bit_uninit (&doc, "longer_vector", -1, length, &view)); + for (size_t i = 0; i < length; i++) { + bool v = (i & 3) != 0; + bson_vector_packed_bit_view_pack_bool (view, &v, 1, i); + } + } + + // Fail appending a vector that would be too large to represent + { + bson_vector_int8_view_t view; + const size_t length = (UINT32_MAX - 1) * (size_t) 8; + ASSERT (!bson_append_vector_int8_uninit (&doc, "overlong_vector", -1, length, &view)); + } + + // Unpack the small vector into a bool array + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + ASSERT (BSON_ITER_HOLDS_BINARY (&iter)); + ASSERT (BSON_ITER_HOLDS_VECTOR (&iter)); + ASSERT (!BSON_ITER_HOLDS_VECTOR_INT8 (&iter)); + ASSERT (!BSON_ITER_HOLDS_VECTOR_FLOAT32 (&iter)); + ASSERT (BSON_ITER_HOLDS_VECTOR_PACKED_BIT (&iter)); + bson_vector_packed_bit_const_view_t view; + ASSERT (bson_vector_packed_bit_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_packed_bit_const_view_length (view) == 123); + bool values[123]; + bool expected_values[123]; + for (size_t i = 0; i < sizeof expected_values / sizeof expected_values[0]; i++) { + expected_values[i] = (i & 1) != 0; + } + ASSERT (bson_vector_packed_bit_const_view_unpack_bool (view, values, sizeof values / sizeof values[0], 0)); + ASSERT_MEMCMP (values, expected_values, (int) sizeof expected_values); + } + + // Read the packed representation without unpacking + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + bson_vector_packed_bit_const_view_t view; + ASSERT (bson_vector_packed_bit_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_packed_bit_const_view_length (view) == 123); + uint8_t packed[16]; + static const uint8_t expected_packed[16] = { + 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x40}; + ASSERT (bson_vector_packed_bit_const_view_read_packed (view, packed, sizeof packed, 0)); + ASSERT_MEMCMP (packed, expected_packed, (int) sizeof expected_packed); + } + + // Partial overwrite of the packed representation + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + bson_vector_packed_bit_view_t view; + ASSERT (bson_vector_packed_bit_view_from_iter (&view, &iter)); + uint8_t packed[2] = {0x12, 0x34}; + ASSERT (bson_vector_packed_bit_view_write_packed (view, packed, sizeof packed, 12)); + } + + // Partial read of the packed representation + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + bson_vector_packed_bit_const_view_t view; + ASSERT (bson_vector_packed_bit_const_view_from_iter (&view, &iter)); + uint8_t packed[5]; + static const uint8_t expected_packed[5] = {0x55, 0x12, 0x34, 0x55, 0x40}; + ASSERT (bson_vector_packed_bit_const_view_read_packed (view, packed, sizeof packed, 11)); + ASSERT_MEMCMP (packed, expected_packed, (int) sizeof expected_packed); + } + + // Partial write from a bool array, spanning complete and partial packed bytes + { + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + bson_vector_packed_bit_view_t view; + ASSERT (bson_vector_packed_bit_view_from_iter (&view, &iter)); + bool values[24] = { + false, false, false, true, false, false, false, true, true, true, false, true, + true, false, false, false, false, true, false, false, false, false, false, true, + }; + ASSERT (bson_vector_packed_bit_view_pack_bool (view, values, sizeof values / sizeof values[0], 3)); + } + + // Convert the small vector to a BSON Array, and check the resulting canonical extended JSON. + // Each element will be losslessly converted to int32. + // Convert the output back, and add a "round_trip" key to the original document. + { + bson_t converted = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "vector")); + ASSERT (BSON_APPEND_ARRAY_FROM_VECTOR (&converted, "array", &iter)); + ASSERT_CMPJSON (bson_as_canonical_extended_json (&converted, NULL), BSON_STR ({ + "array" : [ + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "1"}, + {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, + {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, + {"$numberInt" : "0"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "0"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"}, {"$numberInt" : "1"}, + {"$numberInt" : "0"}, {"$numberInt" : "1"}, {"$numberInt" : "0"} + ] + })); + + ASSERT (bson_iter_init_find (&iter, &converted, "array")); + ASSERT (BSON_ITER_HOLDS_ARRAY (&iter)); + ASSERT (bson_iter_recurse (&iter, &iter)); + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_FROM_ARRAY (&doc, "round_trip", &iter, NULL)); + bson_destroy (&converted); + } + + // The original small vector and round_trip small vector must be identical + { + bson_iter_t a, b; + ASSERT (bson_iter_init_find (&a, &doc, "vector")); + ASSERT (bson_iter_init_find (&b, &doc, "round_trip")); + ASSERT (bson_iter_binary_equal (&a, &b)); + } + + // Try the same round trip conversion with our longer vector + // (Note that BSON arrays special-case keys below "1000") + { + bson_t converted = BSON_INITIALIZER; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &doc, "longer_vector")); + ASSERT (BSON_APPEND_ARRAY_FROM_VECTOR (&converted, "array", &iter)); + ASSERT (bson_iter_init_find (&iter, &converted, "array")); + ASSERT (BSON_ITER_HOLDS_ARRAY (&iter)); + ASSERT (bson_iter_recurse (&iter, &iter)); + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_FROM_ARRAY (&doc, "longer_round_trip", &iter, NULL)); + bson_destroy (&converted); + } + { + bson_iter_t a, b; + ASSERT (bson_iter_init_find (&a, &doc, "longer_vector")); + ASSERT (bson_iter_init_find (&b, &doc, "longer_round_trip")); + ASSERT (bson_iter_binary_equal (&a, &b)); + } + + // Padding bits will be initialized to zero when a packed_bit vector is first allocated by + // bson_append_vector_packed_bit_uninit + { + // Set the uninitialized part of 'doc' to a known value + static const uint32_t reserve_len = 512; + memset (bson_reserve_buffer (&doc, doc.len + reserve_len) + doc.len, 0xdd, reserve_len); + + bson_vector_packed_bit_view_t view; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "padding_init_test", 12, &view)); + ASSERT (bson_vector_packed_bit_view_length_bytes (view) == 2); + ASSERT (bson_vector_packed_bit_view_padding (view) == 4); + + // BSON validity only requires the low 4 bits to be zero, but the entire last + // byte will be zeroed by our implementation. + uint8_t bytes[2]; + ASSERT (bson_vector_packed_bit_view_read_packed (view, bytes, sizeof bytes, 0)); + ASSERT_CMPUINT ((unsigned) bytes[0], ==, 0xdd); + ASSERT_CMPUINT ((unsigned) bytes[1], ==, 0x00); + } + + // Padding bits can't be forcibly given nonzero values using bson_vector_packed_bit_view_write_packed + { + bson_vector_packed_bit_view_t view; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "padding_mask_test", 13, &view)); + ASSERT (bson_vector_packed_bit_view_length_bytes (view) == 2); + ASSERT (bson_vector_packed_bit_view_padding (view) == 3); + + uint8_t bytes[2] = {0xff, 0xff}; + ASSERT (bson_vector_packed_bit_view_write_packed (view, bytes, sizeof bytes, 0)); + ASSERT (bson_vector_packed_bit_view_read_packed (view, bytes, sizeof bytes, 0)); + ASSERT_CMPUINT ((unsigned) bytes[0], ==, 0xff); + ASSERT_CMPUINT ((unsigned) bytes[1], ==, 0xf8); + } + + bson_destroy (&doc); +} + +// Note: The effective MAX_TESTED_VECTOR_LENGTH is limited to 2047 on Windows due to RAND_MAX==0x7fff +#define MAX_TESTED_VECTOR_LENGTH 10000 +#define FUZZ_TEST_ITERS 5000 + +static void +test_bson_vector_view_api_fuzz_int8 (void) +{ + size_t current_length = 0; + bson_t vector_doc = BSON_INITIALIZER; + int8_t *expected_elements = bson_malloc (MAX_TESTED_VECTOR_LENGTH * sizeof *expected_elements); + int8_t *actual_elements = bson_malloc (MAX_TESTED_VECTOR_LENGTH * sizeof *actual_elements); + for (int fuzz_iter = 0; fuzz_iter < FUZZ_TEST_ITERS; fuzz_iter++) { + unsigned r = (unsigned) rand (); + unsigned r_operation = r & 0xFu; + size_t r_param = r >> 4; + + if (current_length == 0 || r_operation == 15) { + // Resize and fill + size_t new_length = (size_t) r_param % MAX_TESTED_VECTOR_LENGTH; + bson_reinit (&vector_doc); + bson_vector_int8_view_t view; + ASSERT (BSON_APPEND_VECTOR_INT8_UNINIT (&vector_doc, "vector", new_length, &view)); + for (size_t i = 0; i < new_length; i++) { + expected_elements[i] = (int8_t) (uint8_t) rand (); + } + ASSERT (bson_vector_int8_view_write (view, expected_elements, new_length, 0)); + current_length = new_length; + + } else if (r_operation < 7) { + // Partial write + size_t element_count = r_param % current_length; + size_t offset = (size_t) rand () % (current_length - element_count); + for (size_t i = 0; i < element_count; i++) { + expected_elements[offset + i] = (int8_t) (uint8_t) rand (); + } + bson_vector_int8_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_int8_view_from_iter (&view, &iter)); + ASSERT (bson_vector_int8_view_write (view, expected_elements + offset, element_count, offset)); + + } else { + // Partial read + size_t element_count = r_param % current_length; + size_t offset = (size_t) rand () % (current_length - element_count); + bson_vector_int8_const_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_int8_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_int8_const_view_read (view, actual_elements, element_count, offset)); + ASSERT_MEMCMP (actual_elements, expected_elements + offset, element_count * sizeof *actual_elements); + } + } + bson_destroy (&vector_doc); + bson_free (expected_elements); + bson_free (actual_elements); +} + +static void +test_bson_vector_view_api_fuzz_float32 (void) +{ + size_t current_length = 0; + bson_t vector_doc = BSON_INITIALIZER; + float *expected_elements = bson_malloc (MAX_TESTED_VECTOR_LENGTH * sizeof *expected_elements); + float *actual_elements = bson_malloc (MAX_TESTED_VECTOR_LENGTH * sizeof *actual_elements); + for (int fuzz_iter = 0; fuzz_iter < FUZZ_TEST_ITERS; fuzz_iter++) { + unsigned r = (unsigned) rand (); + unsigned r_operation = r & 0xFu; + size_t r_param = r >> 4; + + if (current_length == 0 || r_operation == 15) { + // Resize and fill + size_t new_length = (size_t) r_param % MAX_TESTED_VECTOR_LENGTH; + bson_reinit (&vector_doc); + bson_vector_float32_view_t view; + ASSERT (BSON_APPEND_VECTOR_FLOAT32_UNINIT (&vector_doc, "vector", new_length, &view)); + for (size_t i = 0; i < new_length; i++) { + expected_elements[i] = (float) rand (); + } + ASSERT (bson_vector_float32_view_write (view, expected_elements, new_length, 0)); + current_length = new_length; + + } else if (r_operation < 7) { + // Partial write + size_t element_count = r_param % current_length; + size_t offset = (size_t) rand () % (current_length - element_count); + for (size_t i = 0; i < element_count; i++) { + expected_elements[offset + i] = (float) rand (); + } + bson_vector_float32_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_float32_view_from_iter (&view, &iter)); + ASSERT (bson_vector_float32_view_write (view, expected_elements + offset, element_count, offset)); + + } else { + // Partial read + size_t element_count = r_param % current_length; + size_t offset = (size_t) rand () % (current_length - element_count); + bson_vector_float32_const_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_float32_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_float32_const_view_read (view, actual_elements, element_count, offset)); + ASSERT_MEMCMP (actual_elements, expected_elements + offset, element_count * sizeof *actual_elements); + } + } + bson_destroy (&vector_doc); + bson_free (expected_elements); + bson_free (actual_elements); +} + +static void +test_bson_vector_view_api_fuzz_packed_bit (void) +{ + size_t current_length = 0; + bson_t vector_doc = BSON_INITIALIZER; + bool *expected_elements = bson_malloc (MAX_TESTED_VECTOR_LENGTH * sizeof *expected_elements); + bool *actual_elements = bson_malloc (MAX_TESTED_VECTOR_LENGTH * sizeof *actual_elements); + uint8_t *packed_buffer = bson_malloc ((MAX_TESTED_VECTOR_LENGTH + 7) / 8); + for (int fuzz_iter = 0; fuzz_iter < FUZZ_TEST_ITERS; fuzz_iter++) { + unsigned r = (unsigned) rand (); + unsigned r_operation = r & 0xFu; + size_t r_param = r >> 4; + + if (current_length == 0 || r_operation == 15) { + // Resize and fill from unpacked bool source + size_t new_length = (size_t) r_param % MAX_TESTED_VECTOR_LENGTH; + bson_reinit (&vector_doc); + bson_vector_packed_bit_view_t view; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&vector_doc, "vector", new_length, &view)); + for (size_t i = 0; i < new_length; i++) { + expected_elements[i] = ((unsigned) rand () & 1u) != 0u; + } + ASSERT (bson_vector_packed_bit_view_pack_bool (view, expected_elements, new_length, 0)); + current_length = new_length; + + } else if (r_operation < 7) { + // Partial write + if (r_operation & 1) { + // Partial write from unpacked bool source + size_t element_count = r_param % current_length; + size_t offset = (size_t) rand () % (current_length - element_count); + for (size_t i = 0; i < element_count; i++) { + expected_elements[offset + i] = ((unsigned) rand () & 1u) != 0u; + } + bson_vector_packed_bit_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_packed_bit_view_from_iter (&view, &iter)); + ASSERT (bson_vector_packed_bit_view_length (view) == current_length); + ASSERT (bson_vector_packed_bit_view_pack_bool (view, expected_elements + offset, element_count, offset)); + } else { + // Partial write of packed bytes + size_t current_length_bytes = (current_length + 7) / 8; + size_t byte_count = r_param % current_length_bytes; + size_t byte_offset = (size_t) rand () % (current_length_bytes - byte_count); + for (size_t i = 0; i < byte_count; i++) { + uint8_t packed_byte = (uint8_t) rand (); + packed_buffer[i] = packed_byte; + for (unsigned bit = 0; bit < 8; bit++) { + expected_elements[(byte_offset + i) * 8 + bit] = (packed_byte & (0x80 >> bit)) != 0; + } + } + bson_vector_packed_bit_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_packed_bit_view_from_iter (&view, &iter)); + ASSERT (bson_vector_packed_bit_view_length (view) == current_length); + ASSERT (bson_vector_packed_bit_view_length_bytes (view) == current_length_bytes); + ASSERT (bson_vector_packed_bit_view_write_packed (view, packed_buffer, byte_count, byte_offset)); + } + } else { + // Partial read + if (r_operation & 1) { + // Partial read to unpacked bool destination + size_t element_count = r_param % current_length; + size_t offset = (size_t) rand () % (current_length - element_count); + bson_vector_packed_bit_const_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_packed_bit_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_packed_bit_const_view_length (view) == current_length); + ASSERT (bson_vector_packed_bit_const_view_unpack_bool (view, actual_elements, element_count, offset)); + ASSERT_MEMCMP (actual_elements, expected_elements + offset, element_count * sizeof *actual_elements); + } else { + // Partial read of packed bytes + size_t current_length_bytes = (current_length + 7) / 8; + size_t byte_count = r_param % current_length_bytes; + size_t byte_offset = (size_t) rand () % (current_length_bytes - byte_count); + bson_vector_packed_bit_const_view_t view; + bson_iter_t iter; + ASSERT (bson_iter_init_find (&iter, &vector_doc, "vector")); + ASSERT (bson_vector_packed_bit_const_view_from_iter (&view, &iter)); + ASSERT (bson_vector_packed_bit_const_view_length (view) == current_length); + ASSERT (bson_vector_packed_bit_const_view_length_bytes (view) == current_length_bytes); + ASSERT (bson_vector_packed_bit_const_view_read_packed (view, packed_buffer, byte_count, byte_offset)); + for (size_t i = 0; i < byte_count; i++) { + uint8_t packed_byte = packed_buffer[i]; + for (unsigned bit = 0; bit < 8; bit++) { + ASSERT (expected_elements[(byte_offset + i) * 8 + bit] == ((packed_byte & (0x80 >> bit)) != 0)); + } + } + } + } + } + bson_destroy (&vector_doc); + bson_free (expected_elements); + bson_free (actual_elements); + bson_free (packed_buffer); +} + +static void +test_bson_vector_example_int8_const_view (void) +{ + // setup: construct a sample document + bson_t doc = BSON_INITIALIZER; + { + static const int8_t values[] = {12, 34, -56}; + bson_vector_int8_view_t view; + ASSERT (BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "vector", sizeof values / sizeof values[0], &view)); + ASSERT (bson_vector_int8_view_write (view, values, sizeof values / sizeof values[0], 0)); + } + + // bson_vector_int8_const_view_t.rst + // Edits: + // - Added test_suite_debug_output() test. + // - Added unnecessary zero initializer to work around false positive compiler warning. + // (same as in bson_array_builder_append_vector_int8_elements) + { + bson_iter_t iter; + bson_vector_int8_const_view_t view; + + if (bson_iter_init_find (&iter, &doc, "vector") && bson_vector_int8_const_view_from_iter (&view, &iter)) { + size_t length = bson_vector_int8_const_view_length (view); + if (test_suite_debug_output ()) { + printf ("Elements in 'vector':\n"); + } + for (size_t i = 0; i < length; i++) { + int8_t element = 0; // Workaround + ASSERT (bson_vector_int8_const_view_read (view, &element, 1, i)); + if (test_suite_debug_output ()) { + printf (" [%d] = %d\n", (int) i, (int) element); + } + } + } + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_example_int8_view (void) +{ + bson_t doc = BSON_INITIALIZER; + + // bson_vector_int8_view_t.rst + { + static const int8_t values[] = {1, 2, 3}; + const size_t values_count = sizeof values / sizeof values[0]; + + bson_vector_int8_view_t view; + ASSERT (BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "vector", values_count, &view)); + ASSERT (bson_vector_int8_view_write (view, values, values_count, 0)); + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_example_float32_const_view (void) +{ + // setup: construct a sample document + bson_t doc = BSON_INITIALIZER; + { + static const float values[] = {5.0f, -1e10f, INFINITY, NAN, -1.0f}; + bson_vector_float32_view_t view; + ASSERT (BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "vector", sizeof values / sizeof values[0], &view)); + ASSERT (bson_vector_float32_view_write (view, values, sizeof values / sizeof values[0], 0)); + } + + // bson_vector_float32_const_view_t.rst + // Edits: + // - Added test_suite_debug_output() test. + { + bson_iter_t iter; + bson_vector_float32_const_view_t view; + + if (bson_iter_init_find (&iter, &doc, "vector") && bson_vector_float32_const_view_from_iter (&view, &iter)) { + size_t length = bson_vector_float32_const_view_length (view); + if (test_suite_debug_output ()) { + printf ("Elements in 'vector':\n"); + } + for (size_t i = 0; i < length; i++) { + float element; + ASSERT (bson_vector_float32_const_view_read (view, &element, 1, i)); + if (test_suite_debug_output ()) { + printf (" [%d] = %f\n", (int) i, element); + } + } + } + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_example_float32_view (void) +{ + bson_t doc = BSON_INITIALIZER; + + // bson_vector_float32_view_t.rst + { + static const float values[] = {1.0f, 2.0f, 3.0f}; + const size_t values_count = sizeof values / sizeof values[0]; + + bson_vector_float32_view_t view; + ASSERT (BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "vector", values_count, &view)); + ASSERT (bson_vector_float32_view_write (view, values, values_count, 0)); + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_example_packed_bit_const_view (void) +{ + // setup: construct a sample document + bson_t doc = BSON_INITIALIZER; + { + static const bool values[] = {true, false, true, true, false, true, false, true, true, false}; + bson_vector_packed_bit_view_t view; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "vector", sizeof values / sizeof values[0], &view)); + ASSERT (bson_vector_packed_bit_view_pack_bool (view, values, sizeof values / sizeof values[0], 0)); + } + + // bson_vector_packed_bit_const_view_t.rst + // Edits: + // - Added test_suite_debug_output() test. + // - Added unnecessary zero initializer to work around false positive compiler warning. + // (same as in bson_array_builder_append_vector_int8_elements) + { + bson_iter_t iter; + bson_vector_packed_bit_const_view_t view; + + if (bson_iter_init_find (&iter, &doc, "vector") && bson_vector_packed_bit_const_view_from_iter (&view, &iter)) { + size_t length = bson_vector_packed_bit_const_view_length (view); + size_t length_bytes = bson_vector_packed_bit_const_view_length_bytes (view); + size_t padding = bson_vector_packed_bit_const_view_padding (view); + + if (test_suite_debug_output ()) { + printf ("Elements in 'vector':\n"); + } + for (size_t i = 0; i < length; i++) { + bool element; + ASSERT (bson_vector_packed_bit_const_view_unpack_bool (view, &element, 1, i)); + if (test_suite_debug_output ()) { + printf (" elements[%d] = %d\n", (int) i, (int) element); + } + } + + if (test_suite_debug_output ()) { + printf ("Bytes in 'vector': (%d bits unused)\n", (int) padding); + } + for (size_t i = 0; i < length_bytes; i++) { + uint8_t packed_byte = 0; // Workaround + ASSERT (bson_vector_packed_bit_const_view_read_packed (view, &packed_byte, 1, i)); + if (test_suite_debug_output ()) { + printf (" bytes[%d] = 0x%02x\n", (int) i, (unsigned) packed_byte); + } + } + } + } + + bson_destroy (&doc); +} + +static void +test_bson_vector_example_packed_bit_view (void) +{ + bson_t doc = BSON_INITIALIZER; + + // bson_vector_packed_bit_view_t.rst + { + // Fill a new vector with individual boolean elements + { + static const bool bool_values[] = {true, false, true, true, false}; + const size_t bool_values_count = sizeof bool_values / sizeof bool_values[0]; + + bson_vector_packed_bit_view_t view; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "from_bool", bool_values_count, &view)); + ASSERT (bson_vector_packed_bit_view_pack_bool (view, bool_values, bool_values_count, 0)); + } + + // Fill another new vector with packed bytes + { + static const uint8_t packed_bytes[] = {0xb0}; + const size_t unused_bits_count = 3; + const size_t packed_values_count = sizeof packed_bytes * 8 - unused_bits_count; + + bson_vector_packed_bit_view_t view; + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "from_packed", packed_values_count, &view)); + ASSERT (bson_vector_packed_bit_view_write_packed (view, packed_bytes, sizeof packed_bytes, 0)); + } + + // Compare both vectors. They match exactly. + { + bson_iter_t from_bool_iter, from_packed_iter; + ASSERT (bson_iter_init_find (&from_bool_iter, &doc, "from_bool")); + ASSERT (bson_iter_init_find (&from_packed_iter, &doc, "from_packed")); + ASSERT (bson_iter_binary_equal (&from_bool_iter, &from_packed_iter)); + } + } + + bson_destroy (&doc); +} + +// Shared edge case tests that apply to all reader/writer functions. +#define TEST_BSON_VECTOR_RW(_expected, _view, _v, _count, _offset, _read, _write) \ + if (true) { \ + ASSERT ((_expected) == (_write) ((_view), (_v), (_count), (_offset))); \ + ASSERT ((_expected) == (_read) ((_view), (_v), (_count), (_offset))); \ + } else \ + ((void) 0) + +#if defined(__USE_FORTIFY_LEVEL) && __USE_FORTIFY_LEVEL > 0 +// Prevent memcpy size overflows even in dead code +#define MAX_TESTABLE_COPY_COUNT (SIZE_MAX / 2u / sizeof (float)) +#else +// Allow dead code to contain an oversized or overflowing memcpy +#define MAX_TESTABLE_COPY_COUNT SIZE_MAX +#endif + +#define TEST_BSON_VECTOR_EDGE_CASES_RW_COMMON(_view, _alloc_size, _v, _v_size, _read, _write) \ + if (true) { \ + TEST_BSON_VECTOR_RW (false, (_view), (_v), (_alloc_size) + 1u, 0, (_read), (_write)); \ + TEST_BSON_VECTOR_RW (true, (_view), (_v), (_v_size), (_alloc_size) - (_v_size), (_read), (_write)); \ + TEST_BSON_VECTOR_RW (false, (_view), (_v), (_v_size), (_alloc_size) - (_v_size) + 1u, (_read), (_write)); \ + TEST_BSON_VECTOR_RW (false, (_view), (_v), (_v_size) + 1u, (_alloc_size) - (_v_size), (_read), (_write)); \ + TEST_BSON_VECTOR_RW ( \ + false, (_view), (_v), MAX_TESTABLE_COPY_COUNT, (_alloc_size) - (_v_size), (_read), (_write)); \ + TEST_BSON_VECTOR_RW ( \ + false, (_view), (_v), MAX_TESTABLE_COPY_COUNT, (_alloc_size) - (_v_size) + 1u, (_read), (_write)); \ + TEST_BSON_VECTOR_RW (true, (_view), (_v), (_v_size), 0, (_read), (_write)); \ + } else \ + ((void) 0) + +static void +test_bson_vector_edge_cases_int8 (void) +{ + size_t max_representable_elements = (size_t) UINT32_MAX - BSON_VECTOR_HEADER_LEN; + + // Test binary_data_length (uint32_t) edge cases, without any allocation. + { + ASSERT_CMPUINT32 (bson_vector_int8_binary_data_length (max_representable_elements - 1u), ==, UINT32_MAX - 1u); + ASSERT_CMPUINT32 (bson_vector_int8_binary_data_length (max_representable_elements), ==, UINT32_MAX); + ASSERT_CMPUINT32 (bson_vector_int8_binary_data_length (max_representable_elements + 1u), ==, 0); + } + + // Needs little real memory because most bytes are never accessed, + // but we should require a virtual address space larger than 32 bits. +#if BSON_WORD_SIZE > 32 + + size_t expected_bson_overhead = + 5 /* empty bson document */ + 3 /* "v" element header */ + 5 /* binary item header */; + size_t max_alloc_elements = (size_t) BSON_MAX_SIZE - expected_bson_overhead - BSON_VECTOR_HEADER_LEN; + + bson_t doc = BSON_INITIALIZER; + bson_vector_int8_view_t view; + + // Test allocation (BSON_MAX_SIZE + uint32_t) edge cases. + { + ASSERT (!BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "v", max_representable_elements, &view)); + ASSERT (!BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "v", max_representable_elements + 1u, &view)); + ASSERT (!BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "v", max_alloc_elements + 1u, &view)); + ASSERT (BSON_APPEND_VECTOR_INT8_UNINIT (&doc, "v", max_alloc_elements, &view)); + } + + // Test some read and write boundaries. + { + size_t values_size = 100; + int8_t *values = bson_malloc0 (values_size * sizeof *values); + TEST_BSON_VECTOR_EDGE_CASES_RW_COMMON ( + view, max_alloc_elements, values, values_size, bson_vector_int8_view_read, bson_vector_int8_view_write); + bson_free (values); + } + + bson_destroy (&doc); +#endif // BSON_WORD_SIZE > 32 +} + +static void +test_bson_vector_edge_cases_float32 (void) +{ + size_t max_representable_elements = ((size_t) UINT32_MAX - BSON_VECTOR_HEADER_LEN) / sizeof (float); + + // Test binary_data_length (uint32_t) edge cases, without any allocation. + // Note that the longest possible multiple of a complete element is 1 byte short of UINT32_MAX. + { + ASSERT_CMPUINT32 ( + bson_vector_float32_binary_data_length (max_representable_elements - 1u), ==, UINT32_MAX - 1u - 4u); + ASSERT_CMPUINT32 (bson_vector_float32_binary_data_length (max_representable_elements), ==, UINT32_MAX - 1u); + ASSERT_CMPUINT32 (bson_vector_float32_binary_data_length (max_representable_elements + 1u), ==, 0); + } + + // Needs little real memory because most bytes are never accessed, + // but we should require a virtual address space larger than 32 bits. +#if BSON_WORD_SIZE > 32 + + size_t expected_bson_overhead = + 5 /* empty bson document */ + 3 /* "v" element header */ + 5 /* binary item header */; + size_t max_alloc_elements = + ((size_t) BSON_MAX_SIZE - expected_bson_overhead - BSON_VECTOR_HEADER_LEN) / sizeof (float); + + bson_t doc = BSON_INITIALIZER; + bson_vector_float32_view_t view; + + // Test allocation (BSON_MAX_SIZE + uint32_t) edge cases. + { + ASSERT (!BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "v", max_representable_elements, &view)); + ASSERT (!BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "v", max_representable_elements + 1u, &view)); + ASSERT (!BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "v", max_alloc_elements + 1u, &view)); + ASSERT (BSON_APPEND_VECTOR_FLOAT32_UNINIT (&doc, "v", max_alloc_elements, &view)); + } + + // Test some read and write boundaries. + { + size_t values_size = 100; + float *values = bson_malloc0 (values_size * sizeof *values); + TEST_BSON_VECTOR_EDGE_CASES_RW_COMMON ( + view, max_alloc_elements, values, values_size, bson_vector_float32_view_read, bson_vector_float32_view_write); + bson_free (values); + } + + bson_destroy (&doc); +#endif // BSON_WORD_SIZE > 32 +} + +static void +test_bson_vector_edge_cases_packed_bit (void) +{ + // Test UINT32_MAX as an element count. This is the largest representable on systems with a 32-bit size_t. + uint32_t len_for_max_count = (uint32_t) (((uint64_t) UINT32_MAX + 7u) / 8u + BSON_VECTOR_HEADER_LEN); + { + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX), ==, len_for_max_count); + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX - 1u), ==, len_for_max_count); + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX - 6u), ==, len_for_max_count); + ASSERT_CMPUINT32 ( + bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX - 7u), ==, len_for_max_count - 1u); + ASSERT_CMPUINT32 ( + bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX - 8u), ==, len_for_max_count - 1u); + } + + // Test the real max_representable_elements only if size_t is large enough. +#if SIZE_MAX > UINT32_MAX + size_t max_representable_elements = ((size_t) UINT32_MAX - BSON_VECTOR_HEADER_LEN) * 8u; + + // Test binary_data_length (uint32_t) edge cases, without any allocation. + { + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX + 1u), ==, len_for_max_count); + ASSERT_CMPUINT32 ( + bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX + 2u), ==, len_for_max_count + 1u); + ASSERT_CMPUINT32 ( + bson_vector_packed_bit_binary_data_length ((size_t) UINT32_MAX + 9u), ==, len_for_max_count + 1u); + ASSERT_CMPUINT32 ( + bson_vector_packed_bit_binary_data_length (max_representable_elements - 8u), ==, UINT32_MAX - 1u); + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length (max_representable_elements - 7u), ==, UINT32_MAX); + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length (max_representable_elements), ==, UINT32_MAX); + ASSERT_CMPUINT32 (bson_vector_packed_bit_binary_data_length (max_representable_elements + 1u), ==, 0); + } +#endif // SIZE_MAX > UINT32_MAX + + // If we additionally have a 64-bit address space, allocate this max-sized vector and run tests. + // Needs little real memory because most bytes are never accessed. +#if BSON_WORD_SIZE > 32 + +#if !(SIZE_MAX > UINT32_MAX) +#error 64-bit platforms should have a 64-bit size_t +#endif + + size_t expected_bson_overhead = + 5 /* empty bson document */ + 3 /* "v" element header */ + 5 /* binary item header */; + size_t max_alloc_bytes = (size_t) BSON_MAX_SIZE - expected_bson_overhead - BSON_VECTOR_HEADER_LEN; + size_t max_alloc_elements = max_alloc_bytes * 8u; + + bson_t doc = BSON_INITIALIZER; + bson_vector_packed_bit_view_t view; + + // Test allocation (BSON_MAX_SIZE + uint32_t) edge cases. + { + ASSERT (!BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "v", max_representable_elements, &view)); + ASSERT (!BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "v", max_representable_elements + 1u, &view)); + ASSERT (!BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "v", max_alloc_elements + 1u, &view)); + ASSERT (BSON_APPEND_VECTOR_PACKED_BIT_UNINIT (&doc, "v", max_alloc_elements, &view)); + } + + // Test pack and unpack boundaries with the same tests used for read/write of non-packed element types. + // Only tests one length, but it's chosen to be greater than 8 and not a multiple of 8. + { + size_t values_size = 190; + bool *values = bson_malloc0 (values_size * sizeof *values); + TEST_BSON_VECTOR_EDGE_CASES_RW_COMMON (view, + max_alloc_elements, + values, + values_size, + bson_vector_packed_bit_view_unpack_bool, + bson_vector_packed_bit_view_pack_bool); + bson_free (values); + } + + // Test read and write boundaries on packed bytes. + { + size_t packed_size = 50; + uint8_t *packed = bson_malloc0 (packed_size); + TEST_BSON_VECTOR_EDGE_CASES_RW_COMMON (view, + max_alloc_bytes, + packed, + packed_size, + bson_vector_packed_bit_view_read_packed, + bson_vector_packed_bit_view_write_packed); + bson_free (packed); + } + + bson_destroy (&doc); +#endif // BSON_WORD_SIZE > 32 +} + +void +test_bson_vector_install (TestSuite *suite) +{ + install_json_test_suite_with_check (suite, BSON_JSON_DIR, "bson_binary_vector", test_bson_vector_json_cb); + + TestSuite_Add (suite, "/bson_binary_vector/view_api/usage/int8", test_bson_vector_view_api_usage_int8); + TestSuite_Add (suite, "/bson_binary_vector/view_api/usage/float32", test_bson_vector_view_api_usage_float32); + TestSuite_Add (suite, "/bson_binary_vector/view_api/usage/packed_bit", test_bson_vector_view_api_usage_packed_bit); + + TestSuite_Add (suite, "/bson_binary_vector/view_api/fuzz/int8", test_bson_vector_view_api_fuzz_int8); + TestSuite_Add (suite, "/bson_binary_vector/view_api/fuzz/float32", test_bson_vector_view_api_fuzz_float32); + TestSuite_Add (suite, "/bson_binary_vector/view_api/fuzz/packed_bit", test_bson_vector_view_api_fuzz_packed_bit); + + TestSuite_Add (suite, "/bson_binary_vector/example/int8_const_view", test_bson_vector_example_int8_const_view); + TestSuite_Add (suite, "/bson_binary_vector/example/int8_view", test_bson_vector_example_int8_view); + TestSuite_Add (suite, "/bson_binary_vector/example/float32_const_view", test_bson_vector_example_float32_const_view); + TestSuite_Add (suite, "/bson_binary_vector/example/float32_view", test_bson_vector_example_float32_view); + TestSuite_Add ( + suite, "/bson_binary_vector/example/packed_bit_const_view", test_bson_vector_example_packed_bit_const_view); + TestSuite_Add (suite, "/bson_binary_vector/example/packed_bit_view", test_bson_vector_example_packed_bit_view); + + TestSuite_Add (suite, "/bson_binary_vector/edge_cases/int8", test_bson_vector_edge_cases_int8); + TestSuite_Add (suite, "/bson_binary_vector/edge_cases/float32", test_bson_vector_edge_cases_float32); + TestSuite_Add (suite, "/bson_binary_vector/edge_cases/packed_bit", test_bson_vector_edge_cases_packed_bit); +} diff -pruN 1.30.4-1/src/libbson/tests/test-bson.c 2.0.2-1/src/libbson/tests/test-bson.c --- 1.30.4-1/src/libbson/tests/test-bson.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-bson.c 2025-06-19 15:42:22.000000000 +0000 @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -26,6 +27,10 @@ #include "TestSuite.h" #include "test-conveniences.h" +#include +#include +#include + /* CDRIVER-2460 ensure the unused old BSON_ASSERT_STATIC macro still compiles */ BSON_STATIC_ASSERT (1 == 1); @@ -853,272 +858,61 @@ test_bson_append_deep (void) static void -test_bson_validate_dbref (void) -{ - size_t offset; - bson_t dbref, child, child2; - - /* should fail, $ref without an $id */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with non id field */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "extra", "field"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with $id at the top */ - { - bson_init (&dbref); - BSON_APPEND_UTF8 (&dbref, "$ref", "foo"); - BSON_APPEND_UTF8 (&dbref, "$id", "bar"); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with $id not first keys */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "extra", "field"); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with $db */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$db", "bar"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, non-string $ref with $id */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_INT32 (&child, "$ref", 1); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, non-string $ref with nothing */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_INT32 (&child, "$ref", 1); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with $id with non-string $db */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - BSON_APPEND_INT32 (&child, "$db", 1); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with $id with non-string $db with stuff after */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - BSON_APPEND_INT32 (&child, "$db", 1); - BSON_APPEND_UTF8 (&child, "extra", "field"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should fail, $ref with $id with stuff, then $db */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - BSON_APPEND_UTF8 (&child, "extra", "field"); - BSON_APPEND_UTF8 (&child, "$db", "baz"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (!bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should succeed, $ref with $id */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should succeed, $ref with nested dbref $id */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_DOCUMENT_BEGIN (&child, "$id", &child2); - BSON_APPEND_UTF8 (&child2, "$ref", "foo2"); - BSON_APPEND_UTF8 (&child2, "$id", "bar2"); - BSON_APPEND_UTF8 (&child2, "$db", "baz2"); - bson_append_document_end (&child, &child2); - BSON_APPEND_UTF8 (&child, "$db", "baz"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should succeed, $ref with $id and $db */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - BSON_APPEND_UTF8 (&child, "$db", "baz"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } - - /* should succeed, $ref with $id and $db and trailing */ - { - bson_init (&dbref); - BSON_APPEND_DOCUMENT_BEGIN (&dbref, "dbref", &child); - BSON_APPEND_UTF8 (&child, "$ref", "foo"); - BSON_APPEND_UTF8 (&child, "$id", "bar"); - BSON_APPEND_UTF8 (&child, "$db", "baz"); - BSON_APPEND_UTF8 (&child, "extra", "field"); - bson_append_document_end (&dbref, &child); - - BSON_ASSERT (bson_validate (&dbref, BSON_VALIDATE_DOLLAR_KEYS, &offset)); - - bson_destroy (&dbref); - } -} - - -/* BSON spec requires bool value to be exactly 0 or 1 */ -static void -test_bson_validate_bool (void) +_make_deep_bson (bson_t *const dst, const size_t depth) { - /* {"b": true}, with implicit NULL at end */ - uint8_t data[] = "\x09\x00\x00\x00\x08\x62\x00\x01"; - bson_t bson; - bson_iter_t iter; - size_t err_offset = 0; - - ASSERT (bson_init_static (&bson, data, sizeof data)); - ASSERT (bson_validate (&bson, BSON_VALIDATE_NONE, &err_offset)); - ASSERT (bson_iter_init (&iter, &bson)); - ASSERT (bson_iter_next (&iter)); - ASSERT (BSON_ITER_HOLDS_BOOL (&iter)); - ASSERT (bson_iter_bool (&iter)); - - /* replace boolean value 1 with 255 */ - ASSERT (data[7] == '\x01'); - data[7] = (uint8_t) '\xff'; - - ASSERT (bson_init_static (&bson, data, 9)); - ASSERT (!bson_validate (&bson, BSON_VALIDATE_NONE, &err_offset)); - ASSERT_CMPSIZE_T (err_offset, ==, (size_t) 7); - - ASSERT (bson_iter_init (&iter, &bson)); - ASSERT (!bson_iter_next (&iter)); + const size_t n_docs = depth + 1; + // Needed size: 5 bytes for doc header/trailer, 2 bytes for each tag and empty + // key, minus 2 because the outer document has no tag and key + const size_t buffer_size = (n_docs * (5 + 2)) - 2; + uint8_t *const buffer = calloc (buffer_size, 1); + mlib_check (buffer); + uint8_t *out = buffer; + mlib_foreach_urange (i, n_docs) { + // Bytes we have already written: + const size_t begin_offset = (size_t) (out - buffer); + // The number of bytes for this inner doc: + size_t inner_size = buffer_size; + mlib_check (!mlib_sub (&inner_size, begin_offset)); + mlib_check (!mlib_sub (&inner_size, i)); + // Write a header: + out = (uint8_t *) mlib_write_i32le (out, mlib_assert_narrow (int32_t, inner_size)); + // Add a new element header if we're not at the innermost doc + if (!loop.last) { + *out++ = 0x3; // Document tag + ++out; // Leave a null terminator to make a "" key string + } + } + bson_t big; + mlib_check (bson_init_static (&big, buffer, buffer_size)); + bson_copy_to (&big, dst); + free (buffer); } - -/* BSON spec requires the deprecated DBPointer's value to be NULL-termed */ +/** + * @brief Test case: Check that we stop validating if we go too deep. + * + * The current validation is implemented as a simple recursive algorithm. This + * is fast since it doesn't allocate, but we risk blowing out the stack if the + * data is too deep. We don't want to crash user applications because of untrusted + * input, so assert that we stop when we hit a reasonably high depth. + */ static void -test_bson_validate_dbpointer (void) +test_bson_validate_deep (void) { - /* { "a": DBPointer(ObjectId(...), Collection="b") }, implicit NULL at end */ - uint8_t data[] = "\x1A\x00\x00\x00\x0C\x61\x00\x02\x00\x00\x00\x62\x00" - "\x56\xE1\xFC\x72\xE0\xC9\x17\xE9\xC4\x71\x41\x61"; - - bson_t bson; - bson_iter_t iter; - size_t err_offset = 0; - uint32_t collection_len; - const char *collection; - const bson_oid_t *oid; - - ASSERT (bson_init_static (&bson, data, sizeof data)); - ASSERT (bson_validate (&bson, BSON_VALIDATE_NONE, &err_offset)); - ASSERT (bson_iter_init (&iter, &bson)); - ASSERT (bson_iter_next (&iter)); - ASSERT (BSON_ITER_HOLDS_DBPOINTER (&iter)); - bson_iter_dbpointer (&iter, &collection_len, &collection, &oid); - ASSERT_CMPSTR (collection, "b"); - ASSERT_CMPINT (collection_len, ==, 1); - - /* replace the NULL terminator of "b" with 255 */ - ASSERT (data[12] == '\0'); - data[12] = (uint8_t) '\xff'; - - ASSERT (bson_init_static (&bson, data, sizeof data)); - ASSERT (!bson_validate (&bson, BSON_VALIDATE_NONE, &err_offset)); - ASSERT_CMPSIZE_T (err_offset, ==, (size_t) 12); - - ASSERT (bson_iter_init (&iter, &bson)); - ASSERT (!bson_iter_next (&iter)); + bson_t deep; + // Just barely too deep + _make_deep_bson (&deep, BSON_VALIDATION_MAX_NESTING_DEPTH + 1); + bson_error_t err; + mlib_check (!bson_validate_with_error (&deep, 0, &err)); + mlib_check (err.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check (err.message, str_eq, "BSON document nesting depth is too deep"); + bson_destroy (&deep); + // At the limit + _make_deep_bson (&deep, BSON_VALIDATION_MAX_NESTING_DEPTH); + mlib_check (bson_validate (&deep, 0, NULL)); + bson_destroy (&deep); } - static void test_bson_validate_with_error_and_offset (void) { @@ -1132,108 +926,6 @@ test_bson_validate_with_error_and_offset static void -test_bson_validate (void) -{ - char filename[64]; - size_t offset; - bson_t *b; - int i; - bson_error_t error; - - for (i = 1; i <= 38; i++) { - bson_snprintf (filename, sizeof filename, "test%d.bson", i); - b = get_bson (filename); - BSON_ASSERT (bson_validate (b, BSON_VALIDATE_NONE, &offset)); - bson_destroy (b); - } - - b = get_bson ("codewscope.bson"); - BSON_ASSERT (bson_validate (b, BSON_VALIDATE_NONE, &offset)); - bson_destroy (b); - - b = get_bson ("empty_key.bson"); - BSON_ASSERT (bson_validate ( - b, BSON_VALIDATE_NONE | BSON_VALIDATE_UTF8 | BSON_VALIDATE_DOLLAR_KEYS | BSON_VALIDATE_DOT_KEYS, &offset)); - bson_destroy (b); - -#define VALIDATE_TEST(_filename, _flags, _offset, _flag, _msg) \ - b = get_bson (_filename); \ - BSON_ASSERT (!bson_validate_with_error_and_offset (b, _flags, &offset, &error)); \ - ASSERT_CMPSIZE_T (offset, ==, (size_t) _offset); \ - ASSERT_ERROR_CONTAINS (error, BSON_ERROR_INVALID, _flag, _msg); \ - bson_destroy (b) - - VALIDATE_TEST ("overflow2.bson", BSON_VALIDATE_NONE, 9, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("trailingnull.bson", BSON_VALIDATE_NONE, 14, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("dollarquery.bson", - BSON_VALIDATE_DOLLAR_KEYS | BSON_VALIDATE_DOT_KEYS, - 4, - BSON_VALIDATE_DOLLAR_KEYS, - "keys cannot begin with \"$\": \"$query\""); - VALIDATE_TEST ("dotquery.bson", - BSON_VALIDATE_DOLLAR_KEYS | BSON_VALIDATE_DOT_KEYS, - 4, - BSON_VALIDATE_DOT_KEYS, - "keys cannot contain \".\": \"abc.def\""); - VALIDATE_TEST ("overflow3.bson", BSON_VALIDATE_NONE, 9, BSON_VALIDATE_NONE, "corrupt BSON"); - /* same outcome as above, despite different flags */ - VALIDATE_TEST ("overflow3.bson", BSON_VALIDATE_UTF8, 9, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("overflow4.bson", BSON_VALIDATE_NONE, 9, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("empty_key.bson", BSON_VALIDATE_EMPTY_KEYS, 4, BSON_VALIDATE_EMPTY_KEYS, "empty key"); - VALIDATE_TEST ("test40.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test41.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test42.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test43.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test44.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test45.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test46.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test47.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test48.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test49.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test50.bson", BSON_VALIDATE_NONE, 10, BSON_VALIDATE_NONE, "corrupt code-with-scope"); - VALIDATE_TEST ("test51.bson", BSON_VALIDATE_NONE, 10, BSON_VALIDATE_NONE, "corrupt code-with-scope"); - VALIDATE_TEST ("test52.bson", BSON_VALIDATE_NONE, 9, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test53.bson", BSON_VALIDATE_NONE, 6, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test54.bson", BSON_VALIDATE_NONE, 12, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test59.bson", BSON_VALIDATE_NONE, 9, BSON_VALIDATE_NONE, "corrupt BSON"); - VALIDATE_TEST ("test60.bson", BSON_VALIDATE_NONE, 4, BSON_VALIDATE_NONE, "corrupt BSON"); - - /* DBRef validation */ - b = BCON_NEW ("my_dbref", "{", "$ref", BCON_UTF8 ("collection"), "$id", BCON_INT32 (1), "}"); - BSON_ASSERT (bson_validate_with_error (b, BSON_VALIDATE_NONE, &error)); - BSON_ASSERT (bson_validate_with_error (b, BSON_VALIDATE_DOLLAR_KEYS, &error)); - bson_destroy (b); - - /* needs "$ref" before "$id" */ - b = BCON_NEW ("my_dbref", "{", "$id", BCON_INT32 (1), "}"); - BSON_ASSERT (bson_validate_with_error (b, BSON_VALIDATE_NONE, &error)); - BSON_ASSERT (!bson_validate_with_error (b, BSON_VALIDATE_DOLLAR_KEYS, &error)); - ASSERT_ERROR_CONTAINS ( - error, BSON_ERROR_INVALID, BSON_VALIDATE_DOLLAR_KEYS, "keys cannot begin with \"$\": \"$id\""); - bson_destroy (b); - - /* two $refs */ - b = BCON_NEW ("my_dbref", "{", "$ref", BCON_UTF8 ("collection"), "$ref", BCON_UTF8 ("collection"), "}"); - BSON_ASSERT (bson_validate_with_error (b, BSON_VALIDATE_NONE, &error)); - BSON_ASSERT (!bson_validate_with_error (b, BSON_VALIDATE_DOLLAR_KEYS, &error)); - ASSERT_ERROR_CONTAINS ( - error, BSON_ERROR_INVALID, BSON_VALIDATE_DOLLAR_KEYS, "keys cannot begin with \"$\": \"$ref\""); - bson_destroy (b); - - /* must not contain invalid key like "extra" */ - b = - BCON_NEW ("my_dbref", "{", "$ref", BCON_UTF8 ("collection"), "extra", BCON_INT32 (2), "$id", BCON_INT32 (1), "}"); - BSON_ASSERT (bson_validate_with_error (b, BSON_VALIDATE_NONE, &error)); - BSON_ASSERT (!bson_validate_with_error (b, BSON_VALIDATE_DOLLAR_KEYS, &error)); - ASSERT_ERROR_CONTAINS ( - error, BSON_ERROR_INVALID, BSON_VALIDATE_DOLLAR_KEYS, "invalid key within DBRef subdocument: \"extra\""); - bson_destroy (b); - -#undef VALIDATE_TEST -} - - -static void test_bson_init (void) { bson_t b; @@ -1279,11 +971,9 @@ test_bson_new_from_buffer (void) { // Buffer size matches document size { - uint8_t *buf = bson_malloc0 (5); size_t len = 5; - uint32_t len_le = BSON_UINT32_TO_LE (5); - - memcpy (buf, &len_le, sizeof (len_le)); + uint8_t *buf = bson_malloc0 (5); + mlib_write_i32le (buf, 5); bson_t *b = bson_new_from_buffer (&buf, &len, bson_realloc_ctx, NULL); @@ -1815,7 +1505,6 @@ test_bson_steal (void) uint8_t *alloc; uint8_t *buf; size_t len; - uint32_t len_le; /* inline, stack-allocated */ bson_init (&stack_alloced); @@ -1861,8 +1550,7 @@ test_bson_steal (void) /* test stealing from a bson created with bson_new_from_buffer */ buf = bson_malloc0 (5); len = 5; - len_le = BSON_UINT32_TO_LE (5); - memcpy (buf, &len_le, sizeof (len_le)); + mlib_write_u32le (buf, 5); heap_alloced = bson_new_from_buffer (&buf, &len, bson_realloc_ctx, NULL); ASSERT (bson_steal (&dst, heap_alloced)); ASSERT (dst.flags & BSON_FLAG_NO_FREE); @@ -1947,7 +1635,6 @@ test_bson_reserve_buffer_errors (void) bson_t bson = BSON_INITIALIZER; bson_t child; uint8_t data[5] = {0}; - uint32_t len_le; /* too big */ ASSERT (!bson_reserve_buffer (&bson, (uint32_t) (BSON_MAX_SIZE + 1u))); @@ -1959,8 +1646,7 @@ test_bson_reserve_buffer_errors (void) bson_destroy (&bson); /* make a static bson, it refuses bson_reserve_buffer since it's read-only */ - len_le = BSON_UINT32_TO_LE (5); - memcpy (data, &len_le, sizeof (len_le)); + mlib_write_u32le (data, 5); ASSERT (bson_init_static (&bson, data, sizeof data)); ASSERT (!bson_reserve_buffer (&bson, 10)); @@ -2721,7 +2407,7 @@ test_bson_dsl_build (void) // Insert a subdoc bson_t *subdoc = TMP_BSON_FROM_JSON ({"child" : [ 1, 2, 3 ], "other" : null}); - bsonBuild (doc, kv ("subdoc", doc (insert (*subdoc, true)))); + bsonBuild (doc, kv ("subdoc", doc (insert (*subdoc, always)))); ASSERT_BSON_EQUAL (doc, {"subdoc" : {"child" : [ 1, 2, 3 ], "other" : null}}); bson_destroy (&doc); @@ -2736,7 +2422,7 @@ test_bson_dsl_build (void) doc (kv ("inner1", array ()), kv ("inner2", null), kv ("inner3", array (int32 (1), int32 (2), int32 (3))), - insert (*subdoc, true), + insert (*subdoc, always), kv ("inner4", doc (kv ("innermost", int32 (42))))))); ASSERT_BSON_EQUAL (doc, { "top" : { @@ -3314,10 +3000,7 @@ test_bson_install (TestSuite *suite) TestSuite_Add (suite, "/bson/append_general", test_bson_append_general); TestSuite_Add (suite, "/bson/append_deep", test_bson_append_deep); TestSuite_Add (suite, "/bson/utf8_key", test_bson_utf8_key); - TestSuite_Add (suite, "/bson/validate", test_bson_validate); - TestSuite_Add (suite, "/bson/validate/dbref", test_bson_validate_dbref); - TestSuite_Add (suite, "/bson/validate/bool", test_bson_validate_bool); - TestSuite_Add (suite, "/bson/validate/dbpointer", test_bson_validate_dbpointer); + TestSuite_Add (suite, "/bson/validate/deep", test_bson_validate_deep); TestSuite_Add (suite, "/bson/validate/with_error_and_offset", test_bson_validate_with_error_and_offset); TestSuite_Add (suite, "/bson/new_1mm", test_bson_new_1mm); TestSuite_Add (suite, "/bson/init_1mm", test_bson_init_1mm); diff -pruN 1.30.4-1/src/libbson/tests/test-iso8601.c 2.0.2-1/src/libbson/tests/test-iso8601.c --- 1.30.4-1/src/libbson/tests/test-iso8601.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-iso8601.c 2025-06-19 15:42:22.000000000 +0000 @@ -2,7 +2,7 @@ #include #include "TestSuite.h" -#include +#include #include #include @@ -16,7 +16,7 @@ test_date (const char *str, int64_t mill const size_t len = strlen (str); - BSON_ASSERT (mcommon_in_range_unsigned (int32_t, len)); + BSON_ASSERT (mlib_in_range (int32_t, len)); if (!_bson_iso8601_date_parse (str, (int32_t) len, &v, &error)) { fprintf (stderr, "could not parse (%s)\n", str); @@ -61,7 +61,7 @@ test_date_should_fail (const char *str) const size_t len = strlen (str); - BSON_ASSERT (mcommon_in_range_unsigned (int32_t, len)); + BSON_ASSERT (mlib_in_range (int32_t, len)); if (_bson_iso8601_date_parse (str, (int32_t) len, &v, &error)) { fprintf (stderr, "should not be able to parse (%s)\n", str); diff -pruN 1.30.4-1/src/libbson/tests/test-iter.c 2.0.2-1/src/libbson/tests/test-iter.c --- 1.30.4-1/src/libbson/tests/test-iter.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-iter.c 2025-06-19 15:42:22.000000000 +0000 @@ -18,6 +18,7 @@ #include #include "TestSuite.h" +#include #define FUZZ_N_PASSES 100000 @@ -205,18 +206,15 @@ test_bson_iter_fuzz (void) { uint8_t *data; uint32_t len = 512; - uint32_t len_le; uint32_t r; bson_iter_t iter; bson_t *b; uint32_t i; int pass; - len_le = BSON_UINT32_TO_LE (len); - for (pass = 0; pass < FUZZ_N_PASSES; pass++) { data = bson_malloc0 (len); - memcpy (data, &len_le, sizeof (len_le)); + mlib_write_u32le (data, len); for (i = 4; i < len; i += 4) { r = rand (); @@ -253,8 +251,7 @@ test_bson_iter_fuzz (void) BSON_ASSERT (child_len >= 5); BSON_ASSERT ((iter.off + child_len) < b->len); BSON_ASSERT (child_len < (uint32_t) -1); - memcpy (&child_len, child, sizeof (child_len)); - child_len = BSON_UINT32_FROM_LE (child_len); + child_len = mlib_read_u32le (child); BSON_ASSERT (child_len >= 5); } } break; diff -pruN 1.30.4-1/src/libbson/tests/test-json.c 2.0.2-1/src/libbson/tests/test-json.c --- 1.30.4-1/src/libbson/tests/test-json.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-json.c 2025-06-19 15:42:22.000000000 +0000 @@ -1,5 +1,7 @@ /* required on old Windows for rand_s to be defined */ +#ifdef _WIN32 #define _CRT_RAND_S +#endif #include #include @@ -7,7 +9,7 @@ #include "TestSuite.h" #include "test-conveniences.h" #include -#include +#include #include #include #include @@ -1191,7 +1193,7 @@ test_bson_json_error (const char *json, bson = bson_new_from_json ((const uint8_t *) json, strlen (json), &error); BSON_ASSERT (!bson); - BSON_ASSERT (error.domain == domain); + BSON_ASSERT (mlib_cmp (error.domain, ==, domain)); BSON_ASSERT (error.code == code); } @@ -2718,7 +2720,7 @@ test_bson_as_json_with_opts (bson_t *bso ASSERT_CMPSIZE_T (json_len, ==, strlen (expected)); if (max_len != BSON_MAX_LEN_UNLIMITED) { - ASSERT (mcommon_in_range_signed (size_t, max_len)); + ASSERT (mlib_in_range (size_t, max_len)); ASSERT_CMPSIZE_T (json_len, <=, (size_t) max_len); } @@ -2747,7 +2749,7 @@ run_bson_as_json_with_opts_tests (bson_t const size_t ulen = strlen (expected); char *truncated; - BSON_ASSERT (mcommon_in_range_unsigned (int, ulen)); + BSON_ASSERT (mlib_in_range (int, ulen)); const int len = (int) ulen; /* Test with 0 length (empty string). */ @@ -3213,7 +3215,7 @@ _test_bson_json_utf8_truncation (bson_t if (arg < 0) { BSON_ASSERT (arg == -1); break; - } else if (arg == checking_len) { + } else if (mlib_cmp (arg, ==, checking_len)) { expect_truncation_here = false; } } diff -pruN 1.30.4-1/src/libbson/tests/test-oid.c 2.0.2-1/src/libbson/tests/test-oid.c --- 1.30.4-1/src/libbson/tests/test-oid.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-oid.c 2025-06-19 15:42:22.000000000 +0000 @@ -205,28 +205,6 @@ test_bson_oid_init (void) } -static void -test_bson_oid_init_sequence (void) -{ - bson_context_t *context; - bson_oid_t oid; - bson_oid_t oid2; - int i; - - BEGIN_IGNORE_DEPRECATIONS - context = bson_context_new (BSON_CONTEXT_NONE); - bson_oid_init_sequence (&oid, context); - for (i = 0; i < 10000; i++) { - bson_oid_init_sequence (&oid2, context); - BSON_ASSERT (false == bson_oid_equal (&oid, &oid2)); - BSON_ASSERT (0 > bson_oid_compare (&oid, &oid2)); - bson_oid_copy (&oid2, &oid); - } - bson_context_destroy (context); - END_IGNORE_DEPRECATIONS -} - - static char * get_time_as_string (const bson_oid_t *oid) { @@ -476,7 +454,6 @@ test_oid_install (TestSuite *suite) { TestSuite_Add (suite, "/bson/oid/init", test_bson_oid_init); TestSuite_Add (suite, "/bson/oid/init_from_string", test_bson_oid_init_from_string); - TestSuite_Add (suite, "/bson/oid/init_sequence", test_bson_oid_init_sequence); TestSuite_Add (suite, "/bson/oid/init_with_threads", test_bson_oid_init_with_threads); TestSuite_Add (suite, "/bson/oid/hash", test_bson_oid_hash); TestSuite_Add (suite, "/bson/oid/compare", test_bson_oid_compare); diff -pruN 1.30.4-1/src/libbson/tests/test-string.c 2.0.2-1/src/libbson/tests/test-string.c --- 1.30.4-1/src/libbson/tests/test-string.c 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-string.c 2025-06-19 15:42:22.000000000 +0000 @@ -22,136 +22,6 @@ #include "TestSuite.h" #include "test-libmongoc.h" - -static void -test_bson_string_new (void) -{ - bson_string_t *str; - char *s; - - str = bson_string_new (NULL); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!strcmp (s, "")); - bson_free (s); - - str = bson_string_new (""); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!*s); - BSON_ASSERT (0 == strcmp (s, "")); - bson_free (s); - - str = bson_string_new ("abcdef"); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!strcmp (s, "abcdef")); - bson_free (s); - - str = bson_string_new (""); - s = bson_string_free (str, true); - BSON_ASSERT (!s); -} - - -static void -test_bson_string_append (void) -{ - bson_string_t *str; - char *s; - - str = bson_string_new (NULL); - bson_string_append (str, "christian was here"); - bson_string_append (str, "\n"); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!strcmp (s, "christian was here\n")); - bson_free (s); - - str = bson_string_new (">>>"); - bson_string_append (str, "^^^"); - bson_string_append (str, "<<<"); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!strcmp (s, ">>>^^^<<<")); - bson_free (s); -} - - -static void -test_bson_string_append_c (void) -{ - bson_string_t *str; - char *s; - - str = bson_string_new (NULL); - bson_string_append_c (str, 'c'); - bson_string_append_c (str, 'h'); - bson_string_append_c (str, 'r'); - bson_string_append_c (str, 'i'); - bson_string_append_c (str, 's'); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!strcmp (s, "chris")); - bson_free (s); -} - - -static void -test_bson_string_append_printf (void) -{ - bson_string_t *str; - - str = bson_string_new ("abcd "); - bson_string_append_printf (str, "%d %d %d", 1, 2, 3); - BSON_ASSERT (!strcmp (str->str, "abcd 1 2 3")); - bson_string_truncate (str, 2); - BSON_ASSERT (!strcmp (str->str, "ab")); - bson_string_free (str, true); -} - - -static void -test_bson_string_append_printf_truncate (void) -{ - // mcommon_string_append_printf will always truncate strings between UTF-8 code points. - // Also see /bson/as_json_with_opts/utf8_truncation. Both tests exercise functionality implemented by - // mcommon_utf8_truncate_len(), but printf() uses a different path through mcommon_string. - - for (uint32_t limit = 0; limit < 13; limit++) { - mcommon_string_append_t append; - mcommon_string_set_append_with_limit (mcommon_string_new (""), &append, limit); - mcommon_string_append_printf (&append, "foo \xf4%s%c%c bar", "\x8f", '\xbf', '\xbf'); - const char *expected = "foo \xf4\x8f\xbf\xbf bar"; - const char *str = mcommon_str_from_append (&append); - uint32_t len = mcommon_strlen_from_append (&append); - if (limit >= 4 && limit < 8) { - BSON_ASSERT (len == 4); - } else { - BSON_ASSERT (len == limit); - } - BSON_ASSERT (0 == memcmp (str, expected, len)); - mcommon_string_from_append_destroy (&append); - } -} - - -static void -test_bson_string_append_unichar (void) -{ - static const unsigned char test1[] = {0xe2, 0x82, 0xac, 0}; - bson_string_t *str; - char *s; - - str = bson_string_new (NULL); - bson_string_append_unichar (str, 0x20AC); - s = bson_string_free (str, false); - BSON_ASSERT (s); - BSON_ASSERT (!strcmp (s, (const char *) test1)); - bson_free (s); -} - - static void test_bson_strdup_printf (void) { @@ -331,150 +201,9 @@ test_bson_strcasecmp (void) BSON_ASSERT (bson_strcasecmp ("FoZ", "foo") > 0); } -static void -test_bson_string_truncate (void) -{ - // Test truncating. - { - bson_string_t *str = bson_string_new ("foobar"); - ASSERT_CMPSIZE_T (str->len, ==, 6u); - ASSERT_CMPSIZE_T (str->alloc, ==, 8u); - - bson_string_truncate (str, 2); - ASSERT_CMPSTR (str->str, "fo"); - ASSERT_CMPSIZE_T (str->len, ==, 2u); - ASSERT_CMPSIZE_T (str->alloc, ==, 4u); - bson_string_free (str, true); - } - - // Test truncating to same length. - { - bson_string_t *str = bson_string_new ("foobar"); - ASSERT_CMPSIZE_T (str->len, ==, 6u); - ASSERT_CMPSIZE_T (str->alloc, ==, 8u); - - bson_string_truncate (str, 6u); - ASSERT_CMPSTR (str->str, "foobar"); - ASSERT_CMPUINT32 (str->len, ==, 6u); - ASSERT_CMPSIZE_T (str->alloc, ==, 8u); - bson_string_free (str, true); - } - - // Test truncating to 0. - { - bson_string_t *str = bson_string_new ("foobar"); - ASSERT_CMPSIZE_T (str->len, ==, 6u); - ASSERT_CMPSIZE_T (str->alloc, ==, 8u); - - bson_string_truncate (str, 0u); - ASSERT_CMPSTR (str->str, ""); - ASSERT_CMPUINT32 (str->len, ==, 0u); - ASSERT_CMPSIZE_T (str->alloc, ==, 1u); - bson_string_free (str, true); - } - - // Test truncating beyond string length. - // The documentation for `bson_string_truncate` says the truncated length "must be smaller or equal to the current - // length of the string.". However, `bson_string_truncate` does not reject greater lengths. For backwards - // compatibility, this behavior is preserved. - { - bson_string_t *str = bson_string_new ("a"); - bson_string_truncate (str, 2u); // Is not rejected. - ASSERT_CMPUINT32 (str->len, ==, 2u); - ASSERT_CMPUINT32 (str->alloc, ==, 4u); - bson_string_free (str, true); - } - - // Test truncating in the middle of a UTF-8 sequence, producing invalid UTF-8 as output. - // This is not especially desirable, but the behavior is maintained for compatibility. - { - // From RFC-3629 examples, "A." - bson_string_t *str = bson_string_new ("\x41\xe2\x89\xa2\xce\x91\x2e"); - ASSERT_CMPSIZE_T (str->len, ==, 7u); - ASSERT_CMPSIZE_T (str->alloc, ==, 8u); - - bson_string_truncate (str, 3); - ASSERT_CMPSTR (str->str, "\x41\xe2\x89"); - ASSERT_CMPSIZE_T (str->len, ==, 3u); - ASSERT_CMPSIZE_T (str->alloc, ==, 4u); - bson_string_free (str, true); - } -} - -static void -test_bson_string_capacity (void *unused) -{ - BSON_UNUSED (unused); - - char *large_str = bson_malloc (UINT32_MAX); - memset (large_str, 's', UINT32_MAX); // Do not NULL terminate. Each test case sets NULL byte. - - // Test the largest possible string that can be constructed. - { - large_str[UINT32_MAX - 1u] = '\0'; // Set size. - bson_string_t *str = bson_string_new (large_str); - bson_string_free (str, true); - large_str[UINT32_MAX - 1u] = 's'; // Restore. - } - - // Test appending with `bson_string_append` to get maximum size. - { - large_str[UINT32_MAX - 1u] = '\0'; // Set size. - bson_string_t *str = bson_string_new (""); - bson_string_append (str, large_str); - bson_string_free (str, true); - large_str[UINT32_MAX - 1u] = 's'; // Restore. - } - - // Test appending with `bson_string_append_c` to get maximum size. - { - large_str[UINT32_MAX - 2u] = '\0'; // Set size. - bson_string_t *str = bson_string_new (large_str); - bson_string_append_c (str, 'c'); - bson_string_free (str, true); - large_str[UINT32_MAX - 2u] = 's'; // Restore. - } - - // Test appending with `bson_string_append_printf` to get maximum size. - { - large_str[UINT32_MAX - 2u] = '\0'; // Set size. - bson_string_t *str = bson_string_new (large_str); - bson_string_append_printf (str, "c"); - bson_string_free (str, true); - large_str[UINT32_MAX - 2u] = 's'; // Restore. - } - - // Test appending with single characters. - { - large_str[UINT32_MAX - 2u] = '\0'; // Set size. - bson_string_t *str = bson_string_new (large_str); - bson_string_append_unichar (str, (bson_unichar_t) 's'); - bson_string_free (str, true); - large_str[UINT32_MAX - 2u] = 's'; // Restore. - } - - // Can truncate strings of length close to UINT32_MAX - 1. - { - large_str[UINT32_MAX - 1u] = '\0'; // Set size. - bson_string_t *str = bson_string_new (large_str); - bson_string_truncate (str, UINT32_MAX - 2); // Truncate one character. - ASSERT_CMPSIZE_T (strlen (str->str), ==, UINT32_MAX - 2u); - bson_string_free (str, true); - large_str[UINT32_MAX - 1u] = 's'; // Restore. - } - - bson_free (large_str); -} - void test_string_install (TestSuite *suite) { - TestSuite_Add (suite, "/bson/string/new", test_bson_string_new); - TestSuite_Add (suite, "/bson/string/append", test_bson_string_append); - TestSuite_Add (suite, "/bson/string/append_c", test_bson_string_append_c); - TestSuite_Add (suite, "/bson/string/append_printf", test_bson_string_append_printf); - TestSuite_Add (suite, "/bson/string/append_printf_truncate", test_bson_string_append_printf_truncate); - TestSuite_Add (suite, "/bson/string/append_unichar", test_bson_string_append_unichar); TestSuite_Add (suite, "/bson/string/strdup", test_bson_strdup); TestSuite_Add (suite, "/bson/string/strdup_printf", test_bson_strdup_printf); TestSuite_Add (suite, "/bson/string/strndup", test_bson_strndup); @@ -483,7 +212,4 @@ test_string_install (TestSuite *suite) TestSuite_Add (suite, "/bson/string/snprintf", test_bson_snprintf); TestSuite_Add (suite, "/bson/string/strnlen", test_bson_strnlen); TestSuite_Add (suite, "/bson/string/strcasecmp", test_bson_strcasecmp); - TestSuite_AddFull ( - suite, "/bson/string/capacity", test_bson_string_capacity, NULL, NULL, skip_if_no_large_allocations); - TestSuite_Add (suite, "/bson/string/truncate", test_bson_string_truncate); } diff -pruN 1.30.4-1/src/libbson/tests/test-validate.generated.c 2.0.2-1/src/libbson/tests/test-validate.generated.c --- 1.30.4-1/src/libbson/tests/test-validate.generated.c 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/test-validate.generated.c 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,2513 @@ +// ! This code is GENERATED! Do not edit it directly! +// clang-format off + +#include + +#include + +#include + + +// ! This code is GENERATED! Do not edit it directly! +// Case: empty +static inline void _test_case_empty(void) { + /** + * Test a simple empty document object. + */ + const uint8_t bytes[] = { + 5, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: bad-element +static inline void _test_case_bad_element(void) { + /** + * The element content is not valid + */ + const uint8_t bytes[] = { + 6, 0, 0, 0, 'f', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 6); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: invalid-type +static inline void _test_case_invalid_type(void) { + /** + * The type tag "0x0e" is not a valid type + */ + const uint8_t bytes[] = { + 0x0d, 0, 0, 0, 0x0e, 'f', 'o', 'o', 0, 'f', 'o', 'o', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/invalid/accept +static inline void _test_case_key_invalid_accept(void) { + /** + * The element key contains an invalid UTF-8 byte, but we accept it + * because we aren't doing UTF-8 validation. + */ + const uint8_t bytes[] = { + 0x28, 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 2, 'f', 'o', 'o', 0xff, 'b', + 'a', 'r', 0, 4, 0, 0, 0, 'b', 'a', 'z', 0, 2, 'c', 0, 2, 0, 0, 0, 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/invalid/reject +static inline void _test_case_key_invalid_reject(void) { + /** + * The element key is not valid UTF-8 and we reject it when we do UTF-8 + * validation. + */ + const uint8_t bytes[] = { + 0x28, 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 2, 'f', 'o', 'o', 0xff, 'b', + 'a', 'r', 0, 4, 0, 0, 0, 'b', 'a', 'z', 0, 2, 'c', 0, 2, 0, 0, 0, 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/empty/accept +static inline void _test_case_key_empty_accept(void) { + /** + * The element has an empty string key, and we accept this. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 2, 0, 7, 0, 0, 0, 's', 't', 'r', 'i', 'n', 'g', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/empty/reject +static inline void _test_case_key_empty_reject(void) { + /** + * The element has an empty key, and we can reject it. + */ + const uint8_t bytes[] = { + 0x1b, 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 2, 0, 7, 0, 0, 0, 's', 't', + 'r', 'i', 'n', 'g', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_EMPTY_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_EMPTY_KEYS); + mlib_check(error.message, str_eq, "Element key cannot be an empty string"); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/empty/accept-if-absent +static inline void _test_case_key_empty_accept_if_absent(void) { + /** + * We are checking for empty keys, and accept if they are absent. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 2, 'f', 'o', 'o', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_EMPTY_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dot/accept +static inline void _test_case_key_dot_accept(void) { + /** + * The element key has an ASCII dot, and we accept this since we don't + * ask to validate it. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'f', 'o', 'o', '.', 'b', 'a', 'r', 0, 4, 0, 0, 0, 'b', + 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_EMPTY_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dot/reject +static inline void _test_case_key_dot_reject(void) { + /** + * The element has an ASCII dot, and we reject it when we ask to validate + * it. + */ + const uint8_t bytes[] = { + 0x1f, 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 2, 'f', 'o', 'o', '.', 'b', + 'a', 'r', 0, 4, 0, 0, 0, 'b', 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOT_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOT_KEYS); + mlib_check(error.message, str_eq, "Disallowed '.' in element key: \"foo.bar\""); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dot/accept-if-absent +static inline void _test_case_key_dot_accept_if_absent(void) { + /** + * We are checking for keys with dot '.', and accept if they are absent. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 2, 'f', 'o', 'o', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOT_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dollar/accept +static inline void _test_case_key_dollar_accept(void) { + /** + * We can accept an element key that starts with a dollar '$' sign. + */ + const uint8_t bytes[] = { + 0x1c, 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 2, '$', 'f', 'o', 'o', 0, 4, + 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dollar/reject +static inline void _test_case_key_dollar_reject(void) { + /** + * We can reject an element key that starts with a dollar '$' sign. + */ + const uint8_t bytes[] = { + 0x1c, 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 2, '$', 'f', 'o', 'o', 0, 4, + 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Disallowed '$' in element key: \"$foo\""); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dollar/accept-in-middle +static inline void _test_case_key_dollar_accept_in_middle(void) { + /** + * This contains a element key "foo$bar", but we don't reject this, as we + * only care about keys that *start* with dollars. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'f', 'o', 'o', '$', 'b', 'a', 'r', 0, 4, 0, 0, 0, 'b', + 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: key/dollar/accept-if-absent +static inline void _test_case_key_dollar_accept_if_absent(void) { + /** + * We are validating for dollar-keys, and we accept because this document + * doesn't contain any such keys. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 2, 'f', 'o', 'o', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/simple +static inline void _test_case_utf8_simple(void) { + /** + * Simple UTF-8 string element + */ + const uint8_t bytes[] = { + 0x1d, 0, 0, 0, 2, 's', 't', 'r', 'i', 'n', 'g', 0, 0x0c, 0, 0, 0, 's', 'o', + 'm', 'e', 0x20, 's', 't', 'r', 'i', 'n', 'g', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/missing-null +static inline void _test_case_utf8_missing_null(void) { + /** + * The UTF-8 element "a" contains 4 characters and declares its length of 4, + * but the fourth character is supposed to be a null terminator. In this case, + * it is the letter 'd'. + */ + const uint8_t bytes[] = { + 0x10, 0, 0, 0, 2, 'a', 0, 4, 0, 0, 0, 'a', 'b', 'c', 'd', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 14); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/length-zero +static inline void _test_case_utf8_length_zero(void) { + /** + * UTF-8 string length must always be at least 1 for the null terminator + */ + const uint8_t bytes[] = { + 0x0c, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 6); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/length-too-short +static inline void _test_case_utf8_length_too_short(void) { + /** + * UTF-8 string is three chars and a null terminator, but the declared length is 3 (should be 4) + */ + const uint8_t bytes[] = { + 0x0f, 0, 0, 0, 2, 0, 3, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 12); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/header-too-large +static inline void _test_case_utf8_header_too_large(void) { + /** + * Data { "foo": "bar" } but the declared length of "bar" is way too large. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 2, 'f', 'o', 'o', 0, 0xff, 0xff, 0xff, 0xff, 'b', 'a', 'r', + 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/valid +static inline void _test_case_utf8_valid(void) { + /** + * Validate a valid UTF-8 string with UTF-8 validation enabled. + */ + const uint8_t bytes[] = { + 0x13, 0, 0, 0, 2, 'f', 'o', 'o', 0, 5, 0, 0, 0, 'a', 'b', 'c', 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/invalid/accept +static inline void _test_case_utf8_invalid_accept(void) { + /** + * Validate an invalid UTF-8 string, but accept invalid UTF-8. + */ + const uint8_t bytes[] = { + 0x14, 0, 0, 0, 2, 'f', 'o', 'o', 0, 6, 0, 0, 0, 'a', 'b', 'c', 0xff, 'd', 0, + 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/invalid/reject +static inline void _test_case_utf8_invalid_reject(void) { + /** + * Validate an invalid UTF-8 string, and expect rejection. + */ + const uint8_t bytes[] = { + 0x14, 0, 0, 0, 2, 'f', 'o', 'o', 0, 6, 0, 0, 0, 'a', 'b', 'c', 0xff, 'd', 0, + 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/valid-with-null/accept-1 +static inline void _test_case_utf8_valid_with_null_accept_1(void) { + /** + * This is a valid UTF-8 string that contains a null character. We accept + * it because we don't do UTF-8 validation. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'f', 'o', 'o', 0, 8, 0, 0, 0, 'a', 'b', 'c', 0, '1', '2', + '3', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/valid-with-null/accept-2 +static inline void _test_case_utf8_valid_with_null_accept_2(void) { + /** + * This is a valid UTF-8 string that contains a null character. We allow + * it explicitly when we request UTF-8 validation. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'f', 'o', 'o', 0, 8, 0, 0, 0, 'a', 'b', 'c', 0, '1', '2', + '3', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8 | BSON_VALIDATE_UTF8_ALLOW_NULL, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/valid-with-null/reject +static inline void _test_case_utf8_valid_with_null_reject(void) { + /** + * This is a valid UTF-8 string that contains a null character. We reject + * this because we don't pass BSON_VALIDATE_UTF8_ALLOW_NULL. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'f', 'o', 'o', 0, 8, 0, 0, 0, 'a', 'b', 'c', 0, '1', '2', + '3', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8_ALLOW_NULL); + mlib_check(error.message, str_eq, "UTF-8 string contains a U+0000 (null) character"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/overlong-null/accept-1 +static inline void _test_case_utf8_overlong_null_accept_1(void) { + /** + * This is an *invalid* UTF-8 string, and contains an overlong null. We should + * accept it because we aren't doing UTF-8 validation. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 2, 'f', 'o', 'o', 0, 9, 0, 0, 0, 'a', 'b', 'c', 0xc0, 0x80, + '1', '2', '3', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/overlong-null/accept-2 +static inline void _test_case_utf8_overlong_null_accept_2(void) { + /** + * ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + * + * This is an *invalid* UTF-8 string, because it contains an overlong null + * "0xc0 0x80". Despite being invalid, we accept it because our current UTF-8 + * validation considers the overlong null to be a valid encoding for the null + * codepoint (it isn't, but changing it would be a breaking change). + * + * If/when UTF-8 validation is changed to reject overlong null, then this + * test should change to expect rejection the invalid UTF-8. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 2, 'f', 'o', 'o', 0, 9, 0, 0, 0, 'a', 'b', 'c', 0xc0, 0x80, + '1', '2', '3', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8 | BSON_VALIDATE_UTF8_ALLOW_NULL, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8/overlong-null/reject +static inline void _test_case_utf8_overlong_null_reject(void) { + /** + * ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + * + * This is an *invalid* UTF-8 string, because it contains an overlong null + * character. Our UTF-8 validator wrongly accepts overlong null as a valid + * UTF-8 sequence. This test fails because we disallow null codepoints, not + * because the UTF-8 is invalid, and the error message reflects that. + * + * If/when UTF-8 validation is changed to reject overlong null, then the + * expected error code and error message for this test should change. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 2, 'f', 'o', 'o', 0, 9, 0, 0, 0, 'a', 'b', 'c', 0xc0, 0x80, + '1', '2', '3', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8_ALLOW_NULL); + mlib_check(error.message, str_eq, "UTF-8 string contains a U+0000 (null) character"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8-key/invalid/accept +static inline void _test_case_utf8_key_invalid_accept(void) { + /** + * The element key is not valid UTf-8, but we accept it if we don't do + * UTF-8 validation. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'a', 'b', 'c', 0xff, 'd', 'e', 'f', 0, 4, 0, 0, 0, 'b', + 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8-key/invalid/reject +static inline void _test_case_utf8_key_invalid_reject(void) { + /** + * The element key is not valid UTF-8, and we reject it when we requested + * UTF-8 validation. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 2, 'a', 'b', 'c', 0xff, 'd', 'e', 'f', 0, 4, 0, 0, 0, 'b', + 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8-key/overlong-null/reject +static inline void _test_case_utf8_key_overlong_null_reject(void) { + /** + * ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + * + * The element key is invalid UTF-8 because it contains an overlong null. We accept the + * overlong null as a valid encoding of U+0000, but we reject the key because + * we disallow null in UTF-8 strings. + * + * If/when UTF-8 validation is changed to reject overlong null, then the + * expected error code and error message for this test should change. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 2, 'a', 'b', 'c', 0xc0, 0x80, 'd', 'e', 'f', 0, 4, 0, 0, 0, + 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8_ALLOW_NULL); + mlib_check(error.message, str_eq, "UTF-8 string contains a U+0000 (null) character"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: utf8-key/overlong-null/accept +static inline void _test_case_utf8_key_overlong_null_accept(void) { + /** + * ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + * + * The element key is invalid UTF-8 because it contains an overlong null. We accept the + * overlong null as a valid encoding of U+0000, and we allow it in an element key because + * we pass ALLOW_NULL + * + * If/when UTF-8 validation is changed to reject overlong null, then this + * test case should instead reject the key string as invalid UTF-8. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 2, 'a', 'b', 'c', 0xc0, 0x80, 'd', 'e', 'f', 0, 4, 0, 0, 0, + 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8 | BSON_VALIDATE_UTF8_ALLOW_NULL, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: array/empty +static inline void _test_case_array_empty(void) { + /** + * Simple empty array element + */ + const uint8_t bytes[] = { + 0x11, 0, 0, 0, 4, 'a', 'r', 'r', 'a', 'y', 0, 5, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: array/simple +static inline void _test_case_array_simple(void) { + /** + * Simple array element of integers + */ + const uint8_t bytes[] = { + 0x26, 0, 0, 0, 4, 'a', 'r', 'r', 'a', 'y', 0, 0x1a, 0, 0, 0, 0x10, '0', 0, + 0x2a, 0, 0, 0, 0x10, '1', 0, 0xc1, 6, 0, 0, 0x10, '2', 0, 0xf8, 0xff, 0xff, + 0xff, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: array/invalid-element +static inline void _test_case_array_invalid_element(void) { + /** + * Simple array element of integers, but one element is truncated + */ + const uint8_t bytes[] = { + 0x23, 0, 0, 0, 4, 'a', 'r', 'r', 'a', 'y', 0, 0x17, 0, 0, 0, 0x10, '0', 0, + 0x2a, 0, 0, 0, 0x10, '1', 0, 0, 0x10, '2', 0, 0xf8, 0xff, 0xff, 0xff, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 34); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: array/invalid-element-check-offset +static inline void _test_case_array_invalid_element_check_offset(void) { + /** + * This is the same as the array/invalid-element test, but with a longer + * key string on the parent array. This is to check that the error offset + * is properly adjusted for the additional characters. + */ + const uint8_t bytes[] = { + 0x2b, 0, 0, 0, 4, 'a', 'r', 'r', 'a', 'y', '-', 's', 'h', 'i', 'f', 't', + 'e', 'd', 0, 0x17, 0, 0, 0, 0x10, '0', 0, 0x2a, 0, 0, 0, 0x10, '1', 0, 0, + 0x10, '2', 0, 0xf8, 0xff, 0xff, 0xff, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 42); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: symbol/simple +static inline void _test_case_symbol_simple(void) { + /** + * A simple document: { symbol: Symbol("void 0;") } + */ + const uint8_t bytes[] = { + 0x19, 0, 0, 0, 0x0e, 's', 'y', 'm', 'b', 'o', 'l', 0, 8, 0, 0, 0, 'v', 'o', + 'i', 'd', 0x20, '0', 0x3b, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: symbol/invalid-utf8/accept +static inline void _test_case_symbol_invalid_utf8_accept(void) { + /** + * A simple symbol document, but the string contains invalid UTF-8 + */ + const uint8_t bytes[] = { + 0x1a, 0, 0, 0, 0x0e, 's', 'y', 'm', 'b', 'o', 'l', 0, 9, 0, 0, 0, 'v', 'o', + 'i', 'd', 0xff, 0x20, '0', 0x3b, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: symbol/invalid-utf8/reject +static inline void _test_case_symbol_invalid_utf8_reject(void) { + /** + * A simple symbol document, but the string contains invalid UTF-8 + */ + const uint8_t bytes[] = { + 0x1a, 0, 0, 0, 0x0e, 's', 'y', 'm', 'b', 'o', 'l', 0, 9, 0, 0, 0, 'v', 'o', + 'i', 'd', 0xff, 0x20, '0', 0x3b, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: symbol/length-zero +static inline void _test_case_symbol_length_zero(void) { + /** + * Symbol string length must always be at least 1 for the null terminator + */ + const uint8_t bytes[] = { + 0x0c, 0, 0, 0, 0x0e, 0, 0, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 6); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: symbol/length-too-short +static inline void _test_case_symbol_length_too_short(void) { + /** + * Symbol string is three chars and a null terminator, but the declared + * length is 3 (should be 4) + */ + const uint8_t bytes[] = { + 0x0f, 0, 0, 0, 0x0e, 0, 3, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 12); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code/simple +static inline void _test_case_code_simple(void) { + /** + * A simple document: { code: Code("void 0;") } + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 0x0d, 'c', 'o', 'd', 'e', 0, 8, 0, 0, 0, 'v', 'o', 'i', 'd', + 0x20, '0', 0x3b, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code/invalid-utf8/accept +static inline void _test_case_code_invalid_utf8_accept(void) { + /** + * A simple code document, but the string contains invalid UTF-8 + */ + const uint8_t bytes[] = { + 0x18, 0, 0, 0, 0x0d, 'c', 'o', 'd', 'e', 0, 9, 0, 0, 0, 'v', 'o', 'i', 'd', + 0xff, 0x20, '0', 0x3b, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code/invalid-utf8/reject +static inline void _test_case_code_invalid_utf8_reject(void) { + /** + * A simple code document, but the string contains invalid UTF-8 + */ + const uint8_t bytes[] = { + 0x18, 0, 0, 0, 0x0d, 'c', 'o', 'd', 'e', 0, 9, 0, 0, 0, 'v', 'o', 'i', 'd', + 0xff, 0x20, '0', 0x3b, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code/length-zero +static inline void _test_case_code_length_zero(void) { + /** + * Code string length must always be at least 1 for the null terminator + */ + const uint8_t bytes[] = { + 0x10, 0, 0, 0, 0x0d, 'c', 'o', 'd', 'e', 0, 0, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 10); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code/length-too-short +static inline void _test_case_code_length_too_short(void) { + /** + * Code string is three chars and a null terminator, but the declared length is 3 (should be 4) + */ + const uint8_t bytes[] = { + 0x13, 0, 0, 0, 0x0d, 'c', 'o', 'd', 'e', 0, 3, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 16); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/simple +static inline void _test_case_code_with_scope_simple(void) { + /** + * A simple valid code-with-scope element + */ + const uint8_t bytes[] = { + 0x1f, 0, 0, 0, 0x0f, 'f', 'o', 'o', 0, 0x15, 0, 0, 0, 8, 0, 0, 0, 'v', 'o', + 'i', 'd', 0x20, '0', 0x3b, 0, 5, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/invalid-code-length-zero +static inline void _test_case_code_with_scope_invalid_code_length_zero(void) { + /** + * Data { "": CodeWithScope("", {}) }, but the code string length is zero, when + * it must be at least 1 + */ + const uint8_t bytes[] = { + 0x15, 0, 0, 0, 0x0f, 0, 0x0a, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 6); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/invalid-code-length-too-large +static inline void _test_case_code_with_scope_invalid_code_length_too_large(void) { + /** + * Data { "": CodeWithScope("", {}) }, but the code string length is way too large + */ + const uint8_t bytes[] = { + 0x15, 0, 0, 0, 0x0f, 0, 0x0a, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0, 5, 0, 0, + 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 6); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/invalid-scope +static inline void _test_case_code_with_scope_invalid_scope(void) { + /** + * A code-with-scope element, but the scope document is corrupted + */ + const uint8_t bytes[] = { + 0x1e, 0, 0, 0, 0x0f, 'f', 'o', 'o', 0, 0x14, 0, 0, 0, 8, 0, 0, 0, 'v', 'o', + 'i', 'd', 0x20, '0', 0x3b, 0, 5, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/empty-key-in-scope +static inline void _test_case_code_with_scope_empty_key_in_scope(void) { + /** + * A code-with-scope element. The scope itself contains empty keys within + * objects, and we ask to reject empty keys. But the scope document should + * be treated as an opaque closure, so our outer validation rules do not + * apply. + */ + const uint8_t bytes[] = { + '7', 0, 0, 0, 0x0f, 'c', 'o', 'd', 'e', 0, 0x2c, 0, 0, 0, 8, 0, 0, 0, 'v', + 'o', 'i', 'd', 0x20, '0', 0x3b, 0, 0x1c, 0, 0, 0, 3, 'o', 'b', 'j', 0, 0x12, + 0, 0, 0, 2, 0, 7, 0, 0, 0, 's', 't', 'r', 'i', 'n', 'g', 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_EMPTY_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/corrupt-scope +static inline void _test_case_code_with_scope_corrupt_scope(void) { + /** + * A code-with-scope element, but the scope contains corruption + */ + const uint8_t bytes[] = { + 0x2a, 0, 0, 0, 0x0f, 'c', 'o', 'd', 'e', 0, 0x1f, 0, 0, 0, 8, 0, 0, 0, 'v', + 'o', 'i', 'd', 0x20, '0', 0x3b, 0, 0x0f, 0, 0, 0, 2, 'f', 'o', 'o', 0, 0, 0, + 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "Error in scope document for element \"code\": corrupt BSON"); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: code-with-scope/corrupt-scope-2 +static inline void _test_case_code_with_scope_corrupt_scope_2(void) { + /** + * A code-with-scope element, but the scope contains corruption + */ + const uint8_t bytes[] = { + 0x2a, 0, 0, 0, 0x0f, 'c', 'o', 'd', 'e', 0, 0x1f, 0, 0, 0, 8, 0, 0, 0, 'v', + 'o', 'i', 'd', 0x20, '0', 0x3b, 0, 0x0f, 0, 0, 0, 2, 'f', 'o', 'o', 0, 0xff, + 0xff, 0xff, 0xff, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "Error in scope document for element \"code\": corrupt BSON"); + mlib_check(offset, eq, 13); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: regex/simple +static inline void _test_case_regex_simple(void) { + /** + * Simple document: { regex: Regex("1234", "gi") } + */ + const uint8_t bytes[] = { + 0x14, 0, 0, 0, 0x0b, 'r', 'e', 'g', 'e', 'x', 0, '1', '2', '3', '4', 0, 'g', + 'i', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: regex/invalid-opts +static inline void _test_case_regex_invalid_opts(void) { + /** + * A regular expression element with missing null terminator. The main + * option string "foo" has a null terminator, but the option component "bar" + * does not have a null terminator. A naive parse will see the doc's null + * terminator as the null terminator for the options string, but that's + * invalid! + */ + const uint8_t bytes[] = { + 0x13, 0, 0, 0, 0x0b, 'r', 'e', 'g', 'e', 'x', 0, 'f', 'o', 'o', 0, 'b', 'a', + 'r', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: regex/double-null +static inline void _test_case_regex_double_null(void) { + /** + * A regular expression element with an extra null terminator. Since regex + * is delimited by its null terminator, the iterator will stop early before + * the actual EOD. + */ + const uint8_t bytes[] = { + 0x15, 0, 0, 0, 0x0b, 'r', 'e', 'g', 'e', 'x', 0, 'f', 'o', 'o', 0, 'b', 'a', + 'r', 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 21); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: regex/invalid-utf8/accept +static inline void _test_case_regex_invalid_utf8_accept(void) { + /** + * A regular expression that contains invalid UTF-8. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 0x0b, 'r', 'e', 'g', 'e', 'x', 0, 'f', 'o', 'o', 0xff, 'b', + 'a', 'r', 0, 'g', 'i', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: regex/invalid-utf8/reject +static inline void _test_case_regex_invalid_utf8_reject(void) { + /** + * A regular expression that contains invalid UTF-8. + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 0x0b, 'r', 'e', 'g', 'e', 'x', 0, 'f', 'o', 'o', 0xff, 'b', + 'a', 'r', 0, 'g', 'i', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: regex/invalid-utf8/accept-if-absent +static inline void _test_case_regex_invalid_utf8_accept_if_absent(void) { + /** + * A regular valid UTf-8 regex. We check for invalid UTf-8, and accept becaues + * the regex is fine. + */ + const uint8_t bytes[] = { + 0x13, 0, 0, 0, 0x0b, 'r', 'e', 'g', 'e', 'x', 0, 'f', 'o', 'o', 0, 'g', 'i', + 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/string-length-zero +static inline void _test_case_dbpointer_string_length_zero(void) { + /** + * Document { "foo": DBPointer("", ) }, but the length header on the inner + * string is zero, when it must be at least 1. + */ + const uint8_t bytes[] = { + 0x1b, 0, 0, 0, 0x0c, 'f', 'o', 'o', 0, 0, 0, 0, 0, 0, 'R', 'Y', 0xb5, 'j', + 0xfa, 0x5b, 0xd8, 'A', 0xd6, 'X', 0x5d, 0x99, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/string-length-too-big +static inline void _test_case_dbpointer_string_length_too_big(void) { + /** + * Document { "foo": DBPointer("foobar", ) }, but the length header on the inner + * string is far too large + */ + const uint8_t bytes[] = { + 0x21, 0, 0, 0, 0x0c, 'f', 'o', 'o', 0, 0xff, 0xff, 0xff, 0xff, 'f', 'o', + 'o', 'b', 'a', 'r', 0, 'R', 'Y', 0xb5, 'j', 0xfa, 0x5b, 0xd8, 'A', 0xd6, + 'X', 0x5d, 0x99, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/truncated +static inline void _test_case_dbpointer_truncated(void) { + /** + * Document { "foo": DBPointer("foobar", ) }, but the length header on + * the string is one byte too large, causing it to use the first byte of the + * OID as the null terminator. This should fail when iterating. + */ + const uint8_t bytes[] = { + '2', 0, 0, 0, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 0x0c, 'f', 'o', 'o', 0, 7, 0, + 0, 0, 'f', 'o', 'o', 'b', 'a', 'r', 0, 'Y', 0xb5, 'j', 0xfa, 0x5b, 0xd8, + 'A', 0xd6, 'X', 0x5d, 0x99, 2, 'a', 0, 2, 0, 0, 0, 'b', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 43); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/missing-null +static inline void _test_case_dbpointer_missing_null(void) { + /** + * Document { "foo": DBPointer("abcd", ) }, the length header on + * the string is 4, but the fourth byte is not a null terminator. + */ + const uint8_t bytes[] = { + 0x1e, 0, 0, 0, 0x0c, 'f', 'o', 'o', 0, 4, 0, 0, 0, 'a', 'b', 'c', 'd', 'R', + 'Y', 0xb5, 'j', 0xfa, 0x5b, 0xd8, 'A', 0xd6, 'X', 0x5d, 0x99, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 16); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/invalid-utf8/accept +static inline void _test_case_dbpointer_invalid_utf8_accept(void) { + /** + * DBPointer document, but the collection string contains invalid UTF-8 + */ + const uint8_t bytes[] = { + 0x22, 0, 0, 0, 0x0c, 'f', 'o', 'o', 0, 8, 0, 0, 0, 'a', 'b', 'c', 0xff, 'd', + 'e', 'f', 0, 'R', 'Y', 0xb5, 'j', 0xfa, 0x5b, 0xd8, 'A', 0xd6, 'X', 0x5d, + 0x99, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/invalid-utf8/reject +static inline void _test_case_dbpointer_invalid_utf8_reject(void) { + /** + * DBPointer document, but the collection string contains invalid UTF-8 + */ + const uint8_t bytes[] = { + 0x22, 0, 0, 0, 0x0c, 'f', 'o', 'o', 0, 8, 0, 0, 0, 'a', 'b', 'c', 0xff, 'd', + 'e', 'f', 0, 'R', 'Y', 0xb5, 'j', 0xfa, 0x5b, 0xd8, 'A', 0xd6, 'X', 0x5d, + 0x99, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_UTF8); + mlib_check(error.message, str_eq, "Text element is not valid UTF-8"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbpointer/invalid-utf8/accept-if-absent +static inline void _test_case_dbpointer_invalid_utf8_accept_if_absent(void) { + /** + * DBPointer document, and we validate UTF-8. Accepts because there is no + * invalid UTF-8 here. + */ + const uint8_t bytes[] = { + 0x21, 0, 0, 0, 0x0c, 'f', 'o', 'o', 0, 7, 0, 0, 0, 'a', 'b', 'c', 'd', 'e', + 'f', 0, 'R', 'Y', 0xb5, 'j', 0xfa, 0x5b, 0xd8, 'A', 0xd6, 'X', 0x5d, 0x99, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_UTF8, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/simple +static inline void _test_case_subdoc_simple(void) { + /** + * A simple document: { doc: { foo: "bar" } } + */ + const uint8_t bytes[] = { + 0x1c, 0, 0, 0, 3, 'd', 'o', 'c', 0, 0x12, 0, 0, 0, 2, 'f', 'o', 'o', 0, 4, + 0, 0, 0, 'b', 'a', 'r', 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/invalid-shared-null +static inline void _test_case_subdoc_invalid_shared_null(void) { + /** + * A truncated subdocument element, with its null terminator accidentally + * overlapping the parent document's null. + */ + const uint8_t bytes[] = { + 0x0e, 0, 0, 0, 3, 'd', 'o', 'c', 0, 5, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/overlapping-utf8-null +static inline void _test_case_subdoc_overlapping_utf8_null(void) { + /** + * Encodes the document: + * + * { "foo": { "bar": "baz" } } + * + * but the foo.bar UTF-8 string is truncated improperly and reuses the null + * terminator for "foo" + */ + const uint8_t bytes[] = { + 0x1c, 0, 0, 0, 3, 'd', 'o', 'c', 0, 0x12, 0, 0, 0, 2, 'b', 'a', 'r', 0, 5, + 0, 0, 0, 'b', 'a', 'z', 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/invalid-element +static inline void _test_case_subdoc_invalid_element(void) { + /** + * A subdocument that contains an invalid element + */ + const uint8_t bytes[] = { + 0x18, 0, 0, 0, 3, 'd', 'o', 'c', 0, 0x0e, 0, 0, 0, 1, 'd', 'b', 'l', 0, 'a', + 'b', 'c', 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/header-too-large +static inline void _test_case_subdoc_header_too_large(void) { + /** + * Data {"foo": {}}, but the subdoc header is too large. + */ + const uint8_t bytes[] = { + 0x0f, 0, 0, 0, 3, 'f', 'o', 'o', 0, 0xf7, 0xff, 0xff, 0xff, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/header-too-small +static inline void _test_case_subdoc_header_too_small(void) { + /** + * Nested document with a header value of 4, which is always too small. + */ + const uint8_t bytes[] = { + 0x0f, 0, 0, 0, 3, 't', 'e', 's', 't', 0, 4, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: subdoc/impossible-size +static inline void _test_case_subdoc_impossible_size(void) { + /** + * Data {"foo": {}}, but the subdoc header is UINT32_MAX/INT32_MIN, which + * becomes is an invalid document header. + */ + const uint8_t bytes[] = { + 0x0f, 0, 0, 0, 3, 'f', 'o', 'o', 0, 0xff, 0xff, 0xff, 0xff, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: null/simple +static inline void _test_case_null_simple(void) { + /** + * A simple document: { "null": null } + */ + const uint8_t bytes[] = { + 0x0b, 0, 0, 0, 0x0a, 'n', 'u', 'l', 'l', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: undefined/simple +static inline void _test_case_undefined_simple(void) { + /** + * A simple document: { "undefined": undefined } + */ + const uint8_t bytes[] = { + 0x10, 0, 0, 0, 6, 'u', 'n', 'd', 'e', 'f', 'i', 'n', 'e', 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/simple +static inline void _test_case_binary_simple(void) { + /** + * Simple binary data { "binary": Binary(0x80, b'12345') } + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 5, 'b', 'i', 'n', 'a', 'r', 'y', 0, 5, 0, 0, 0, 0x80, '1', + '2', '3', '4', '5', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/bad-length-zero-subtype-2 +static inline void _test_case_binary_bad_length_zero_subtype_2(void) { + /** + * Binary data that has an invalid length header. It is subtype 2, + * which means it contains an additional length header. + */ + const uint8_t bytes[] = { + 0x1a, 0, 0, 0, 5, 'b', 'i', 'n', 'a', 'r', 'y', 0, 0, 0, 0, 0, 2, 4, 0, 0, + 0, '1', '2', '3', '4', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 12); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/bad-inner-length-on-subtype-2 +static inline void _test_case_binary_bad_inner_length_on_subtype_2(void) { + /** + * Binary data that has an valid outer length header, but the inner length + * header for subtype 2 has an incorrect value. + */ + const uint8_t bytes[] = { + 0x1a, 0, 0, 0, 5, 'b', 'i', 'n', 'a', 'r', 'y', 0, 8, 0, 0, 0, 2, 2, 0, 0, + 0, '1', '2', '3', '4', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 17); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/bad-length-too-small +static inline void _test_case_binary_bad_length_too_small(void) { + /** + * Data { "binary": Binary(0x80, b'1234') }, but the length header on + * the Binary object is too small. + * + * This won't cause the binary to decode wrong, but it will cause the iterator + * to jump into the middle of the binary data which will not decode as a + * proper BSON element. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 5, 'b', 'i', 'n', 'a', 'r', 'y', 0, 2, 0, 0, 0, 0x80, '1', + '2', '3', '4', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 22); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/bad-length-too-big +static inline void _test_case_binary_bad_length_too_big(void) { + /** + * Data { "binary": Binary(0x80, b'1234') }, but the length header on + * the Binary object is too large. + */ + const uint8_t bytes[] = { + 0x16, 0, 0, 0, 5, 'b', 'i', 'n', 'a', 'r', 'y', 0, 0xf3, 0xff, 0xff, 0xff, + 0x80, '1', '2', '3', '4', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 12); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/old-invalid/1 +static inline void _test_case_binary_old_invalid_1(void) { + /** + * This is an old-style binary type 0x2. It has an inner length header of 5, + * but it should be 4. + */ + const uint8_t bytes[] = { + 0x1a, 0, 0, 0, 5, 'b', 'i', 'n', 'a', 'r', 'y', 0, 8, 0, 0, 0, 2, 5, 0, 0, + 0, 'a', 'b', 'c', 'd', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 17); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: binary/old-invalid/2 +static inline void _test_case_binary_old_invalid_2(void) { + /** + * This is an old-style binary type 0x2. The data segment is too small to + * be valid. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 5, 'b', 'i', 'n', 0, 3, 0, 0, 0, 2, 'a', 'b', 'c', 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: minkey/simple +static inline void _test_case_minkey_simple(void) { + /** + * A simple document with a MinKey element + */ + const uint8_t bytes[] = { + 0x0a, 0, 0, 0, 0xff, 'm', 'i', 'n', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: maxkey/simple +static inline void _test_case_maxkey_simple(void) { + /** + * A simple document with a MaxKey element + */ + const uint8_t bytes[] = { + 0x0a, 0, 0, 0, 0x7f, 'm', 'a', 'x', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: int32/simple +static inline void _test_case_int32_simple(void) { + /** + * A simple document with a valid single int32 element + */ + const uint8_t bytes[] = { + 0x10, 0, 0, 0, 0x10, 'i', 'n', 't', '3', '2', 0, 0x2a, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: int32/truncated +static inline void _test_case_int32_truncated(void) { + /** + * Truncated 32-bit integer + */ + const uint8_t bytes[] = { + 0x19, 0, 0, 0, 0x10, 'i', 'n', 't', '3', '2', '-', 't', 'r', 'u', 'n', 'c', + 'a', 't', 'e', 'd', 0, 0x2a, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 21); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: timestamp/simple +static inline void _test_case_timestamp_simple(void) { + /** + * A simple timestamp element + */ + const uint8_t bytes[] = { + 0x18, 0, 0, 0, 0x11, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 0, 0xc1, + 6, 0, 0, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: timestamp/truncated +static inline void _test_case_timestamp_truncated(void) { + /** + * A truncated timestamp element + */ + const uint8_t bytes[] = { + 0x17, 0, 0, 0, 0x11, 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 0, 0xc1, + 6, 0, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 15); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: int64/simple +static inline void _test_case_int64_simple(void) { + /** + * A simple document with a valid single int64 element + */ + const uint8_t bytes[] = { + 0x14, 0, 0, 0, 0x12, 'i', 'n', 't', '6', '4', 0, 0xc1, 6, 0, 0, 0, 0, 0, 0, + 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: int64/truncated +static inline void _test_case_int64_truncated(void) { + /** + * Truncated 64-bit integer + */ + const uint8_t bytes[] = { + 0x1d, 0, 0, 0, 0x12, 'i', 'n', 't', '6', '4', '-', 't', 'r', 'u', 'n', 'c', + 'a', 't', 'e', 'd', 0, 0xc1, 6, 0, 0, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 21); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: double/simple +static inline void _test_case_double_simple(void) { + /** + * Simple float64 element + */ + const uint8_t bytes[] = { + 0x15, 0, 0, 0, 1, 'd', 'o', 'u', 'b', 'l', 'e', 0, 0x1f, 0x85, 0xeb, 'Q', + 0xb8, 0x1e, 9, 0x40, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: double/truncated +static inline void _test_case_double_truncated(void) { + /** + * Truncated 64-bit float + */ + const uint8_t bytes[] = { + 0x1e, 0, 0, 0, 1, 'd', 'o', 'u', 'b', 'l', 'e', '-', 't', 'r', 'u', 'n', + 'c', 'a', 't', 'e', 'd', 0, 0x0a, 0xd7, 0xa3, 'p', 0x3d, 0x0a, 9, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 22); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: boolean/simple-false +static inline void _test_case_boolean_simple_false(void) { + /** + * A simple boolean 'false' + */ + const uint8_t bytes[] = { + 0x0c, 0, 0, 0, 8, 'b', 'o', 'o', 'l', 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: boolean/simple-true +static inline void _test_case_boolean_simple_true(void) { + /** + * A simple boolean 'true' + */ + const uint8_t bytes[] = { + 0x0c, 0, 0, 0, 8, 'b', 'o', 'o', 'l', 0, 1, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: boolean/invalid +static inline void _test_case_boolean_invalid(void) { + /** + * An invalid boolean octet. Must be '0' or '1', but is 0xc3. + */ + const uint8_t bytes[] = { + 0x0c, 0, 0, 0, 8, 'b', 'o', 'o', 'l', 0, 0xc3, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 10); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: datetime/simple +static inline void _test_case_datetime_simple(void) { + /** + * Simple datetime element + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 9, 'u', 't', 'c', 0, 0x0b, 0x98, 0x8c, 0x2b, '3', 1, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: datetime/truncated +static inline void _test_case_datetime_truncated(void) { + /** + * Truncated datetime element + */ + const uint8_t bytes[] = { + 0x11, 0, 0, 0, 9, 'u', 't', 'c', 0, 0x0b, 0x98, 0x8c, 0x2b, '3', 1, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, 0, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_CORRUPT); + mlib_check(error.message, str_eq, "corrupt BSON"); + mlib_check(offset, eq, 9); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/missing-id +static inline void _test_case_dbref_missing_id(void) { + /** + * This dbref document is missing an $id element + */ + const uint8_t bytes[] = { + 0x13, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Expected an $id element following $ref"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/non-id +static inline void _test_case_dbref_non_id(void) { + /** + * The 'bar' element should be an '$id' element. + */ + const uint8_t bytes[] = { + 0x20, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + 'b', 'a', 'r', 0, 4, 0, 0, 0, 'b', 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Expected an $id element following $ref"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/not-first-elements +static inline void _test_case_dbref_not_first_elements(void) { + /** + * This would be a valid DBRef, but the "$ref" key must come first. + */ + const uint8_t bytes[] = { + 0x29, 0, 0, 0, 2, 'f', 'o', 'o', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 2, '$', + 'r', 'e', 'f', 0, 2, 0, 0, 0, 'a', 0, 2, '$', 'i', 'd', 0, 2, 0, 0, 0, 'b', + 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Disallowed '$' in element key: \"$ref\""); + mlib_check(offset, eq, 17); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/ref-without-id-with-db +static inline void _test_case_dbref_ref_without_id_with_db(void) { + /** + * There should be an $id element, but we skip straight to $db + */ + const uint8_t bytes[] = { + 0x20, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'd', 'b', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Expected an $id element following $ref"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/non-string-ref +static inline void _test_case_dbref_non_string_ref(void) { + /** + * The $ref element must be a string, but is an integer. + */ + const uint8_t bytes[] = { + 0x0f, 0, 0, 0, 0x10, '$', 'r', 'e', 'f', 0, 0x2a, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "$ref element must be a UTF-8 element"); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/non-string-db +static inline void _test_case_dbref_non_string_db(void) { + /** + * The $db element should be a string, but is an integer. + */ + const uint8_t bytes[] = { + 0x29, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'i', 'd', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 0x10, '$', 'd', 'b', 0, + 0x2a, 0, 0, 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "$db element in DBRef must be a UTF-8 element"); + mlib_check(offset, eq, 31); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/invalid-extras-between +static inline void _test_case_dbref_invalid_extras_between(void) { + /** + * Almost a valid DBRef, but there is an extra field before $db. We reject $db + * as an invalid key. + */ + const uint8_t bytes[] = { + 0x3e, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'i', 'd', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 2, 'e', 'x', 't', 'r', 'a', + 0, 6, 0, 0, 0, 'f', 'i', 'e', 'l', 'd', 0, 2, '$', 'd', 'b', 0, 4, 0, 0, 0, + 'b', 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Disallowed '$' in element key: \"$db\""); + mlib_check(offset, eq, 48); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/invalid-double-ref +static inline void _test_case_dbref_invalid_double_ref(void) { + /** + * Invalid DBRef contains a second $ref element. + */ + const uint8_t bytes[] = { + '.', 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 2, '$', 'i', 'd', 0, 4, + 0, 0, 0, 'b', 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Expected an $id element following $ref"); + mlib_check(offset, eq, 18); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/invalid-missing-ref +static inline void _test_case_dbref_invalid_missing_ref(void) { + /** + * DBRef document requires a $ref key to be first. + */ + const uint8_t bytes[] = { + 0x12, 0, 0, 0, 2, '$', 'i', 'd', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + mlib_check(!is_valid); + mlib_check(error.code, eq, BSON_VALIDATE_DOLLAR_KEYS); + mlib_check(error.message, str_eq, "Disallowed '$' in element key: \"$id\""); + mlib_check(offset, eq, 4); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/valid/simple +static inline void _test_case_dbref_valid_simple(void) { + /** + * This is a simple valid DBRef element. + */ + const uint8_t bytes[] = { + 0x20, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'i', 'd', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/valid/simple-with-db +static inline void _test_case_dbref_valid_simple_with_db(void) { + /** + * A simple DBRef of the form: + * + * { $ref: "foo", $id: "bar", $db: "baz" } + */ + const uint8_t bytes[] = { + '-', 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'i', 'd', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 2, '$', 'd', 'b', 0, 4, 0, + 0, 0, 'b', 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/valid/nested-id-doc +static inline void _test_case_dbref_valid_nested_id_doc(void) { + /** + * This is a valid DBRef of the form: + * + * { $ref: foo, $id: { $ref: "foo2", $id: "bar2", $db: "baz2" }, $db: "baz" } + */ + const uint8_t bytes[] = { + 'U', 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 3, + '$', 'i', 'd', 0, '0', 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 5, 0, 0, 0, 'f', + 'o', 'o', '2', 0, 2, '$', 'i', 'd', 0, 5, 0, 0, 0, 'b', 'a', 'r', '2', 0, 2, + '$', 'd', 'b', 0, 5, 0, 0, 0, 'b', 'a', 'z', '2', 0, 0, 2, '$', 'd', 'b', 0, + 4, 0, 0, 0, 'b', 'a', 'z', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/valid/trailing-content +static inline void _test_case_dbref_valid_trailing_content(void) { + /** + * A valid DBRef of the form: + * + * { + * $ref: "foo", + * $id: "bar", + * $db: "baz", + * extra: "field", + * } + */ + const uint8_t bytes[] = { + 0x3e, 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'i', 'd', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 2, '$', 'd', 'b', 0, 4, 0, + 0, 0, 'b', 'a', 'z', 0, 2, 'e', 'x', 't', 'r', 'a', 0, 6, 0, 0, 0, 'f', 'i', + 'e', 'l', 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +// Case: dbref/valid/trailing-content-no-db +static inline void _test_case_dbref_valid_trailing_content_no_db(void) { + /** + * A valid DBRef of the form: + * + * { + * $ref: "foo", + * $id: "bar", + * extra: "field", + * } + */ + const uint8_t bytes[] = { + '1', 0, 0, 0, 2, '$', 'r', 'e', 'f', 0, 4, 0, 0, 0, 'f', 'o', 'o', 0, 2, + '$', 'i', 'd', 0, 4, 0, 0, 0, 'b', 'a', 'r', 0, 2, 'e', 'x', 't', 'r', 'a', + 0, 6, 0, 0, 0, 'f', 'i', 'e', 'l', 'd', 0, 0 + }; + bson_t doc; + mlib_check(bson_init_static(&doc, bytes, sizeof bytes)); + bson_error_t error = {0}; + size_t offset = 999999; + const bool is_valid = bson_validate_with_error_and_offset(&doc, BSON_VALIDATE_DOLLAR_KEYS, &offset, &error); + ASSERT_OR_PRINT(is_valid, error); + mlib_check(error.code, eq, 0); + mlib_check(error.message, str_eq, ""); +} + +// ! This code is GENERATED! Do not edit it directly! +void test_install_generated_bson_validation(TestSuite* suite) { + TestSuite_Add(suite, "/bson/validate/" "empty", _test_case_empty); + TestSuite_Add(suite, "/bson/validate/" "bad-element", _test_case_bad_element); + TestSuite_Add(suite, "/bson/validate/" "invalid-type", _test_case_invalid_type); + TestSuite_Add(suite, "/bson/validate/" "key/invalid/accept", _test_case_key_invalid_accept); + TestSuite_Add(suite, "/bson/validate/" "key/invalid/reject", _test_case_key_invalid_reject); + TestSuite_Add(suite, "/bson/validate/" "key/empty/accept", _test_case_key_empty_accept); + TestSuite_Add(suite, "/bson/validate/" "key/empty/reject", _test_case_key_empty_reject); + TestSuite_Add(suite, "/bson/validate/" "key/empty/accept-if-absent", _test_case_key_empty_accept_if_absent); + TestSuite_Add(suite, "/bson/validate/" "key/dot/accept", _test_case_key_dot_accept); + TestSuite_Add(suite, "/bson/validate/" "key/dot/reject", _test_case_key_dot_reject); + TestSuite_Add(suite, "/bson/validate/" "key/dot/accept-if-absent", _test_case_key_dot_accept_if_absent); + TestSuite_Add(suite, "/bson/validate/" "key/dollar/accept", _test_case_key_dollar_accept); + TestSuite_Add(suite, "/bson/validate/" "key/dollar/reject", _test_case_key_dollar_reject); + TestSuite_Add(suite, "/bson/validate/" "key/dollar/accept-in-middle", _test_case_key_dollar_accept_in_middle); + TestSuite_Add(suite, "/bson/validate/" "key/dollar/accept-if-absent", _test_case_key_dollar_accept_if_absent); + TestSuite_Add(suite, "/bson/validate/" "utf8/simple", _test_case_utf8_simple); + TestSuite_Add(suite, "/bson/validate/" "utf8/missing-null", _test_case_utf8_missing_null); + TestSuite_Add(suite, "/bson/validate/" "utf8/length-zero", _test_case_utf8_length_zero); + TestSuite_Add(suite, "/bson/validate/" "utf8/length-too-short", _test_case_utf8_length_too_short); + TestSuite_Add(suite, "/bson/validate/" "utf8/header-too-large", _test_case_utf8_header_too_large); + TestSuite_Add(suite, "/bson/validate/" "utf8/valid", _test_case_utf8_valid); + TestSuite_Add(suite, "/bson/validate/" "utf8/invalid/accept", _test_case_utf8_invalid_accept); + TestSuite_Add(suite, "/bson/validate/" "utf8/invalid/reject", _test_case_utf8_invalid_reject); + TestSuite_Add(suite, "/bson/validate/" "utf8/valid-with-null/accept-1", _test_case_utf8_valid_with_null_accept_1); + TestSuite_Add(suite, "/bson/validate/" "utf8/valid-with-null/accept-2", _test_case_utf8_valid_with_null_accept_2); + TestSuite_Add(suite, "/bson/validate/" "utf8/valid-with-null/reject", _test_case_utf8_valid_with_null_reject); + TestSuite_Add(suite, "/bson/validate/" "utf8/overlong-null/accept-1", _test_case_utf8_overlong_null_accept_1); + TestSuite_Add(suite, "/bson/validate/" "utf8/overlong-null/accept-2", _test_case_utf8_overlong_null_accept_2); + TestSuite_Add(suite, "/bson/validate/" "utf8/overlong-null/reject", _test_case_utf8_overlong_null_reject); + TestSuite_Add(suite, "/bson/validate/" "utf8-key/invalid/accept", _test_case_utf8_key_invalid_accept); + TestSuite_Add(suite, "/bson/validate/" "utf8-key/invalid/reject", _test_case_utf8_key_invalid_reject); + TestSuite_Add(suite, "/bson/validate/" "utf8-key/overlong-null/reject", _test_case_utf8_key_overlong_null_reject); + TestSuite_Add(suite, "/bson/validate/" "utf8-key/overlong-null/accept", _test_case_utf8_key_overlong_null_accept); + TestSuite_Add(suite, "/bson/validate/" "array/empty", _test_case_array_empty); + TestSuite_Add(suite, "/bson/validate/" "array/simple", _test_case_array_simple); + TestSuite_Add(suite, "/bson/validate/" "array/invalid-element", _test_case_array_invalid_element); + TestSuite_Add(suite, "/bson/validate/" "array/invalid-element-check-offset", _test_case_array_invalid_element_check_offset); + TestSuite_Add(suite, "/bson/validate/" "symbol/simple", _test_case_symbol_simple); + TestSuite_Add(suite, "/bson/validate/" "symbol/invalid-utf8/accept", _test_case_symbol_invalid_utf8_accept); + TestSuite_Add(suite, "/bson/validate/" "symbol/invalid-utf8/reject", _test_case_symbol_invalid_utf8_reject); + TestSuite_Add(suite, "/bson/validate/" "symbol/length-zero", _test_case_symbol_length_zero); + TestSuite_Add(suite, "/bson/validate/" "symbol/length-too-short", _test_case_symbol_length_too_short); + TestSuite_Add(suite, "/bson/validate/" "code/simple", _test_case_code_simple); + TestSuite_Add(suite, "/bson/validate/" "code/invalid-utf8/accept", _test_case_code_invalid_utf8_accept); + TestSuite_Add(suite, "/bson/validate/" "code/invalid-utf8/reject", _test_case_code_invalid_utf8_reject); + TestSuite_Add(suite, "/bson/validate/" "code/length-zero", _test_case_code_length_zero); + TestSuite_Add(suite, "/bson/validate/" "code/length-too-short", _test_case_code_length_too_short); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/simple", _test_case_code_with_scope_simple); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/invalid-code-length-zero", _test_case_code_with_scope_invalid_code_length_zero); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/invalid-code-length-too-large", _test_case_code_with_scope_invalid_code_length_too_large); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/invalid-scope", _test_case_code_with_scope_invalid_scope); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/empty-key-in-scope", _test_case_code_with_scope_empty_key_in_scope); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/corrupt-scope", _test_case_code_with_scope_corrupt_scope); + TestSuite_Add(suite, "/bson/validate/" "code-with-scope/corrupt-scope-2", _test_case_code_with_scope_corrupt_scope_2); + TestSuite_Add(suite, "/bson/validate/" "regex/simple", _test_case_regex_simple); + TestSuite_Add(suite, "/bson/validate/" "regex/invalid-opts", _test_case_regex_invalid_opts); + TestSuite_Add(suite, "/bson/validate/" "regex/double-null", _test_case_regex_double_null); + TestSuite_Add(suite, "/bson/validate/" "regex/invalid-utf8/accept", _test_case_regex_invalid_utf8_accept); + TestSuite_Add(suite, "/bson/validate/" "regex/invalid-utf8/reject", _test_case_regex_invalid_utf8_reject); + TestSuite_Add(suite, "/bson/validate/" "regex/invalid-utf8/accept-if-absent", _test_case_regex_invalid_utf8_accept_if_absent); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/string-length-zero", _test_case_dbpointer_string_length_zero); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/string-length-too-big", _test_case_dbpointer_string_length_too_big); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/truncated", _test_case_dbpointer_truncated); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/missing-null", _test_case_dbpointer_missing_null); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/invalid-utf8/accept", _test_case_dbpointer_invalid_utf8_accept); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/invalid-utf8/reject", _test_case_dbpointer_invalid_utf8_reject); + TestSuite_Add(suite, "/bson/validate/" "dbpointer/invalid-utf8/accept-if-absent", _test_case_dbpointer_invalid_utf8_accept_if_absent); + TestSuite_Add(suite, "/bson/validate/" "subdoc/simple", _test_case_subdoc_simple); + TestSuite_Add(suite, "/bson/validate/" "subdoc/invalid-shared-null", _test_case_subdoc_invalid_shared_null); + TestSuite_Add(suite, "/bson/validate/" "subdoc/overlapping-utf8-null", _test_case_subdoc_overlapping_utf8_null); + TestSuite_Add(suite, "/bson/validate/" "subdoc/invalid-element", _test_case_subdoc_invalid_element); + TestSuite_Add(suite, "/bson/validate/" "subdoc/header-too-large", _test_case_subdoc_header_too_large); + TestSuite_Add(suite, "/bson/validate/" "subdoc/header-too-small", _test_case_subdoc_header_too_small); + TestSuite_Add(suite, "/bson/validate/" "subdoc/impossible-size", _test_case_subdoc_impossible_size); + TestSuite_Add(suite, "/bson/validate/" "null/simple", _test_case_null_simple); + TestSuite_Add(suite, "/bson/validate/" "undefined/simple", _test_case_undefined_simple); + TestSuite_Add(suite, "/bson/validate/" "binary/simple", _test_case_binary_simple); + TestSuite_Add(suite, "/bson/validate/" "binary/bad-length-zero-subtype-2", _test_case_binary_bad_length_zero_subtype_2); + TestSuite_Add(suite, "/bson/validate/" "binary/bad-inner-length-on-subtype-2", _test_case_binary_bad_inner_length_on_subtype_2); + TestSuite_Add(suite, "/bson/validate/" "binary/bad-length-too-small", _test_case_binary_bad_length_too_small); + TestSuite_Add(suite, "/bson/validate/" "binary/bad-length-too-big", _test_case_binary_bad_length_too_big); + TestSuite_Add(suite, "/bson/validate/" "binary/old-invalid/1", _test_case_binary_old_invalid_1); + TestSuite_Add(suite, "/bson/validate/" "binary/old-invalid/2", _test_case_binary_old_invalid_2); + TestSuite_Add(suite, "/bson/validate/" "minkey/simple", _test_case_minkey_simple); + TestSuite_Add(suite, "/bson/validate/" "maxkey/simple", _test_case_maxkey_simple); + TestSuite_Add(suite, "/bson/validate/" "int32/simple", _test_case_int32_simple); + TestSuite_Add(suite, "/bson/validate/" "int32/truncated", _test_case_int32_truncated); + TestSuite_Add(suite, "/bson/validate/" "timestamp/simple", _test_case_timestamp_simple); + TestSuite_Add(suite, "/bson/validate/" "timestamp/truncated", _test_case_timestamp_truncated); + TestSuite_Add(suite, "/bson/validate/" "int64/simple", _test_case_int64_simple); + TestSuite_Add(suite, "/bson/validate/" "int64/truncated", _test_case_int64_truncated); + TestSuite_Add(suite, "/bson/validate/" "double/simple", _test_case_double_simple); + TestSuite_Add(suite, "/bson/validate/" "double/truncated", _test_case_double_truncated); + TestSuite_Add(suite, "/bson/validate/" "boolean/simple-false", _test_case_boolean_simple_false); + TestSuite_Add(suite, "/bson/validate/" "boolean/simple-true", _test_case_boolean_simple_true); + TestSuite_Add(suite, "/bson/validate/" "boolean/invalid", _test_case_boolean_invalid); + TestSuite_Add(suite, "/bson/validate/" "datetime/simple", _test_case_datetime_simple); + TestSuite_Add(suite, "/bson/validate/" "datetime/truncated", _test_case_datetime_truncated); + TestSuite_Add(suite, "/bson/validate/" "dbref/missing-id", _test_case_dbref_missing_id); + TestSuite_Add(suite, "/bson/validate/" "dbref/non-id", _test_case_dbref_non_id); + TestSuite_Add(suite, "/bson/validate/" "dbref/not-first-elements", _test_case_dbref_not_first_elements); + TestSuite_Add(suite, "/bson/validate/" "dbref/ref-without-id-with-db", _test_case_dbref_ref_without_id_with_db); + TestSuite_Add(suite, "/bson/validate/" "dbref/non-string-ref", _test_case_dbref_non_string_ref); + TestSuite_Add(suite, "/bson/validate/" "dbref/non-string-db", _test_case_dbref_non_string_db); + TestSuite_Add(suite, "/bson/validate/" "dbref/invalid-extras-between", _test_case_dbref_invalid_extras_between); + TestSuite_Add(suite, "/bson/validate/" "dbref/invalid-double-ref", _test_case_dbref_invalid_double_ref); + TestSuite_Add(suite, "/bson/validate/" "dbref/invalid-missing-ref", _test_case_dbref_invalid_missing_ref); + TestSuite_Add(suite, "/bson/validate/" "dbref/valid/simple", _test_case_dbref_valid_simple); + TestSuite_Add(suite, "/bson/validate/" "dbref/valid/simple-with-db", _test_case_dbref_valid_simple_with_db); + TestSuite_Add(suite, "/bson/validate/" "dbref/valid/nested-id-doc", _test_case_dbref_valid_nested_id_doc); + TestSuite_Add(suite, "/bson/validate/" "dbref/valid/trailing-content", _test_case_dbref_valid_trailing_content); + TestSuite_Add(suite, "/bson/validate/" "dbref/valid/trailing-content-no-db", _test_case_dbref_valid_trailing_content_no_db); +} diff -pruN 1.30.4-1/src/libbson/tests/validate-tests.py 2.0.2-1/src/libbson/tests/validate-tests.py --- 1.30.4-1/src/libbson/tests/validate-tests.py 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.2-1/src/libbson/tests/validate-tests.py 2025-06-19 15:42:22.000000000 +0000 @@ -0,0 +1,1481 @@ +""" +This script generates a C source file containing test cases for BSON validation +and iteration. + +Run this script with Python 3.12+, and pipe the output into a file. + +This script takes no command-line arguments. +""" + +# /// script +# requires-python = ">=3.12" +# dependencies = [] +# /// + +import argparse +import enum +import json +import re +import struct +import textwrap +from dataclasses import dataclass +from typing import Iterable + + +class Tag(enum.Enum): + """BSON type tag byte values""" + + EOD = 0 + Double = 1 + UTF8 = 2 + Document = 3 + Array = 4 + Binary = 5 + Undefined = 6 + OID = 7 + Boolean = 8 + Datetime = 9 + Null = 10 + Regex = 11 + DBPointer = 12 + Code = 13 + Symbol = 14 + CodeWithScope = 15 + Int32 = 16 + Timestamp = 17 + Int64 = 18 + Decimal128 = 19 + MinKey = 0xFF + MaxKey = 0x7F + + +type _ByteIter = bytes | Iterable[_ByteIter] +"""A set of bytes, or an iterable that yields more sets of bytes""" + + +def flatten_bytes(data: _ByteIter) -> bytes: + """Flatten a (recursive) iterator of bytes into a single bytes object""" + match data: + case bytes(data): + return data + case it: + return b"".join(map(flatten_bytes, it)) + + +def i32le(i: int) -> bytes: + """Encode an integer as a 32-bit little-endian integer""" + return struct.pack(" bytes: + """Encode an integer as a 64-bit little-endian integer""" + return struct.pack(" bytes: + """Encode a float as a 64-bit little-endian float""" + return struct.pack(" bytes: + """Add a BSON document header a null terminator to a set of bytes""" + flat = flatten_bytes(data) + # +5 for the null terminator and the header bytes + hdr = i32le(len(flat) + 5) + return hdr + flat + b"\0" + + +def code_with_scope(code: str, doc: _ByteIter) -> bytes: + """Create a BSON code-with-scope object with appropriate header""" + s = string(code) + doc = flatten_bytes(doc) + # +4 to include the length prefix too + len_prefix = i32le(len(s) + len(doc) + 4) + return len_prefix + s + doc + + +def elem(key: str | _ByteIter, tag: int | Tag, *bs: _ByteIter) -> bytes: + """Add a BSON element header to a set of bytes""" + if isinstance(tag, Tag): + tag = tag.value + return bytes([tag]) + cstring(key) + flatten_bytes(bs) + + +def binary(subtype: int, *bs: _ByteIter) -> bytes: + """ + Create a BSON binary object with appropriate header and subtype tag byte. + """ + flat = flatten_bytes(bs) + st = bytes([subtype]) + return i32le(len(flat)) + st + flat + + +def cstring(s: str | _ByteIter) -> bytes: + """Encode a string as UTF-8 and add a null terminator""" + match s: + case str(s): + return cstring(s.encode("utf-8")) + case bs: + bs = flatten_bytes(bs) + return bs + b"\0" + + +def string(s: str | _ByteIter) -> bytes: + """Add a length header and null terminator to a UTF-8 string""" + cs = cstring(s) + # Length header includes the null terminator + hdr = i32le(len(cs)) + return hdr + cs + + +def utf8elem(key: str | _ByteIter, s: str | _ByteIter) -> bytes: + """Create a valid UTF-8 BSON element for the given string""" + return elem(key, Tag.UTF8, string(s)) + + +@dataclass(frozen=True) +class ErrorInfo: + """ + Information about an expected validation error + """ + + code: str + """Spellling of the error code to be expected""" + message: str + """The expected error message""" + offset: int + """The expected error offset""" + + +@dataclass(frozen=True) +class TestCase: + """ + Defines a single validation test case. + """ + + name: str + """The name of the test case, as displayed in test runners, which will have a "/bson/validate" prefix""" + data: bytes + """The bytes that will be injested by `bson_init_static` to form the document to be validated""" + description: str | None + """A plaintext description of the test case and what it actually does. Rendered as a comment.""" + flags: str = "0" + """Spelling of the flags argument passed to the validation API""" + error: ErrorInfo = ErrorInfo("0", "", 0) + """Expected error, if any""" + + @property + def fn_name(self) -> str: + """Get a C identifier function name for this test case""" + return "_test_case_" + re.sub(r"[^\w]", "_", self.name).lower() + + +def fmt_byte(n: int) -> str: + """ + Format an octet value for C code. Will emit a char literal if certain ASCII, + otherwise an integer literal. + """ + match n: + case 0: + return "0" + case a if re.match(r"[a-zA-Z0-9.$-]", chr(a)): + return f"'{chr(a)}'" + case a if a < 10: + return str(a) + case n: + return f"0x{n:0>2x}" + + +GENERATED_NOTE = "// ! This code is GENERATED! Do not edit it directly!" + +HEADER = rf"""{GENERATED_NOTE} +// clang-format off + +#include + +#include + +#include +""" + + +def generate(case: TestCase) -> Iterable[str]: + """ + Generate the lines of a test case function. + """ + # A comment header + yield f"{GENERATED_NOTE}\n" + yield f"// Case: {case.name}\n" + # The function head + yield f"static inline void {case.fn_name}(void) {{\n" + # If we have a description, emit that in a block comment + if case.description: + yield " /**\n" + lines = textwrap.dedent(case.description).strip().splitlines() + yield from (f" * {ln}\n" for ln in lines) + yield " */\n" + # Emit the byte array literal + yield " const uint8_t bytes[] = {\n" + yield "\n".join( + textwrap.wrap( + ", ".join(map(fmt_byte, case.data)), + subsequent_indent=" " * 4, + initial_indent=" " * 4, + width=80, + ) + ) + yield "\n };\n" + yield from [ + # Initialize a BSON doc that points to the byte array + " bson_t doc;\n", + " mlib_check(bson_init_static(&doc, bytes, sizeof bytes));\n", + # The error object to be filled + " bson_error_t error = {0};\n", + # The error offset. Expected to be reset to zero on success. + " size_t offset = 999999;\n" + # Do the actual validation: + f" const bool is_valid = bson_validate_with_error_and_offset(&doc, {case.flags}, &offset, &error);\n", + ] + is_error = case.error.code != "0" + yield from [ + " mlib_check(!is_valid);\n" if is_error else " ASSERT_OR_PRINT(is_valid, error);\n", + f" mlib_check(error.code, eq, {case.error.code});\n", + f" mlib_check(error.message, str_eq, {json.dumps(case.error.message)});\n", + f" mlib_check(offset, eq, {case.error.offset});\n" if is_error else "", + ] + yield "}\n" + + +def corruption_at(off: int) -> ErrorInfo: + """ + Generate an ErrorInfo to expect a message of "corrupt BSON" at the given + byte offset. + + Note that this won't match if the error message is something other + than "corrupt BSON". + """ + return ErrorInfo(BSON_VALIDATE_CORRUPT, "corrupt BSON", off) + + +BSON_VALIDATE_CORRUPT = "BSON_VALIDATE_CORRUPT" +BSON_VALIDATE_DOLLAR_KEYS = "BSON_VALIDATE_DOLLAR_KEYS" +BSON_VALIDATE_DOT_KEYS = "BSON_VALIDATE_DOT_KEYS" +BSON_VALIDATE_EMPTY_KEYS = "BSON_VALIDATE_EMPTY_KEYS" +BSON_VALIDATE_UTF8 = "BSON_VALIDATE_UTF8" +BSON_VALIDATE_UTF8_ALLOW_NULL = "BSON_VALIDATE_UTF8_ALLOW_NULL" +MSG_EXPECTED_ID_FOLLOWING_REF = "Expected an $id element following $ref" + + +def disallowed_key(char: str, k: str) -> str: + return f"Disallowed '{char}' in element key: \"{k}\"" + + +# d888888b d88888b .d8888. d888888b .o88b. .d8b. .d8888. d88888b .d8888. +# `~~88~~' 88' 88' YP `~~88~~' d8P Y8 d8' `8b 88' YP 88' 88' YP +# 88 88ooooo `8bo. 88 8P 88ooo88 `8bo. 88ooooo `8bo. +# 88 88~~~~~ `Y8b. 88 8b 88~~~88 `Y8b. 88~~~~~ `Y8b. +# 88 88. db 8D 88 Y8b d8 88 88 db 8D 88. db 8D +# YP Y88888P `8888Y' YP `Y88P' YP YP `8888Y' Y88888P `8888Y' + +CASES: list[TestCase] = [ + TestCase( + "empty", + doc(), + """Test a simple empty document object.""", + ), + TestCase( + "bad-element", + doc(b"f"), + "The element content is not valid", + error=corruption_at(6), + ), + TestCase( + "invalid-type", + doc(elem("foo", 0xE, b"foo")), + """The type tag "0x0e" is not a valid type""", + error=corruption_at(9), + ), + TestCase( + "key/invalid/accept", + doc( + utf8elem("a", "b"), + utf8elem(b"foo\xffbar", "baz"), + utf8elem("c", "d"), + ), + """ + The element key contains an invalid UTF-8 byte, but we accept it + because we aren't doing UTF-8 validation. + """, + ), + TestCase( + "key/invalid/reject", + doc( + utf8elem("a", "b"), + elem(b"foo\xffbar", Tag.UTF8, string("baz")), + utf8elem("c", "d"), + ), + """ + The element key is not valid UTF-8 and we reject it when we do UTF-8 + validation. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 13), + ), + TestCase( + "key/empty/accept", + doc(utf8elem("", "string")), + """ + The element has an empty string key, and we accept this. + """, + ), + TestCase( + "key/empty/reject", + doc( + utf8elem("a", "b"), + utf8elem("", "string"), + ), + """ + The element has an empty key, and we can reject it. + """, + flags=BSON_VALIDATE_EMPTY_KEYS, + error=ErrorInfo(BSON_VALIDATE_EMPTY_KEYS, "Element key cannot be an empty string", 13), + ), + TestCase( + "key/empty/accept-if-absent", + doc(utf8elem("foo", "bar")), + """ + We are checking for empty keys, and accept if they are absent. + """, + flags=BSON_VALIDATE_EMPTY_KEYS, + ), + TestCase( + "key/dot/accept", + doc(utf8elem("foo.bar", "baz")), + """ + The element key has an ASCII dot, and we accept this since we don't + ask to validate it. + """, + flags=BSON_VALIDATE_EMPTY_KEYS, + ), + TestCase( + "key/dot/reject", + doc(utf8elem("a", "b"), utf8elem("foo.bar", "baz")), + """ + The element has an ASCII dot, and we reject it when we ask to validate + it. + """, + flags=BSON_VALIDATE_DOT_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOT_KEYS, disallowed_key(".", "foo.bar"), 13), + ), + TestCase( + "key/dot/accept-if-absent", + doc(utf8elem("foo", "bar")), + """ + We are checking for keys with dot '.', and accept if they are absent. + """, + flags=BSON_VALIDATE_DOT_KEYS, + ), + TestCase( + "key/dollar/accept", + doc(utf8elem("a", "b"), utf8elem("$foo", "bar")), + """ + We can accept an element key that starts with a dollar '$' sign. + """, + ), + TestCase( + "key/dollar/reject", + doc(utf8elem("a", "b"), utf8elem("$foo", "bar")), + """ + We can reject an element key that starts with a dollar '$' sign. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, disallowed_key("$", "$foo"), 13), + ), + TestCase( + "key/dollar/accept-in-middle", + doc(utf8elem("foo$bar", "baz")), + """ + This contains a element key "foo$bar", but we don't reject this, as we + only care about keys that *start* with dollars. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), + TestCase( + "key/dollar/accept-if-absent", + doc(utf8elem("foo", "bar")), + """ + We are validating for dollar-keys, and we accept because this document + doesn't contain any such keys. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), + TestCase( + "utf8/simple", + doc(utf8elem("string", "some string")), + "Simple UTF-8 string element", + ), + TestCase( + "utf8/missing-null", + doc(elem("a", Tag.UTF8, i32le(4), b"abcd")), + """ + The UTF-8 element "a" contains 4 characters and declares its length of 4, + but the fourth character is supposed to be a null terminator. In this case, + it is the letter 'd'. + """, + error=corruption_at(14), + ), + TestCase( + "utf8/length-zero", + doc(elem("", Tag.UTF8, i32le(0), b"\0")), + "UTF-8 string length must always be at least 1 for the null terminator", + error=corruption_at(6), + ), + TestCase( + "utf8/length-too-short", + doc(elem("", Tag.UTF8, i32le(3), b"bar\0")), + "UTF-8 string is three chars and a null terminator, but the declared length is 3 (should be 4)", + error=corruption_at(12), + ), + TestCase( + "utf8/header-too-large", + doc(elem("foo", Tag.UTF8, b"\xff\xff\xff\xffbar\0")), + """ + Data { "foo": "bar" } but the declared length of "bar" is way too large. + """, + error=corruption_at(9), + ), + TestCase( + "utf8/valid", + doc(elem("foo", Tag.UTF8, string("abcd"))), + """ + Validate a valid UTF-8 string with UTF-8 validation enabled. + """, + flags=BSON_VALIDATE_UTF8, + ), + TestCase( + "utf8/invalid/accept", + doc(utf8elem("foo", b"abc\xffd")), + """ + Validate an invalid UTF-8 string, but accept invalid UTF-8. + """, + ), + TestCase( + "utf8/invalid/reject", + doc(utf8elem("foo", b"abc\xffd")), + """ + Validate an invalid UTF-8 string, and expect rejection. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 4), + ), + TestCase( + "utf8/valid-with-null/accept-1", + doc(utf8elem("foo", b"abc\x00123")), + """ + This is a valid UTF-8 string that contains a null character. We accept + it because we don't do UTF-8 validation. + """, + ), + TestCase( + "utf8/valid-with-null/accept-2", + doc(utf8elem("foo", b"abc\x00123")), + """ + This is a valid UTF-8 string that contains a null character. We allow + it explicitly when we request UTF-8 validation. + """, + flags=f"{BSON_VALIDATE_UTF8} | {BSON_VALIDATE_UTF8_ALLOW_NULL}", + ), + TestCase( + "utf8/valid-with-null/reject", + doc(utf8elem("foo", b"abc\x00123")), + """ + This is a valid UTF-8 string that contains a null character. We reject + this because we don't pass BSON_VALIDATE_UTF8_ALLOW_NULL. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8_ALLOW_NULL, "UTF-8 string contains a U+0000 (null) character", 4), + ), + TestCase( + "utf8/overlong-null/accept-1", + doc(utf8elem("foo", b"abc\xc0\x80123")), + """ + This is an *invalid* UTF-8 string, and contains an overlong null. We should + accept it because we aren't doing UTF-8 validation. + """, + ), + TestCase( + "utf8/overlong-null/accept-2", + doc(utf8elem("foo", b"abc\xc0\x80123")), + """ + ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + + This is an *invalid* UTF-8 string, because it contains an overlong null + "0xc0 0x80". Despite being invalid, we accept it because our current UTF-8 + validation considers the overlong null to be a valid encoding for the null + codepoint (it isn't, but changing it would be a breaking change). + + If/when UTF-8 validation is changed to reject overlong null, then this + test should change to expect rejection the invalid UTF-8. + """, + flags=f"{BSON_VALIDATE_UTF8} | {BSON_VALIDATE_UTF8_ALLOW_NULL}", + ), + TestCase( + "utf8/overlong-null/reject", + doc(utf8elem("foo", b"abc\xc0\x80123")), + """ + ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + + This is an *invalid* UTF-8 string, because it contains an overlong null + character. Our UTF-8 validator wrongly accepts overlong null as a valid + UTF-8 sequence. This test fails because we disallow null codepoints, not + because the UTF-8 is invalid, and the error message reflects that. + + If/when UTF-8 validation is changed to reject overlong null, then the + expected error code and error message for this test should change. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8_ALLOW_NULL, "UTF-8 string contains a U+0000 (null) character", 4), + ), + TestCase( + "utf8-key/invalid/accept", + doc(utf8elem(b"abc\xffdef", "bar")), + """ + The element key is not valid UTf-8, but we accept it if we don't do + UTF-8 validation. + """, + ), + TestCase( + "utf8-key/invalid/reject", + doc(utf8elem(b"abc\xffdef", "bar")), + """ + The element key is not valid UTF-8, and we reject it when we requested + UTF-8 validation. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 4), + ), + TestCase( + "utf8-key/overlong-null/reject", + doc(utf8elem(b"abc\xc0\x80def", "bar")), + """ + ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + + The element key is invalid UTF-8 because it contains an overlong null. We accept the + overlong null as a valid encoding of U+0000, but we reject the key because + we disallow null in UTF-8 strings. + + If/when UTF-8 validation is changed to reject overlong null, then the + expected error code and error message for this test should change. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8_ALLOW_NULL, "UTF-8 string contains a U+0000 (null) character", 4), + ), + TestCase( + "utf8-key/overlong-null/accept", + doc(utf8elem(b"abc\xc0\x80def", "bar")), + """ + ! NOTE: overlong-null: This test relies on our UTF-8 validation accepting the `c0 80` sequence + + The element key is invalid UTF-8 because it contains an overlong null. We accept the + overlong null as a valid encoding of U+0000, and we allow it in an element key because + we pass ALLOW_NULL + + If/when UTF-8 validation is changed to reject overlong null, then this + test case should instead reject the key string as invalid UTF-8. + """, + flags=f"{BSON_VALIDATE_UTF8} | {BSON_VALIDATE_UTF8_ALLOW_NULL}", + ), + TestCase( + "array/empty", + doc(elem("array", Tag.Array, doc())), + "Simple empty array element", + ), + TestCase( + "array/simple", + doc( + elem( + "array", + Tag.Array, + doc( + elem("0", Tag.Int32, i32le(42)), + elem("1", Tag.Int32, i32le(1729)), + elem("2", Tag.Int32, i32le(-8)), + ), + ) + ), + "Simple array element of integers", + ), + TestCase( + "array/invalid-element", + doc( + elem( + "array", + Tag.Array, + doc( + elem("0", Tag.Int32, i32le(42)), + elem("1", Tag.Int32, i32le(1729)[-1:]), # Truncated + elem("2", Tag.Int32, i32le(-8)), + ), + ) + ), + "Simple array element of integers, but one element is truncated", + error=corruption_at(34), + ), + TestCase( + "array/invalid-element-check-offset", + doc( + elem( + "array-shifted", + Tag.Array, + doc( + elem("0", Tag.Int32, i32le(42)), + elem("1", Tag.Int32, i32le(1729)[-1:]), # Truncated + elem("2", Tag.Int32, i32le(-8)), + ), + ) + ), + """ + This is the same as the array/invalid-element test, but with a longer + key string on the parent array. This is to check that the error offset + is properly adjusted for the additional characters. + """, + error=corruption_at(42), + ), + TestCase( + "symbol/simple", + doc(elem("symbol", Tag.Symbol, string("void 0;"))), + """ + A simple document: { symbol: Symbol("void 0;") } + """, + ), + TestCase( + "symbol/invalid-utf8/accept", + doc(elem("symbol", Tag.Symbol, string(b"void\xff 0;"))), + """ + A simple symbol document, but the string contains invalid UTF-8 + """, + ), + TestCase( + "symbol/invalid-utf8/reject", + doc(elem("symbol", Tag.Symbol, string(b"void\xff 0;"))), + """ + A simple symbol document, but the string contains invalid UTF-8 + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 4), + ), + TestCase( + "symbol/length-zero", + doc(b"\x0e\0" + i32le(0) + b"\0"), + "Symbol string length must always be at least 1 for the null terminator", + error=corruption_at(6), + ), + TestCase( + "symbol/length-too-short", + doc(b"\x0e\0" + i32le(3) + b"bar\0"), + """ + Symbol string is three chars and a null terminator, but the declared + length is 3 (should be 4) + """, + error=corruption_at(12), + ), + TestCase( + "code/simple", + doc(elem("code", Tag.Code, string("void 0;"))), + """ + A simple document: { code: Code("void 0;") } + """, + ), + TestCase( + "code/invalid-utf8/accept", + doc(elem("code", Tag.Code, string(b"void\xff 0;"))), + """ + A simple code document, but the string contains invalid UTF-8 + """, + ), + TestCase( + "code/invalid-utf8/reject", + doc(elem("code", Tag.Code, string(b"void\xff 0;"))), + """ + A simple code document, but the string contains invalid UTF-8 + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 4), + ), + TestCase( + "code/length-zero", + doc(elem("code", Tag.Code, i32le(0), b"\0")), + "Code string length must always be at least 1 for the null terminator", + error=corruption_at(10), + ), + TestCase( + "code/length-too-short", + doc(elem("code", Tag.Code, i32le(3), b"bar\0")), + "Code string is three chars and a null terminator, but the declared length is 3 (should be 4)", + error=corruption_at(16), + ), + # Code w/ scope + TestCase( + "code-with-scope/simple", + doc(elem("foo", Tag.CodeWithScope, code_with_scope("void 0;", doc()))), + "A simple valid code-with-scope element", + ), + TestCase( + "code-with-scope/invalid-code-length-zero", + doc( + elem( + "", + Tag.CodeWithScope, + i32le(10), + b"\0\0\0\0", # strlen + b"\0", # code + doc(), # scope + ) + ), + """ + Data { "": CodeWithScope("", {}) }, but the code string length is zero, when + it must be at least 1 + """, + error=corruption_at(6), + ), + TestCase( + "code-with-scope/invalid-code-length-too-large", + doc( + elem( + "", + Tag.CodeWithScope, + i32le(10), + b"\xff\xff\xff\xff", # strlen (too big) + b"\0", + doc(), # Scope + ) + ), + """ + Data { "": CodeWithScope("", {}) }, but the code string length is way too large + """, + error=corruption_at(6), + ), + TestCase( + "code-with-scope/invalid-scope", + doc(elem("foo", Tag.CodeWithScope, code_with_scope("void 0;", doc()[:-1]))), + "A code-with-scope element, but the scope document is corrupted", + error=corruption_at(13), + ), + TestCase( + "code-with-scope/empty-key-in-scope", + doc( + elem( + "code", + Tag.CodeWithScope, + code_with_scope( + "void 0;", + doc( + elem("obj", Tag.Document, doc(utf8elem("", "string"))), + ), + ), + ) + ), + """ + A code-with-scope element. The scope itself contains empty keys within + objects, and we ask to reject empty keys. But the scope document should + be treated as an opaque closure, so our outer validation rules do not + apply. + """, + flags=BSON_VALIDATE_EMPTY_KEYS, + ), + TestCase( + "code-with-scope/corrupt-scope", + doc( + elem( + "code", + Tag.CodeWithScope, + code_with_scope( + "void 0;", + doc( + elem( + "foo", + Tag.UTF8, + i32le(0), # Invalid string length + b"\0", + ) + ), + ), + ) + ), + "A code-with-scope element, but the scope contains corruption", + error=ErrorInfo(BSON_VALIDATE_CORRUPT, 'Error in scope document for element "code": corrupt BSON', offset=13), + ), + TestCase( + "code-with-scope/corrupt-scope-2", + doc( + elem( + "code", + Tag.CodeWithScope, + code_with_scope( + "void 0;", + doc( + elem( + "foo", + Tag.UTF8, + b"\xff\xff\xff\xff", # Invalid string length + b"\0", + ) + ), + ), + ) + ), + "A code-with-scope element, but the scope contains corruption", + error=ErrorInfo(BSON_VALIDATE_CORRUPT, 'Error in scope document for element "code": corrupt BSON', offset=13), + ), + TestCase( + "regex/simple", + doc(elem("regex", Tag.Regex, b"1234\0gi\0")), + """ + Simple document: { regex: Regex("1234", "gi") } + """, + ), + TestCase( + "regex/invalid-opts", + doc(elem("regex", Tag.Regex, b"foo\0bar")), + """ + A regular expression element with missing null terminator. The main + option string "foo" has a null terminator, but the option component "bar" + does not have a null terminator. A naive parse will see the doc's null + terminator as the null terminator for the options string, but that's + invalid! + """, + error=corruption_at(18), + ), + TestCase( + "regex/double-null", + doc(elem("regex", Tag.Regex, b"foo\0bar\0\0")), + """ + A regular expression element with an extra null terminator. Since regex + is delimited by its null terminator, the iterator will stop early before + the actual EOD. + """, + error=corruption_at(21), + ), + TestCase( + "regex/invalid-utf8/accept", + doc(elem("regex", Tag.Regex, b"foo\xffbar\0gi\0")), + """ + A regular expression that contains invalid UTF-8. + """, + ), + TestCase( + "regex/invalid-utf8/reject", + doc(elem("regex", Tag.Regex, b"foo\xffbar\0gi\0")), + """ + A regular expression that contains invalid UTF-8. + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 4), + ), + TestCase( + "regex/invalid-utf8/accept-if-absent", + doc(elem("regex", Tag.Regex, b"foo\0gi\0")), + """ + A regular valid UTf-8 regex. We check for invalid UTf-8, and accept becaues + the regex is fine. + """, + flags=BSON_VALIDATE_UTF8, + ), + TestCase( + "dbpointer/string-length-zero", + doc( + elem( + "foo", + Tag.DBPointer, + i32le(0), # String length (invalid) + b"\0", # Empty string + b"\x52\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ) + ), + """ + Document { "foo": DBPointer("", ) }, but the length header on the inner + string is zero, when it must be at least 1. + """, + error=corruption_at(9), + ), + TestCase( + "dbpointer/string-length-too-big", + doc( + elem( + "foo", + Tag.DBPointer, + b"\xff\xff\xff\xff", # String length (invalid) + b"foobar\0", # Simple string + b"\x52\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ) + ), + """ + Document { "foo": DBPointer("foobar", ) }, but the length header on the inner + string is far too large + """, + error=corruption_at(9), + ), + TestCase( + "dbpointer/truncated", + doc( + utf8elem("a", "b"), + elem( + "foo", + Tag.DBPointer, + i32le(7), # 7 bytes, bleeding into the null terminator + b"foobar", # Simple string, missing a null terminator. + b"\x00\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ), + utf8elem("a", "b"), + ), + """ + Document { "foo": DBPointer("foobar", ) }, but the length header on + the string is one byte too large, causing it to use the first byte of the + OID as the null terminator. This should fail when iterating. + """, + error=corruption_at(43), + ), + TestCase( + "dbpointer/missing-null", + doc( + elem( + "foo", + Tag.DBPointer, + i32le(4), + b"abcd", # Missing null terminator + b"\x52\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ) + ), + """ + Document { "foo": DBPointer("abcd", ) }, the length header on + the string is 4, but the fourth byte is not a null terminator. + """, + error=corruption_at(16), + ), + TestCase( + "dbpointer/invalid-utf8/accept", + doc( + elem( + "foo", + Tag.DBPointer, + string(b"abc\xffdef"), # String with invalid UTF-8 + b"\x52\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ) + ), + """ + DBPointer document, but the collection string contains invalid UTF-8 + """, + ), + TestCase( + "dbpointer/invalid-utf8/reject", + doc( + elem( + "foo", + Tag.DBPointer, + string(b"abc\xffdef"), # String with invalid UTF-8 + b"\x52\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ) + ), + """ + DBPointer document, but the collection string contains invalid UTF-8 + """, + flags=BSON_VALIDATE_UTF8, + error=ErrorInfo(BSON_VALIDATE_UTF8, "Text element is not valid UTF-8", 4), + ), + TestCase( + "dbpointer/invalid-utf8/accept-if-absent", + doc( + elem( + "foo", + Tag.DBPointer, + string(b"abcdef"), # Valid string + b"\x52\x59\xb5\x6a\xfa\x5b\xd8\x41\xd6\x58\x5d\x99", # OID + ) + ), + """ + DBPointer document, and we validate UTF-8. Accepts because there is no + invalid UTF-8 here. + """, + flags=BSON_VALIDATE_UTF8, + ), + TestCase( + "subdoc/simple", + doc(elem("doc", Tag.Document, doc(utf8elem("foo", "bar")))), + """ + A simple document: { doc: { foo: "bar" } } + """, + ), + TestCase( + "subdoc/invalid-shared-null", + doc(elem("doc", Tag.Document, doc()[:-1])), + """ + A truncated subdocument element, with its null terminator accidentally + overlapping the parent document's null. + """, + error=corruption_at(9), + ), + TestCase( + "subdoc/overlapping-utf8-null", + doc(elem("doc", Tag.Document, doc(utf8elem("bar", "baz\0")[:-1]))), + """ + Encodes the document: + + { "foo": { "bar": "baz" } } + + but the foo.bar UTF-8 string is truncated improperly and reuses the null + terminator for "foo" + """, + error=corruption_at(18), + ), + TestCase( + "subdoc/invalid-element", + doc(elem("doc", Tag.Document, doc(elem("dbl", Tag.Double, b"abcd")))), + "A subdocument that contains an invalid element", + error=corruption_at(18), + ), + TestCase( + "subdoc/header-too-large", + doc( + elem( + "foo", + Tag.Document, + b"\xf7\xff\xff\xff\0", # Bad document + ), + ), + """ + Data {"foo": {}}, but the subdoc header is too large. + """, + error=corruption_at(9), + ), + TestCase( + "subdoc/header-too-small", + doc( + elem( + "test", + Tag.Document, + b"\x04\0\0\0", # Only four bytes. All docs must be at least 5 + ), + ), + """ + Nested document with a header value of 4, which is always too small. + """, + error=corruption_at(4), + ), + TestCase( + "subdoc/impossible-size", + doc( + elem( + "foo", + Tag.Document, + b"\xff\xff\xff\xff\0", # Bad document + ), + ), + """ + Data {"foo": {}}, but the subdoc header is UINT32_MAX/INT32_MIN, which + becomes is an invalid document header. + """, + error=corruption_at(9), + ), + TestCase( + "null/simple", + doc(elem("null", Tag.Null)), + """ + A simple document: { "null": null } + """, + ), + TestCase( + "undefined/simple", + doc(elem("undefined", Tag.Undefined)), + """ + A simple document: { "undefined": undefined } + """, + ), + TestCase( + "binary/simple", + doc(elem("binary", Tag.Binary, binary(0x80, b"12345"))), + """ + Simple binary data { "binary": Binary(0x80, b'12345') } + """, + ), + TestCase( + "binary/bad-length-zero-subtype-2", + doc( + elem( + "binary", + Tag.Binary, + i32le(0), # Invalid: Zero length + b"\x02", # subtype two + i32le(4), # Length of 4 + b"1234", # payload + ), + ), + """ + Binary data that has an invalid length header. It is subtype 2, + which means it contains an additional length header. + """, + error=corruption_at(12), + ), + TestCase( + "binary/bad-inner-length-on-subtype-2", + doc( + elem( + "binary", + Tag.Binary, + i32le(8), # Valid length + b"\x02", # subtype two + i32le(2), # Invalid length of (should be 4) + b"1234", # payload + ), + ), + """ + Binary data that has an valid outer length header, but the inner length + header for subtype 2 has an incorrect value. + """, + error=corruption_at(17), + ), + TestCase( + "binary/bad-length-too-small", + doc( + elem( + "binary", + Tag.Binary, + i32le(2), # Length prefix (too small) + b"\x80", # subtype + b"1234", # payload + ), + ), + """ + Data { "binary": Binary(0x80, b'1234') }, but the length header on + the Binary object is too small. + + This won't cause the binary to decode wrong, but it will cause the iterator + to jump into the middle of the binary data which will not decode as a + proper BSON element. + """, + error=corruption_at(22), + ), + TestCase( + "binary/bad-length-too-big", + doc( + elem( + "binary", + Tag.Binary, + b"\xf3\xff\xff\xff", # Length prefix (too big) + b"\x80", # subtype + b"1234", # data + ), + ), + """ + Data { "binary": Binary(0x80, b'1234') }, but the length header on + the Binary object is too large. + """, + error=corruption_at(12), + ), + TestCase( + "binary/old-invalid/1", + doc( + elem( + "binary", + Tag.Binary, + binary( + 2, + i32le(5), # Bad length prefix: Should be 4 + b"abcd", + ), + ), + ), + """ + This is an old-style binary type 0x2. It has an inner length header of 5, + but it should be 4. + """, + error=corruption_at(17), + ), + TestCase( + "binary/old-invalid/2", + doc( + elem( + "bin", + Tag.Binary, + binary( + 2, + b"abc", # Bad: Subtype 2 requires at least four bytes + ), + ) + ), + """ + This is an old-style binary type 0x2. The data segment is too small to + be valid. + """, + error=corruption_at(9), + ), + TestCase( + "minkey/simple", + doc(elem("min", Tag.MinKey)), + "A simple document with a MinKey element", + ), + TestCase( + "maxkey/simple", + doc(elem("max", Tag.MaxKey)), + "A simple document with a MaxKey element", + ), + TestCase( + "int32/simple", + doc(elem("int32", Tag.Int32, i32le(42))), + "A simple document with a valid single int32 element", + ), + TestCase( + "int32/truncated", + doc(elem("int32-truncated", Tag.Int32, i32le(42)[:-1])), + "Truncated 32-bit integer", + error=corruption_at(21), + ), + TestCase("timestamp/simple", doc(elem("timestamp", Tag.Timestamp, i64le(1729))), """A simple timestamp element"""), + TestCase( + "timestamp/truncated", + doc(elem("timestamp", Tag.Timestamp, i64le(1729)[:-1])), + """A truncated timestamp element""", + error=corruption_at(15), + ), + TestCase( + "int64/simple", + doc(elem("int64", Tag.Int64, i64le(1729))), + "A simple document with a valid single int64 element", + ), + TestCase( + "int64/truncated", + doc(elem("int64-truncated", Tag.Int64, i64le(1729)[:-1])), + "Truncated 64-bit integer", + error=corruption_at(21), + ), + TestCase( + "double/simple", + doc(elem("double", Tag.Double, f64le(3.14))), + "Simple float64 element", + ), + TestCase( + "double/truncated", + doc(elem("double-truncated", Tag.Double, f64le(3.13)[:-1])), + "Truncated 64-bit float", + error=corruption_at(22), + ), + TestCase( + "boolean/simple-false", + doc(elem("bool", Tag.Boolean, b"\x00")), + """A simple boolean 'false'""", + ), + TestCase( + "boolean/simple-true", + doc(elem("bool", Tag.Boolean, b"\x01")), + """A simple boolean 'true'""", + ), + TestCase( + "boolean/invalid", + doc(elem("bool", Tag.Boolean, b"\xc3")), + """ + An invalid boolean octet. Must be '0' or '1', but is 0xc3. + """, + error=corruption_at(10), + ), + TestCase( + "datetime/simple", + doc(elem("utc", Tag.Datetime, b"\x0b\x98\x8c\x2b\x33\x01\x00\x00")), + "Simple datetime element", + ), + TestCase( + "datetime/truncated", + doc(elem("utc", Tag.Datetime, b"\x0b\x98\x8c\x2b\x33\x01\x00")), + "Truncated datetime element", + error=corruption_at(9), + ), + # DBRef + TestCase( + "dbref/missing-id", + doc(utf8elem("$ref", "foo")), + """This dbref document is missing an $id element""", + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, MSG_EXPECTED_ID_FOLLOWING_REF, 18), + ), + TestCase( + "dbref/non-id", + doc(utf8elem("$ref", "foo"), utf8elem("bar", "baz")), + """ + The 'bar' element should be an '$id' element. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, MSG_EXPECTED_ID_FOLLOWING_REF, 18), + ), + TestCase( + "dbref/not-first-elements", + doc(utf8elem("foo", "bar"), utf8elem("$ref", "a"), utf8elem("$id", "b")), + """ + This would be a valid DBRef, but the "$ref" key must come first. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, disallowed_key("$", "$ref"), 17), + ), + TestCase( + "dbref/ref-without-id-with-db", + doc(utf8elem("$ref", "foo"), utf8elem("$db", "bar")), + """ + There should be an $id element, but we skip straight to $db + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, MSG_EXPECTED_ID_FOLLOWING_REF, 18), + ), + TestCase( + "dbref/non-string-ref", + doc(elem("$ref", Tag.Int32, i32le(42))), + """ + The $ref element must be a string, but is an integer. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, "$ref element must be a UTF-8 element", 4), + ), + TestCase( + "dbref/non-string-db", + doc( + utf8elem("$ref", "foo"), + utf8elem("$id", "bar"), + elem("$db", Tag.Int32, i32le(42)), + ), + """ + The $db element should be a string, but is an integer. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, "$db element in DBRef must be a UTF-8 element", 31), + ), + TestCase( + "dbref/invalid-extras-between", + doc( + utf8elem("$ref", "foo"), + utf8elem("$id", "bar"), + utf8elem("extra", "field"), + utf8elem("$db", "baz"), + ), + """ + Almost a valid DBRef, but there is an extra field before $db. We reject $db + as an invalid key. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, disallowed_key("$", "$db"), 48), + ), + TestCase( + "dbref/invalid-double-ref", + doc( + utf8elem("$ref", "foo"), + utf8elem("$ref", "bar"), + utf8elem("$id", "baz"), + ), + """ + Invalid DBRef contains a second $ref element. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, MSG_EXPECTED_ID_FOLLOWING_REF, 18), + ), + TestCase( + "dbref/invalid-missing-ref", + doc(utf8elem("$id", "foo")), + """ + DBRef document requires a $ref key to be first. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + error=ErrorInfo(BSON_VALIDATE_DOLLAR_KEYS, disallowed_key("$", "$id"), 4), + ), + TestCase( + "dbref/valid/simple", + doc(utf8elem("$ref", "foo"), utf8elem("$id", "bar")), + """ + This is a simple valid DBRef element. + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), + TestCase( + "dbref/valid/simple-with-db", + doc(utf8elem("$ref", "foo"), utf8elem("$id", "bar"), utf8elem("$db", "baz")), + """ + A simple DBRef of the form: + + { $ref: "foo", $id: "bar", $db: "baz" } + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), + TestCase( + "dbref/valid/nested-id-doc", + doc( + utf8elem("$ref", "foo"), + elem( + "$id", + Tag.Document, + doc( + utf8elem("$ref", "foo2"), + utf8elem("$id", "bar2"), + utf8elem("$db", "baz2"), + ), + ), + utf8elem("$db", "baz"), + ), + """ + This is a valid DBRef of the form: + + { $ref: foo, $id: { $ref: "foo2", $id: "bar2", $db: "baz2" }, $db: "baz" } + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), + TestCase( + "dbref/valid/trailing-content", + doc( + utf8elem("$ref", "foo"), + utf8elem("$id", "bar"), + utf8elem("$db", "baz"), + utf8elem("extra", "field"), + ), + """ + A valid DBRef of the form: + + { + $ref: "foo", + $id: "bar", + $db: "baz", + extra: "field", + } + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), + TestCase( + "dbref/valid/trailing-content-no-db", + doc( + utf8elem("$ref", "foo"), + utf8elem("$id", "bar"), + utf8elem("extra", "field"), + ), + """ + A valid DBRef of the form: + + { + $ref: "foo", + $id: "bar", + extra: "field", + } + """, + flags=BSON_VALIDATE_DOLLAR_KEYS, + ), +] + +if __name__ == "__main__": + # We don't take an arguments, but error if any are given + parser = argparse.ArgumentParser(description=__doc__) + parser.parse_args() + # Start with the header + print(HEADER) + # Print each test case + for c in CASES: + print() + for part in generate(c): + print(part, end="") + + # Print the registration function + print(f"\n{GENERATED_NOTE}") + print("void test_install_generated_bson_validation(TestSuite* suite) {") + for c in CASES: + print(f' TestSuite_Add(suite, "/bson/validate/" {json.dumps(c.name)}, {c.fn_name});') + print("}") diff -pruN 1.30.4-1/src/libmongoc/.gitignore 2.0.2-1/src/libmongoc/.gitignore --- 1.30.4-1/src/libmongoc/.gitignore 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/.gitignore 2025-06-19 15:42:22.000000000 +0000 @@ -1,12 +1,3 @@ -# CMake artifacts -libmongoc-1.0-config-version.cmake -libmongoc-1.0-config.cmake -libmongoc-static-1.0-config-version.cmake -libmongoc-static-1.0-config.cmake -mongoc/mongoc-1.0-config.cmake -mongoc/mongoc-1.0-config-version.cmake -mongoc/mongoc-targets.cmake - # Test program for mongoc_get_accept_args in CMakeLists.txt accept_test1.c @@ -42,7 +33,7 @@ find-and-modify hello_mongoc mongoc-dump mongoc-ping -mongoc-stat +mongoc2-stat mongoc-tail # Test binaries diff -pruN 1.30.4-1/src/libmongoc/CMakeLists.txt 2.0.2-1/src/libmongoc/CMakeLists.txt --- 1.30.4-1/src/libmongoc/CMakeLists.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/CMakeLists.txt 2025-06-19 15:42:22.000000000 +0000 @@ -12,8 +12,6 @@ project (libmongoc set(libmongoc_VERSION_PRERELEASE ${mongo-c-driver_VERSION_PRERELEASE}) set(libmongoc_VERSION_FULL ${mongo-c-driver_VERSION_FULL}) -set (MONGOC_API_VERSION 1.0) - include (CheckSchedGetCPU) include (CheckStructHasMember) include (CheckSymbolExists) @@ -23,15 +21,19 @@ include (InstallRequiredSystemLibraries) message (STATUS "libmongoc version (from VERSION_CURRENT file): ${MONGOC_VERSION}") -set (MONGOC_API_VERSION 1.0) -set (MONGOC_TARGETS_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/mongoc-${MONGOC_API_VERSION}") - # Defaults. set (MONGOC_ENABLE_COMPRESSION 0) set (MONGOC_ENABLE_COMPRESSION_SNAPPY 0) set (MONGOC_ENABLE_COMPRESSION_ZLIB 0) set (MONGOC_ENABLE_COMPRESSION_ZSTD 0) +if(NOT DEFINED MONGOC_INSTALL_INCLUDEDIR) + set(MONGOC_INSTALL_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/mongoc-${PROJECT_VERSION}") +endif() +if(NOT DEFINED MONGOC_INSTALL_CMAKEDIR) + set(MONGOC_INSTALL_CMAKEDIR "${MONGO_C_DRIVER_INSTALL_CMAKEDIR}/mongoc-${PROJECT_VERSION}") +endif() + # Definition for mongoc-config.h: mongo_pick(MONGOC_ENABLE_SRV 1 0 ENABLE_SRV) @@ -195,13 +197,6 @@ function(_auto_pick_tls_lib) find_package(OpenSSL) if(OpenSSL_FOUND) _use_named_tls_lib(OPENSSL) - else() - # No OpenSSL. What about LibreSSL? - find_package(LibreSSL) - if(LibreSSL_FOUND) - message(DEPRECATION "LibreSSL was automatically chosen as the TLS library. Support for LibreSSL is deprecated and may be removed in a future major release. Use ENABLE_SSL option to specify a different TLS library.") - _use_named_tls_lib(LIBRESSL) - endif() endif() endif() endfunction() @@ -211,12 +206,10 @@ set(SecureTransport/LINK_LIBRARIES "-fra set(SecureTransport/pkg_config_LIBS -framework Corefoundation -framework Security) set(SecureChannel/LINK_LIBRARIES secur32.lib crypt32.lib Bcrypt.lib) set(SecureChannel/pkg_config_LIBS ${SecureChannel/LINK_LIBRARIES}) -set(LibreSSL/LINK_LIBRARIES LibreSSL::TLS LibreSSL::Crypto) -set(LibreSSL/pkg_config_LIBS -ltls -lcrypto) set(OpenSSL/LINK_LIBRARIES OpenSSL::SSL OpenSSL::Crypto $<$:crypt32.lib>) set(OpenSSL/pkg_config_LIBS -lssl -lcrypto $<$:crypt32.lib>) # Use *exactly* the TLS library identified by the given name, which is one of -# `OPENSSL`, `LIBRESSL`, `DARWIN`, or `WINDOWS`. +# `OPENSSL`, `DARWIN`, or `WINDOWS`. function(_use_named_tls_lib libname) # Use this property to track what package we import for our TLS libraries: set_property(DIRECTORY PROPERTY _mongoc-tls-package NO) @@ -224,14 +217,6 @@ function(_use_named_tls_lib libname) find_package(OpenSSL REQUIRED) set(backend OpenSSL) set_property(DIRECTORY PROPERTY _mongoc-tls-package OpenSSL) - elseif(libname STREQUAL "LIBRESSL") - find_package(LibreSSL REQUIRED) - set(backend LibreSSL) - install( - FILES "${mongo-c-driver_SOURCE_DIR}/build/cmake/FindLibreSSL.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/mongoc-${MONGOC_API_VERSION}/3rdParty" - ) - set_property(DIRECTORY PROPERTY _mongoc-tls-package LibreSSL) elseif(libname STREQUAL "DARWIN") set(backend SecureTransport) elseif(libname STREQUAL "WINDOWS") @@ -260,21 +245,14 @@ set_package_properties( TYPE OPTIONAL PURPOSE "Provides a cryptography and TLS backend" ) -set_package_properties( - LibreSSL PROPERTIES - DESCRIPTION "an alternative implementation of the OpenSSL interface, created by the OpenBSD project" - TYPE OPTIONAL - PURPOSE "Provides a cryptography and TLS backend" -) mongo_bool01(MONGOC_ENABLE_SSL [[TLS_BACKEND]]) mongo_bool01(MONGOC_ENABLE_SSL_SECURE_CHANNEL [[TLS_BACKEND STREQUAL "SecureChannel"]]) mongo_bool01(MONGOC_ENABLE_SSL_SECURE_TRANSPORT [[TLS_BACKEND STREQUAL "SecureTransport"]]) mongo_bool01(MONGOC_ENABLE_SSL_OPENSSL [[TLS_BACKEND STREQUAL "OpenSSL"]]) -mongo_bool01(MONGOC_ENABLE_SSL_LIBRESSL [[TLS_BACKEND STREQUAL "LibreSSL"]]) mongo_bool01(MONGOC_ENABLE_CRYPTO [[TLS_BACKEND]]) -mongo_bool01(MONGOC_ENABLE_CRYPTO_LIBCRYPTO [[MONGOC_ENABLE_SSL_OPENSSL OR MONGOC_ENABLE_SSL_LIBRESSL]]) +mongo_bool01(MONGOC_ENABLE_CRYPTO_LIBCRYPTO [[MONGOC_ENABLE_SSL_OPENSSL]]) mongo_bool01(MONGOC_ENABLE_CRYPTO_CNG [[MONGOC_ENABLE_SSL_SECURE_CHANNEL]]) mongo_bool01(MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO [[MONGOC_ENABLE_SSL_SECURE_TRANSPORT]]) mongo_bool01(MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE [[ENABLE_CRYPTO_SYSTEM_PROFILE]]) @@ -365,7 +343,7 @@ function(_use_sasl libname) elseif(libname STREQUAL "CYRUS") find_package(SASL2 2.0 REQUIRED) target_link_libraries(_mongoc-sasl_backend INTERFACE SASL2::SASL2) - install(FILES "${mongo-c-driver_SOURCE_DIR}/build/cmake/FindSASL2.cmake" DESTINATION "${MONGOC_TARGETS_INSTALL_DIR}/3rdParty") + install(FILES "${mongo-c-driver_SOURCE_DIR}/build/cmake/FindSASL2.cmake" DESTINATION "${MONGOC_INSTALL_CMAKEDIR}/3rdParty") set(backend "Cyrus") else() message(FATAL_ERROR "Unknown SASL backend “${libname}”") @@ -404,12 +382,6 @@ add_feature_info( "authenticate with MongoDB servers using SASL: “Simple Authentication and Security Layer” (${SASL_BACKEND})" ) -if (ENABLE_AUTOMATIC_INIT_AND_CLEANUP) - set (MONGOC_NO_AUTOMATIC_GLOBALS 0) -else () - set (MONGOC_NO_AUTOMATIC_GLOBALS 1) -endif () - if (WIN32) SET (CMAKE_EXTRA_INCLUDE_FILES "ws2tcpip.h") else () @@ -517,10 +489,10 @@ elseif (NOT ENABLE_CLIENT_SIDE_ENCRYPTIO find_package (mongocrypt QUIET) endif () - if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.12.0) + if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.13.0) message (STATUS " libmongocrypt found at ${mongocrypt_DIR}") message (STATUS " libmongocrypt version ${mongocrypt_VERSION} found") - message (STATUS " libmongocrypt version 1.12.0 is required to enable In-Use Encryption Support.") + message (STATUS " libmongocrypt version 1.13.0 is required to enable In-Use Encryption Support.") set (REQUIRED_MONGOCRYPT_VERSION_FOUND OFF) elseif (mongocrypt_FOUND) set (REQUIRED_MONGOCRYPT_VERSION_FOUND ON) @@ -617,15 +589,12 @@ set (MONGOC_SOURCES ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-handshake.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-host-list.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-http.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-index.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-init.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-interrupt.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-list.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-linux-distro-scanner.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-log.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-log-and-monitor-private.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-matcher.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-matcher-op.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-memcmp.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-cmd.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-opcode.c @@ -680,8 +649,6 @@ set (MONGOC_SOURCES ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-crypto-openssl.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-rand-openssl.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-tls-libressl.c - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-libressl.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-crypto-cng.c ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-rand-cng.c @@ -747,11 +714,9 @@ set (HEADERS ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-handshake.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-host-list.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-init.h - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-index.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-iovec.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-log.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-macros.h - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-matcher.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-opcode.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-optional.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-prelude.h @@ -762,7 +727,6 @@ set (HEADERS ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-client-session.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-sleep.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-socket.h - ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-tls-libressl.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-tls-openssl.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream.h ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-stream-buffered.h @@ -780,10 +744,6 @@ set (HEADERS ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-bulkwrite.h ) -set (HEADERS_FORWARDING - ${PROJECT_SOURCE_DIR}/src/mongoc/forwarding/mongoc.h -) - configure_file ( "${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-config.h.in" "${PROJECT_BINARY_DIR}/src/mongoc/mongoc-config.h" @@ -794,13 +754,6 @@ configure_file ( "${PROJECT_BINARY_DIR}/src/mongoc/mongoc-version.h" ) -if (ENABLE_APPLE_FRAMEWORK) - configure_file ( - "${PROJECT_SOURCE_DIR}/src/mongoc/modules/module.modulemap.in" - "${PROJECT_BINARY_DIR}/src/mongoc/modules/module.modulemap" - ) -endif () - set (LIBRARIES ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY} ) @@ -876,37 +829,32 @@ if (MONGOC_ENABLE_MONGODB_AWS_AUTH) endif() endif () -if (MONGOC_ENABLE_STATIC_BUILD) +if (TARGET bson::static) add_library (mcd_rpc STATIC EXCLUDE_FROM_ALL ${PROJECT_SOURCE_DIR}/src/mongoc/mcd-rpc.c) target_include_directories (mcd_rpc PUBLIC ${PROJECT_SOURCE_DIR}/src) - target_link_libraries (mcd_rpc PUBLIC ${BSON_STATIC_LIBRARIES}) + target_link_libraries (mcd_rpc PUBLIC bson::static) if (NOT WIN32 AND ENABLE_PIC) target_compile_options (mcd_rpc PUBLIC -fPIC) endif () - target_compile_definitions (mcd_rpc PUBLIC ${BSON_STATIC_PUBLIC_DEFINITIONS}) set_target_properties (mcd_rpc PROPERTIES OUTPUT_NAME "mcd-rpc") endif () -set_property( - SOURCE ${PROJECT_SOURCE_DIR}/src/mongoc/mongoc-cyrus.c - APPEND PROPERTY COMPILE_DEFINITIONS - "MONGOC_CYRUS_PLUGIN_PATH_PREFIX=$,NULL,\"${CYRUS_PLUGIN_PATH_PREFIX}\">" -) - set ( UTHASH_INCLUDE_DIR "${mongo-c-driver_SOURCE_DIR}/src/uthash" ) if (ENABLE_SHARED) - add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) + add_library (mongoc_shared SHARED ${SOURCES} ${HEADERS}) + add_library(mongoc::shared ALIAS mongoc_shared) + set_property(TARGET mongoc_shared PROPERTY EXPORT_NAME mongoc::shared) if(WIN32) # Add resource-definition script for Windows shared library (.dll). configure_file(libmongoc.rc.in libmongoc.rc) target_sources(mongoc_shared PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/libmongoc.rc) endif() set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidden) - target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES} mongo::detail::c_dependencies) + target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC bson::shared mongo::detail::c_dependencies) target_include_directories (mongoc_shared PRIVATE ${ZLIB_INCLUDE_DIRS}) target_include_directories (mongoc_shared PRIVATE ${UTF8PROC_INCLUDE_DIRS}) target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}) @@ -944,27 +892,17 @@ if (ENABLE_SHARED) ) set_target_properties (mongoc_shared PROPERTIES - OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-${MONGOC_API_VERSION}" - VERSION 0.0.0 - SOVERSION 0 - pkg_config_REQUIRES "libbson-1.0" - ) - mongo_generate_pkg_config(mongoc_shared INSTALL RENAME libmongoc-${MONGOC_API_VERSION}.pc) - - if (ENABLE_APPLE_FRAMEWORK) - set_target_properties (mongoc_shared PROPERTIES - FRAMEWORK TRUE - MACOSX_FRAMEWORK_BUNDLE_VERSION ${MONGOC_VERSION} - MACOSX_FRAMEWORK_SHORT_VERSION_STRING ${MONGOC_VERSION} - MACOSX_FRAMEWORK_IDENTIFIER org.mongodb.mongoc - OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}" - PUBLIC_HEADER "${HEADERS}" + OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}${PROJECT_VERSION_MAJOR}" + VERSION "${PROJECT_VERSION}" + SOVERSION "${PROJECT_VERSION_MAJOR}" + pkg_config_REQUIRES "bson${PROJECT_VERSION_MAJOR}" ) - endif () # ENABLE_APPLE_FRAMEWORK + mongo_generate_pkg_config(mongoc_shared INSTALL RENAME mongoc${PROJECT_VERSION_MAJOR}.pc) add_executable (mongoc-stat ${mongo-c-driver_SOURCE_DIR}/src/tools/mongoc-stat.c) target_compile_options (mongoc-stat PRIVATE ${mongoc-warning-options}) target_link_libraries (mongoc-stat mongoc_shared ${LIBRARIES}) + set_property (TARGET mongoc-stat PROPERTY OUTPUT_NAME mongoc${PROJECT_VERSION_MAJOR}-stat) # mongoc-stat works if shared memory performance counters are enabled. if (ENABLE_SHM_COUNTERS) @@ -976,8 +914,10 @@ if (ENABLE_SHARED) endif () # ENABLE_SHARED if (MONGOC_ENABLE_STATIC_BUILD) - add_library (mongoc_static STATIC ${SOURCES} ${HEADERS} ${HEADERS_FORWARDING}) - target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES} mongo::detail::c_dependencies) + add_library (mongoc_static STATIC ${SOURCES} ${HEADERS}) + add_library(mongoc::static ALIAS mongoc_static) + set_property(TARGET mongoc_static PROPERTY EXPORT_NAME mongoc::static) + target_link_libraries (mongoc_static PUBLIC ${STATIC_LIBRARIES} bson::static mongo::detail::c_dependencies) if (NOT WIN32 AND ENABLE_PIC) target_compile_options (mongoc_static PUBLIC -fPIC) message (STATUS "Adding -fPIC to compilation of mongoc_static components") @@ -1001,7 +941,6 @@ if (MONGOC_ENABLE_STATIC_BUILD) target_compile_definitions (mongoc_static PUBLIC MONGOC_STATIC - ${BSON_STATIC_PUBLIC_DEFINITIONS} PRIVATE MONGOC_COMPILATION ${KMS_MSG_DEFINITIONS} @@ -1022,31 +961,28 @@ if (MONGOC_ENABLE_STATIC_BUILD) $ ) set_target_properties (mongoc_static PROPERTIES - VERSION 0.0.0 - OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}-static-${MONGOC_API_VERSION}" - pkg_config_REQUIRES "libbson-static-1.0" + VERSION "${PROJECT_VERSION}" + OUTPUT_NAME "${MONGOC_OUTPUT_BASENAME}${PROJECT_VERSION_MAJOR}" + pkg_config_REQUIRES "bson${PROJECT_VERSION_MAJOR}-static" ) if(MONGOC_ENABLE_STATIC_INSTALL) - mongo_generate_pkg_config (mongoc_static FILENAME libmongoc-static-${MONGOC_API_VERSION}.pc INSTALL) + mongo_generate_pkg_config (mongoc_static FILENAME mongoc${PROJECT_VERSION_MAJOR}-static.pc INSTALL) endif() endif () set (test-libmongoc-sources ${mongo-c-driver_SOURCE_DIR}/src/common/tests/test-common-atomic.c - ${mongo-c-driver_SOURCE_DIR}/src/common/tests/test-common-cmp.c + ${mongo-c-driver_SOURCE_DIR}/src/common/tests/test-mlib.c ${mongo-c-driver_SOURCE_DIR}/src/common/tests/test-common-oid.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/corpus-test.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/corpus-test.h - ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-atomic.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-b64.c - ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bcon-basic.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bcon-extract.c - ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson-cmp.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson-corpus.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson-error.c - ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson-sync.c + ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson-vector.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson-version.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-bson.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-clock.c @@ -1059,6 +995,7 @@ set (test-libmongoc-sources ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-reader.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-string.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-utf8.c + ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-validate.generated.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-value.c ${mongo-c-driver_SOURCE_DIR}/src/libbson/tests/test-writer.c ${PROJECT_SOURCE_DIR}/tests/bsonutil/bson-match.c @@ -1093,7 +1030,6 @@ set (test-libmongoc-sources ${PROJECT_SOURCE_DIR}/tests/test-mongoc-cluster.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-cmd.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-collection-find-with-opts.c - ${PROJECT_SOURCE_DIR}/tests/test-mongoc-collection-find.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-collection.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-command-logging-and-monitoring.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-command-monitoring.c @@ -1119,7 +1055,6 @@ set (test-libmongoc-sources ${PROJECT_SOURCE_DIR}/tests/test-mongoc-loadbalanced.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-log.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-long-namespace.c - ${PROJECT_SOURCE_DIR}/tests/test-mongoc-matcher.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-max-staleness.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-mongohouse.c ${PROJECT_SOURCE_DIR}/tests/test-mongoc-mongos-pinning.c @@ -1204,7 +1139,7 @@ if (ENABLE_TESTS) # Remove once support for VS 2013 is dropped. target_compile_options(test-libmongoc-lib PRIVATE /wd4756) endif () - target_link_libraries (test-libmongoc-lib PUBLIC mongoc_static) + target_link_libraries (test-libmongoc-lib PUBLIC mongoc::static) # We have tests that test our deprecated api. target_compile_options (test-libmongoc-lib PRIVATE $<$>:-Wno-deprecated-declarations> @@ -1214,7 +1149,6 @@ if (ENABLE_TESTS) target_include_directories (test-libmongoc-lib PRIVATE ${PROJECT_SOURCE_DIR}/tests - ${BSON_STATIC_INCLUDE_DIRS} ${UTHASH_INCLUDE_DIR} ) target_compile_definitions (test-libmongoc-lib @@ -1242,7 +1176,6 @@ if (ENABLE_TESTS) target_include_directories (${test} PRIVATE ${PROJECT_SOURCE_DIR}/tests - ${BSON_STATIC_INCLUDE_DIRS} ) target_compile_definitions (${test} PUBLIC @@ -1279,9 +1212,9 @@ if (ENABLE_EXAMPLES AND ENABLE_SHARED) # Enable unconditional warnings-as-errors for our source code. target_compile_options (${example} PRIVATE ${mongoc-warning-options}) - target_link_libraries (${example} mongoc_shared ${LIBRARIES}) + target_link_libraries (${example} PRIVATE mongoc::shared ${LIBRARIES}) if (WIN32) - target_link_libraries (${example} shlwapi) + target_link_libraries (${example} PRIVATE shlwapi) endif () endfunction () @@ -1348,11 +1281,6 @@ if (ENABLE_EXAMPLES AND ENABLE_SHARED) # examples/tutorial mongoc_add_example (executing ${PROJECT_SOURCE_DIR}/examples/tutorial/executing.c) mongoc_add_example (appending ${PROJECT_SOURCE_DIR}/examples/tutorial/appending.c) - mongoc_add_example (migrating ${PROJECT_SOURCE_DIR}/examples/migrating.c) - # Ignore deprecation warnings in migrating examples. Migrating examples deliberately call deprecated API to show how to migrate. - target_compile_options (migrating - PRIVATE $<$>:-Wno-deprecated-declarations> - ) endif () if (ENABLE_TESTS AND ENABLE_SHARED AND MONGOC_ENABLE_SSL AND NOT WIN32) @@ -1360,7 +1288,7 @@ if (ENABLE_TESTS AND ENABLE_SHARED AND M # Benchmarks require SSL, and do not build on Windows. add_executable (benchmark-tls-pooled ${PROJECT_SOURCE_DIR}/tests/benchmark-tls-pooled.c) target_compile_options (benchmark-tls-pooled PRIVATE ${mongoc-warning-options}) - target_link_libraries (benchmark-tls-pooled mongoc_shared ${LIBRARIES}) + target_link_libraries (benchmark-tls-pooled PRIVATE mongoc::shared ${LIBRARIES}) endif () file (COPY ${PROJECT_SOURCE_DIR}/tests/binary DESTINATION ${PROJECT_BINARY_DIR}/tests) @@ -1378,9 +1306,7 @@ if (ENABLE_SHARED) list (APPEND TARGETS_TO_INSTALL mongoc_shared) endif () -set (MONGOC_HEADER_INSTALL_DIR - "${CMAKE_INSTALL_INCLUDEDIR}/libmongoc-${MONGOC_API_VERSION}" -) + install ( TARGETS ${TARGETS_TO_INSTALL} @@ -1388,27 +1314,14 @@ install ( LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - INCLUDES DESTINATION ${MONGOC_HEADER_INSTALL_DIR} - FRAMEWORK DESTINATION ${CMAKE_INSTALL_BINDIR} + INCLUDES DESTINATION ${MONGOC_INSTALL_INCLUDEDIR} ) install ( FILES ${HEADERS} - DESTINATION "${MONGOC_HEADER_INSTALL_DIR}/mongoc" + DESTINATION "${MONGOC_INSTALL_INCLUDEDIR}/mongoc" ) -install ( - FILES ${HEADERS_FORWARDING} - DESTINATION "${MONGOC_HEADER_INSTALL_DIR}" -) - -if (ENABLE_APPLE_FRAMEWORK) - install ( - FILES "${PROJECT_BINARY_DIR}/src/mongoc/modules/module.modulemap" - DESTINATION "${CMAKE_INSTALL_BINDIR}/mongoc.framework/Modules/" - ) -endif () - # Collect link items for the static library to be inserted into the pkg-config if(TARGET mongoc_static) set(link_options ${ZLIB_LIBRARIES} @@ -1426,69 +1339,36 @@ if(TARGET mongoc_static) endif() # Relative include-path will be given the install prefix: -set_property(TARGET ${TARGETS_TO_INSTALL} APPEND PROPERTY pkg_config_INCLUDE_DIRECTORIES "${MONGOC_HEADER_INSTALL_DIR}") - -# Deprecated alias for libmongoc-1.0.pc, see CDRIVER-2086. -if (MONGOC_ENABLE_SSL) - configure_file ( - ${CMAKE_CURRENT_SOURCE_DIR}/src/libmongoc-ssl-1.0.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-ssl-1.0.pc - @ONLY) - install ( - FILES ${CMAKE_CURRENT_BINARY_DIR}/src/libmongoc-ssl-1.0.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) -endif () - -include (CMakePackageConfigHelpers) - -write_basic_package_version_file ( - "${CMAKE_CURRENT_BINARY_DIR}/mongoc/mongoc-${MONGOC_API_VERSION}-config-version.cmake" - VERSION ${MONGOC_VERSION} - COMPATIBILITY AnyNewerVersion -) - -configure_file (src/mongoc-config.cmake - "${CMAKE_CURRENT_BINARY_DIR}/mongoc/mongoc-${MONGOC_API_VERSION}-config.cmake" - @ONLY -) +set_property(TARGET ${TARGETS_TO_INSTALL} APPEND PROPERTY pkg_config_INCLUDE_DIRECTORIES "${MONGOC_INSTALL_INCLUDEDIR}") install (EXPORT mongoc-targets - NAMESPACE mongo:: FILE mongoc-targets.cmake - DESTINATION ${MONGOC_TARGETS_INSTALL_DIR} + DESTINATION "${MONGOC_INSTALL_CMAKEDIR}" ) -install ( - FILES - "${CMAKE_CURRENT_BINARY_DIR}/mongoc/mongoc-${MONGOC_API_VERSION}-config.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/mongoc/mongoc-${MONGOC_API_VERSION}-config-version.cmake" - DESTINATION - ${MONGOC_TARGETS_INSTALL_DIR} - COMPONENT - Devel -) - -set(mongoc_cmake_prefix "${MONGO_C_DRIVER_INSTALL_CMAKEDIR}/mongoc-${PROJECT_VERSION}") configure_file( ${mongo-c-driver_SOURCE_DIR}/build/cmake/packageConfigVersion.cmake.in mongocConfigVersion.cmake @ONLY ) +configure_file( + etc/mongocConfig.cmake.in + mongocConfig.cmake + @ONLY +) install( - FILES etc/mongocConfig.cmake "${CMAKE_CURRENT_BINARY_DIR}/mongocConfigVersion.cmake" - DESTINATION "${mongoc_cmake_prefix}" + FILES "${CMAKE_CURRENT_BINARY_DIR}/mongocConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/mongocConfigVersion.cmake" + DESTINATION "${MONGOC_INSTALL_CMAKEDIR}" ) -include (LegacyPackage) - -if (ENABLE_MAN_PAGES STREQUAL ON OR ENABLE_HTML_DOCS STREQUAL ON) +if (ENABLE_MAN_PAGES OR ENABLE_HTML_DOCS) find_package (Sphinx REQUIRED) add_subdirectory (doc) add_custom_target (mongoc-doc ALL DEPENDS - $<$:mongoc-man> - $<$:mongoc-html> + $ + $ ) endif () diff -pruN 1.30.4-1/src/libmongoc/doc/api.rst 2.0.2-1/src/libmongoc/doc/api.rst --- 1.30.4-1/src/libmongoc/doc/api.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/api.rst 2025-06-19 15:42:22.000000000 +0000 @@ -30,7 +30,6 @@ API Reference mongoc_collection_t mongoc_cursor_t mongoc_database_t - mongoc_delete_flags_t mongoc_find_and_modify_opts_t mongoc_gridfs_file_list_t mongoc_gridfs_file_opt_t @@ -38,9 +37,6 @@ API Reference mongoc_gridfs_bucket_t mongoc_gridfs_t mongoc_host_list_t - mongoc_index_opt_geo_t - mongoc_index_opt_t - mongoc_index_opt_wt_t mongoc_insert_flags_t mongoc_iovec_t mongoc_optional_t @@ -50,7 +46,6 @@ API Reference mongoc_read_mode_t mongoc_read_prefs_t mongoc_remove_flags_t - mongoc_reply_flags_t mongoc_server_api_t mongoc_server_api_version_t mongoc_server_description_t diff -pruN 1.30.4-1/src/libmongoc/doc/errors.rst 2.0.2-1/src/libmongoc/doc/errors.rst --- 1.30.4-1/src/libmongoc/doc/errors.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/errors.rst 2025-06-19 15:42:22.000000000 +0000 @@ -35,6 +35,8 @@ Many C Driver functions report errors by +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | | ``MONGOC_ERROR_CLIENT_INVALID_LOAD_BALANCER`` | You attempted to connect to a MongoDB server behind a load balancer, but the server does not advertize load balanced support. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ +| | ``MONGOC_ERROR_CLIENT_NOT_READY`` | You attempted to create a client but did not previously call :symbol:`mongoc_init` | ++-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``MONGOC_ERROR_STREAM`` | ``MONGOC_ERROR_STREAM_NAME_RESOLUTION`` | DNS failure. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | | ``MONGOC_ERROR_STREAM_SOCKET`` | Timeout communicating with server, or connection closed. | @@ -55,7 +57,7 @@ Many C Driver functions report errors by +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``MONGOC_ERROR_SASL`` | A SASL error code. | ``man sasl_errors`` for a list of codes. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| ``MONGOC_ERROR_BSON`` | ``MONGOC_ERROR_BSON_INVALID`` | You passed an invalid or oversized BSON document as a parameter, or called :symbol:`mongoc_collection_create_index` with invalid keys, or the server reply was corrupt. | +| ``MONGOC_ERROR_BSON`` | ``MONGOC_ERROR_BSON_INVALID`` | You passed an invalid or oversized BSON document as a parameter or the server reply was corrupt. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``MONGOC_ERROR_NAMESPACE`` | ``MONGOC_ERROR_NAMESPACE_INVALID`` | You tried to create a collection with an invalid name. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -73,11 +75,11 @@ Many C Driver functions report errors by +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``MONGOC_ERROR_SERVER`` | `Error code from server`_. | :ref:`Error API Version 2 `: Server error from a command. The server error message is in ``message``. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| ``MONGOC_ERROR_COLLECTION`` | ``MONGOC_ERROR_COLLECTION_INSERT_FAILED``, ``MONGOC_ERROR_COLLECTION_UPDATE_FAILED``, ``MONGOC_ERROR_COLLECTION_DELETE_FAILED``. | Invalid or empty input to :symbol:`mongoc_collection_insert_one`, :symbol:`mongoc_collection_insert_bulk`, :symbol:`mongoc_collection_update_one`, :symbol:`mongoc_collection_update_many`, :symbol:`mongoc_collection_replace_one`, :symbol:`mongoc_collection_delete_one`, or :symbol:`mongoc_collection_delete_many`. | +| ``MONGOC_ERROR_COLLECTION`` | ``MONGOC_ERROR_COLLECTION_INSERT_FAILED``, ``MONGOC_ERROR_COLLECTION_UPDATE_FAILED``, ``MONGOC_ERROR_COLLECTION_DELETE_FAILED``. | Invalid or empty input to :symbol:`mongoc_collection_insert_one`, :symbol:`mongoc_collection_insert_many`, :symbol:`mongoc_collection_update_one`, :symbol:`mongoc_collection_update_many`, :symbol:`mongoc_collection_replace_one`, :symbol:`mongoc_collection_delete_one`, or :symbol:`mongoc_collection_delete_many`. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| ``MONGOC_ERROR_COLLECTION`` | `Error code from server`_. | :ref:`Error API Version 1 `: Server error from :symbol:`mongoc_collection_insert_one`, :symbol:`mongoc_collection_insert_bulk`, :symbol:`mongoc_collection_update_one`, :symbol:`mongoc_collection_update_many`, :symbol:`mongoc_collection_replace_one`, | +| ``MONGOC_ERROR_COLLECTION`` | `Error code from server`_. | :ref:`Error API Version 1 `: Server error from :symbol:`mongoc_collection_insert_one`, :symbol:`mongoc_collection_insert_many`, :symbol:`mongoc_collection_update_one`, :symbol:`mongoc_collection_update_many`, :symbol:`mongoc_collection_replace_one`, | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| ``MONGOC_ERROR_SERVER`` | `Error code from server`_. | :ref:`Error API Version 2 `: Server error from :symbol:`mongoc_collection_insert_one`, :symbol:`mongoc_collection_insert_bulk`, :symbol:`mongoc_collection_update_one`, :symbol:`mongoc_collection_update_many`, :symbol:`mongoc_collection_replace_one`, | +| ``MONGOC_ERROR_SERVER`` | `Error code from server`_. | :ref:`Error API Version 2 `: Server error from :symbol:`mongoc_collection_insert_one`, :symbol:`mongoc_collection_insert_many`, :symbol:`mongoc_collection_update_one`, :symbol:`mongoc_collection_update_many`, :symbol:`mongoc_collection_replace_one`, | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | ``MONGOC_ERROR_GRIDFS`` | ``MONGOC_ERROR_GRIDFS_CHUNK_MISSING`` | The GridFS file is missing a document in its ``chunks`` collection. | +-----------------------------------------+----------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -158,12 +160,11 @@ To fix this flaw while preserving backwa | :symbol:`mongoc_database_command_with_opts`, and | | | | other command functions | | | +------------------------------------------------------+----------------------------------------+----------------------------------------+ -| :symbol:`mongoc_collection_count_with_opts` | ``MONGOC_ERROR_QUERY`` | ``MONGOC_ERROR_SERVER`` | -| :symbol:`mongoc_client_get_database_names_with_opts`,| | | +| :symbol:`mongoc_client_get_database_names_with_opts` | ``MONGOC_ERROR_QUERY`` | ``MONGOC_ERROR_SERVER`` | | and other command helper functions | | | +------------------------------------------------------+----------------------------------------+----------------------------------------+ | :symbol:`mongoc_collection_insert_one` | ``MONGOC_ERROR_COMMAND`` | ``MONGOC_ERROR_SERVER`` | -| :symbol:`mongoc_collection_insert_bulk` | | | +| :symbol:`mongoc_collection_insert_many` | | | | :symbol:`mongoc_collection_update_one` | | | | :symbol:`mongoc_collection_update_many` | | | | :symbol:`mongoc_collection_replace_one` | | | diff -pruN 1.30.4-1/src/libmongoc/doc/includes/change-stream-opts.txt 2.0.2-1/src/libmongoc/doc/includes/change-stream-opts.txt --- 1.30.4-1/src/libmongoc/doc/includes/change-stream-opts.txt 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/includes/change-stream-opts.txt 2025-06-19 15:42:22.000000000 +0000 @@ -3,9 +3,11 @@ Generated with build/generate-opts.py DO NOT EDIT THIS FILE +.. versionchanged:: 2.0.0 ``batchSize`` of 0 is applied to the ``aggregate`` command. 0 was previously ignored. + ``opts`` may be NULL or a BSON document with additional command options: -* ``batchSize``: An ``int32`` representing number of documents requested to be returned on each call to :symbol:`mongoc_change_stream_next` +* ``batchSize``: An ``int32`` requesting a limit of documents returned in each server reply. If positive, the ``batchSize`` is applied to both ``aggregate`` and ``getMore`` commands. If 0, the ``batchSize`` is only applied to the ``aggregate`` command (Useful to request an immediate cursor without significant server-side work. See `Aggregate Data Specifying Batch Size `_). If omitted or negative, the value is ignored and server defaults are used (See `Cursor Batches `_ for a description of server defaults). * ``resumeAfter``: A ``Document`` representing the logical starting point of the change stream. The result of :symbol:`mongoc_change_stream_get_resume_token()` or the ``_id`` field of any change received from a change stream can be used here. This option is mutually exclusive with ``startAfter`` and ``startAtOperationTime``. * ``startAfter``: A ``Document`` representing the logical starting point of the change stream. Unlike ``resumeAfter``, this can resume notifications after an "invalidate" event. The result of :symbol:`mongoc_change_stream_get_resume_token()` or the ``_id`` field of any change received from a change stream can be used here. This option is mutually exclusive with ``resumeAfter`` and ``startAtOperationTime``. * ``startAtOperationTime``: A ``Timestamp``. The change stream only provides changes that occurred at or after the specified timestamp. Any command run against the server will return an operation time that can be used here. This option is mutually exclusive with ``resumeAfter`` and ``startAfter``. Binary files 1.30.4-1/src/libmongoc/doc/includes/libbson.inv and 2.0.2-1/src/libmongoc/doc/includes/libbson.inv differ diff -pruN 1.30.4-1/src/libmongoc/doc/init-cleanup.rst 2.0.2-1/src/libmongoc/doc/init-cleanup.rst --- 1.30.4-1/src/libmongoc/doc/init-cleanup.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/init-cleanup.rst 2025-06-19 15:42:22.000000000 +0000 @@ -17,13 +17,4 @@ Synopsis mongoc_init mongoc_cleanup -Deprecated feature: automatic initialization and cleanup --------------------------------------------------------- - -On some platforms the driver can automatically call :symbol:`mongoc_init` before ``main``, and call :symbol:`mongoc_cleanup` as the process exits. This is problematic in situations where related libraries also execute cleanup code on shutdown, and it creates inconsistent rules across platforms. Therefore the automatic initialization and cleanup feature is deprecated, and will be dropped in version 2.0. Meanwhile, for backward compatibility, the feature is *enabled* by default on platforms where it is available. - -For portable, future-proof code, always call :symbol:`mongoc_init` and :symbol:`mongoc_cleanup` yourself, and configure the driver like: - -.. code-block:: none - - cmake -DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF +.. versionchanged:: 2.0.0 Versions prior to 2.0.0 supported a non-portable automatic initialization and cleanup with the CMake option ``ENABLE_AUTOMATIC_INIT_AND_CLEANUP``. This was removed in 2.0.0. Ensure your application call :symbol:`mongoc_init` and :symbol:`mongoc_cleanup`. diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_failed_get_server_connection_id.rst 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_failed_get_server_connection_id.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_failed_get_server_connection_id.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_failed_get_server_connection_id.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -:man_page: mongoc_apm_command_failed_get_server_connection_id - -mongoc_apm_command_failed_get_server_connection_id() -==================================================== - -.. warning:: - .. deprecated:: 1.24.0 - - Use :symbol:`mongoc_apm_command_failed_get_server_connection_id_int64()` instead. - -Synopsis --------- - -.. code-block:: c - - int32_t - mongoc_apm_command_failed_get_server_connection_id ( - const mongoc_apm_command_failed_t *event); - -Returns this event's context. - -Returns the server connection ID for the command. The server connection ID is -distinct from the server ID (:symbol:`mongoc_apm_command_failed_get_server_id`) -and is returned by the hello or legacy hello response as "connectionId" from the -server on 4.2+. - -Parameters ----------- - -* ``event``: A :symbol:`mongoc_apm_command_failed_t`. - -Returns -------- - -The server connection ID as a positive integer or -1 if it is not available. - -.. seealso:: - - | :doc:`Introduction to Application Performance Monitoring ` - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_failed_t.rst 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_failed_t.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_failed_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_failed_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -30,7 +30,6 @@ An event notification sent when the driv mongoc_apm_command_failed_get_request_id mongoc_apm_command_failed_get_server_id mongoc_apm_command_failed_get_service_id - mongoc_apm_command_failed_get_server_connection_id mongoc_apm_command_failed_get_server_connection_id_int64 .. seealso:: diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_started_get_server_connection_id.rst 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_started_get_server_connection_id.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_started_get_server_connection_id.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_started_get_server_connection_id.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -:man_page: mongoc_apm_command_started_get_server_connection_id - -mongoc_apm_command_started_get_server_connection_id() -===================================================== - -.. warning:: - .. deprecated:: 1.24.0 - - Use :symbol:`mongoc_apm_command_started_get_server_connection_id_int64()` instead. - -Synopsis --------- - -.. code-block:: c - - int32_t - mongoc_apm_command_started_get_server_connection_id ( - const mongoc_apm_command_started_t *event); - -Returns the server connection ID for the command. The server connection ID is -distinct from the server ID (:symbol:`mongoc_apm_command_started_get_server_id`) -and is returned by the hello or legacy hello response as "connectionId" from the -server on 4.2+. - -Parameters ----------- - -* ``event``: A :symbol:`mongoc_apm_command_started_t`. - -Returns -------- - -The server connection ID as a positive integer or -1 if it is not available. - -.. seealso:: - - | :doc:`Introduction to Application Performance Monitoring ` - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_started_t.rst 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_started_t.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_started_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_started_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -32,6 +32,5 @@ An event notification sent when the driv mongoc_apm_command_started_get_request_id mongoc_apm_command_started_get_server_id mongoc_apm_command_started_get_service_id - mongoc_apm_command_started_get_server_connection_id mongoc_apm_command_started_get_server_connection_id_int64 diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_succeeded_get_server_connection_id.rst 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_succeeded_get_server_connection_id.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_succeeded_get_server_connection_id.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_succeeded_get_server_connection_id.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -:man_page: mongoc_apm_command_succeeded_get_server_connection_id - -mongoc_apm_command_succeeded_get_server_connection_id() -======================================================= - -.. warning:: - .. deprecated:: 1.24.0 - - Use :symbol:`mongoc_apm_command_succeeded_get_server_connection_id_int64()` instead. - -Synopsis --------- - -.. code-block:: c - - int32_t - mongoc_apm_command_succeeded_get_server_connection_id ( - const mongoc_apm_command_succeeded_t *event); - -Returns the server connection ID for the command. The server connection ID is -distinct from the server ID -(:symbol:`mongoc_apm_command_succeeded_get_server_id`) and is returned by the -hello or legacy hello response as "connectionId" from the server on 4.2+. - -Parameters ----------- - -* ``event``: A :symbol:`mongoc_apm_command_succeeded_t`. - -Returns -------- - -The server connection ID as a positive integer or -1 if it is not available. - -.. seealso:: - - | :doc:`Introduction to Application Performance Monitoring ` - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_succeeded_t.rst 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_succeeded_t.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_apm_command_succeeded_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_apm_command_succeeded_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -33,6 +33,5 @@ An event notification sent when the driv mongoc_apm_command_succeeded_get_request_id mongoc_apm_command_succeeded_get_server_id mongoc_apm_command_succeeded_get_service_id - mongoc_apm_command_succeeded_get_server_connection_id mongoc_apm_command_succeeded_get_server_connection_id_int64 diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_delete.rst 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_delete.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_delete.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_delete.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -:man_page: mongoc_bulk_operation_delete - -mongoc_bulk_operation_delete() -============================== - -.. warning:: - .. deprecated:: 0.96.0 - - Use :symbol:`mongoc_bulk_operation_remove()` instead. - -Synopsis --------- - -.. code-block:: c - - void - mongoc_bulk_operation_delete (mongoc_bulk_operation_t *bulk, - const bson_t *selector); - -Deletes documents as part of a bulk operation. This only queues the operation. To execute it, call :symbol:`mongoc_bulk_operation_execute()`. - -Parameters ----------- - -* ``bulk``: A :symbol:`mongoc_bulk_operation_t`. -* ``selector``: A :symbol:`bson:bson_t`. - -Errors ------- - -Errors are propagated via :symbol:`mongoc_bulk_operation_execute()`. - -.. seealso:: - - | :symbol:`mongoc_bulk_operation_remove_many_with_opts()` - - | :symbol:`mongoc_bulk_operation_remove_one_with_opts()` - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_delete_one.rst 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_delete_one.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_delete_one.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_delete_one.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -:man_page: mongoc_bulk_operation_delete_one - -mongoc_bulk_operation_delete_one() -================================== - -.. warning:: - .. deprecated:: 0.96.0 - - Use :symbol:`mongoc_bulk_operation_remove_one()` instead. - -Synopsis --------- - -.. code-block:: c - - void - mongoc_bulk_operation_delete_one (mongoc_bulk_operation_t *bulk, - const bson_t *selector); - -Delete a single document as part of a bulk operation. This only queues the operation. To execute it, call :symbol:`mongoc_bulk_operation_execute()`. - -Parameters ----------- - -* ``bulk``: A :symbol:`mongoc_bulk_operation_t`. -* ``selector``: A :symbol:`bson:bson_t`. - -Errors ------- - -Errors are propagated via :symbol:`mongoc_bulk_operation_execute()`. - -.. seealso:: - - | :symbol:`mongoc_bulk_operation_remove_one_with_opts()` - - | :symbol:`mongoc_bulk_operation_remove_many_with_opts()` - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_execute.rst 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_execute.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_execute.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_execute.rst 2025-06-19 15:42:22.000000000 +0000 @@ -15,7 +15,9 @@ Synopsis This function executes all operations queued into the bulk operation. Unless ``ordered: false`` was specified in the ``opts`` passed to :symbol:`mongoc_collection_create_bulk_operation_with_opts()`, then forward progress will be stopped upon the first error. -It is only valid to call :symbol:`mongoc_bulk_operation_execute()` once. The ``mongoc_bulk_operation_t`` must be destroyed afterwards. +It is only valid to call :symbol:`mongoc_bulk_operation_execute()` once on the same :symbol:`mongoc_bulk_operation_t`. Calling repeatedly results in error. Call :symbol:`mongoc_bulk_operation_destroy` to destroy ``bulk`` afterwards. + +.. versionchanged:: 2.0.0 Calling :symbol:`mongoc_bulk_operation_execute()` repeatedly results in an error. .. warning:: diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_get_hint.rst 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_get_hint.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_get_hint.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_get_hint.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -:man_page: mongoc_bulk_operation_get_hint - -mongoc_bulk_operation_get_hint() -================================ - -.. warning:: - .. deprecated:: 1.28.0 - - Use :symbol:`mongoc_bulk_operation_get_server_id()` instead. - -Synopsis --------- - -.. code-block:: c - - uint32_t - mongoc_bulk_operation_get_hint (const mongoc_bulk_operation_t *bulk); - -Parameters ----------- - -* ``bulk``: A :symbol:`mongoc_bulk_operation_t`. - -Description ------------ - -Retrieves the opaque id of the server used for the operation. - -(The function name includes the old term "hint" for the sake of backward compatibility, but we now call this number a "server id".) - -This number is zero until the driver actually uses a server in :symbol:`mongoc_bulk_operation_execute`. The server id is the same number as the return value of a successful :symbol:`mongoc_bulk_operation_execute`, so ``mongoc_bulk_operation_get_hint`` is useful mainly in case :symbol:`mongoc_bulk_operation_execute` fails and returns zero. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_set_hint.rst 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_set_hint.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_set_hint.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_set_hint.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -:man_page: mongoc_bulk_operation_set_hint - -mongoc_bulk_operation_set_hint() -================================ - -.. warning:: - .. deprecated:: 1.28.0 - - Use :symbol:`mongoc_bulk_operation_set_server_id()` instead. - -Synopsis --------- - -.. code-block:: c - - void - mongoc_bulk_operation_set_hint (mongoc_bulk_operation_t *bulk, uint32_t server_id); - -Parameters ----------- - -* ``bulk``: A :symbol:`mongoc_bulk_operation_t`. -* ``server_id``: An opaque id identifying the server to use. - -Description ------------ - -Specifies which server to use for the operation. This function has an effect only if called before :symbol:`mongoc_bulk_operation_execute`. - -(The function name includes the old term "hint" for the sake of backward compatibility, but we now call this number a "server id".) - -Use ``mongoc_bulk_operation_set_hint`` only for building a language driver that wraps the C Driver. When writing applications in C, leave the server id unset and allow the driver to choose a suitable server for the bulk operation. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_t.rst 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_t.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_bulk_operation_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_bulk_operation_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -42,11 +42,8 @@ After adding all of the write operations :titlesonly: :maxdepth: 1 - mongoc_bulk_operation_delete - mongoc_bulk_operation_delete_one mongoc_bulk_operation_destroy mongoc_bulk_operation_execute - mongoc_bulk_operation_get_hint mongoc_bulk_operation_get_server_id mongoc_bulk_operation_get_write_concern mongoc_bulk_operation_insert @@ -60,7 +57,6 @@ After adding all of the write operations mongoc_bulk_operation_set_bypass_document_validation mongoc_bulk_operation_set_client_session mongoc_bulk_operation_set_comment - mongoc_bulk_operation_set_hint mongoc_bulk_operation_set_server_id mongoc_bulk_operation_set_let mongoc_bulk_operation_update diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_command.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_command.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_command.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_command.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -:man_page: mongoc_client_command - -mongoc_client_command() -======================= - -.. warning:: - .. deprecated:: 1.29.0 - - This function is deprecated and should not be used in new code. - Use :symbol:`mongoc_client_command_simple()` instead. - -Synopsis --------- - -.. code-block:: c - - mongoc_cursor_t * - mongoc_client_command (mongoc_client_t *client, - const char *db_name, - mongoc_query_flags_t flags, - uint32_t skip, - uint32_t limit, - uint32_t batch_size, - const bson_t *query, - const bson_t *fields, - const mongoc_read_prefs_t *read_prefs); - -.. include:: includes/not-retryable-read.txt - -Description ------------ - -This function creates a cursor which will execute the command when :symbol:`mongoc_cursor_next` is called on it. The client's read preference, read concern, and write concern are not applied to the command, and :symbol:`mongoc_cursor_next` will not check the server response for a write concern error or write concern timeout. - -If :symbol:`mongoc_cursor_next()` returns ``false``, then retrieve error details with :symbol:`mongoc_cursor_error()` or :symbol:`mongoc_cursor_error_document()`. - -Parameters ----------- - -* ``client``: A :symbol:`mongoc_client_t`. -* ``db_name``: The name of the database to run the command on. -* ``flags``: Unused. -* ``skip``: Unused. -* ``limit``: Unused. -* ``batch_size``: Unused. -* ``query``: A :symbol:`bson:bson_t` containing the command specification. -* ``fields``: Unused. -* ``read_prefs``: An optional :symbol:`mongoc_read_prefs_t`. Otherwise, the command uses mode ``MONGOC_READ_PRIMARY``. - -Migrating ---------- - -:symbol:`mongoc_client_command` is deprecated. - -The following example uses :symbol:`mongoc_client_command`: - -.. literalinclude:: ../examples/migrating.c - :language: c - :dedent: 6 - :start-after: // mongoc_client_command ... before ... begin - :end-before: // mongoc_client_command ... before ... end - :caption: Before - -The above code block may be rewritten to use :symbol:`mongoc_client_command_simple` instead, as shown below: - -.. literalinclude:: ../examples/migrating.c - :language: c - :dedent: 6 - :start-after: // mongoc_client_command ... after ... begin - :end-before: // mongoc_client_command ... after ... end - :caption: After - -Returns -------- - -A :symbol:`mongoc_cursor_t`. - -The cursor should be freed with :symbol:`mongoc_cursor_destroy()`. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_command_simple.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_command_simple.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_command_simple.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_command_simple.rst 2025-06-19 15:42:22.000000000 +0000 @@ -16,7 +16,7 @@ Synopsis bson_t *reply, bson_error_t *error); -This is a simplified interface to :symbol:`mongoc_client_command()`. It returns the first document from the result cursor into ``reply``. The client's read preference, read concern, and write concern are not applied to the command. +The client's read preference, read concern, and write concern are not applied to the command. .. warning:: diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_get_server_status.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_get_server_status.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_get_server_status.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_get_server_status.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -:man_page: mongoc_client_get_server_status - -mongoc_client_get_server_status() -================================= - -.. warning:: - .. deprecated:: 1.10.0 - - Run the `serverStatus `_ command directly with :symbol:`mongoc_client_read_command_with_opts()` instead. - -Synopsis --------- - -.. code-block:: c - - bool - mongoc_client_get_server_status (mongoc_client_t *client, - mongoc_read_prefs_t *read_prefs, - bson_t *reply, - bson_error_t *error); - -Queries the server for the current server status. The result is stored in ``reply``. - -``reply`` is always initialized, even in the case of failure. Always call :symbol:`bson:bson_destroy()` to release it. - -Parameters ----------- - -* ``client``: A :symbol:`mongoc_client_t`. -* ``read_prefs``: A :symbol:`mongoc_read_prefs_t`. -* ``reply``: A |bson_t-opt-storage-ptr| to contain the results. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. - -Errors ------- - -Errors are propagated via the ``error`` parameter. - -Returns -------- - -Returns ``true`` if successful. Returns ``false`` and sets ``error`` if there are invalid arguments or a server or network error. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_pool_min_size.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_pool_min_size.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_pool_min_size.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_pool_min_size.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -:man_page: mongoc_client_pool_min_size - -mongoc_client_pool_min_size() -============================= - -.. warning:: - .. deprecated:: 1.9.0 - - This function is deprecated because its behavior does not match what developers expect from a "minimum pool size", and its actual behavior is likely to hurt performance. - - Applications should not call this function, they should instead accept the default behavior, which is to keep all idle clients that are pushed into the pool. - -Synopsis --------- - -.. code-block:: c - - void - mongoc_client_pool_min_size (mongoc_client_pool_t *pool, - uint32_t min_pool_size); - -This function sets the *maximum* number of idle clients to be kept in the pool. Any idle clients in excess of the maximum are destroyed. - -Parameters ----------- - -* ``pool``: A :symbol:`mongoc_client_pool_t`. -* ``min_pool_size``: The number of idle clients to keep in the pool. - -.. include:: includes/mongoc_client_pool_thread_safe.txt - -Subsequent calls to :symbol:`mongoc_client_pool_push` respect the new minimum size, and close the least recently used :symbol:`mongoc_client_t` if the minimum size is exceeded. diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_pool_t.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_pool_t.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_pool_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_pool_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -33,7 +33,6 @@ Example mongoc_client_pool_destroy mongoc_client_pool_enable_auto_encryption mongoc_client_pool_max_size - mongoc_client_pool_min_size mongoc_client_pool_new mongoc_client_pool_new_with_error mongoc_client_pool_pop diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_set_ssl_opts.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_set_ssl_opts.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_set_ssl_opts.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_set_ssl_opts.rst 2025-06-19 15:42:22.000000000 +0000 @@ -32,6 +32,8 @@ It is a programming error to call this f :symbol:`mongoc_client_pool_set_ssl_opts` on the pool before popping any clients. +.. versionchanged:: 2.0.0 This function logs an error and immediately returns if ``client`` is from a :symbol:`mongoc_client_pool_t`. Previously this function unsafely applied the options to the pooled client. + Parameters ---------- diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_set_stream_initiator.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_set_stream_initiator.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_set_stream_initiator.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_set_stream_initiator.rst 2025-06-19 15:42:22.000000000 +0000 @@ -15,6 +15,10 @@ Synopsis The :symbol:`mongoc_client_set_stream_initiator()` function shall associate a given :symbol:`mongoc_client_t` with a new stream initiator. This will completely replace the default transport (buffered TCP, possibly with TLS). The ``initiator`` should fulfill the :symbol:`mongoc_stream_t` contract. ``user_data`` is passed through to the ``initiator`` callback and may be used for whatever run time customization is necessary. +It is a programming error to call this function on a :symbol:`mongoc_client_t` from a :symbol:`mongoc_client_pool_t`. + +.. versionchanged:: 2.0.0 This function logs an error and immediately returns if ``client`` is from a :symbol:`mongoc_client_pool_t`. Previously this function unsafely applied the initiator to the pooled client. + If ``user_data`` is passed, it is the application's responsibility to ensure ``user_data`` remains valid for the lifetime of the client. Parameters diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_client_t.rst 2.0.2-1/src/libmongoc/doc/mongoc_client_t.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_client_t.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_client_t.rst 2025-06-19 15:42:22.000000000 +0000 @@ -53,7 +53,6 @@ Example :maxdepth: 1 mongoc_client_bulkwrite_new - mongoc_client_command mongoc_client_command_simple mongoc_client_command_simple_with_server_id mongoc_client_command_with_opts @@ -72,7 +71,6 @@ Example mongoc_client_get_read_prefs mongoc_client_get_server_description mongoc_client_get_server_descriptions - mongoc_client_get_server_status mongoc_client_get_uri mongoc_client_get_write_concern mongoc_client_new diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_command.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_command.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_command.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_command.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -:man_page: mongoc_collection_command - -mongoc_collection_command() -=========================== - -.. warning:: - .. deprecated:: 1.29.0 - - This function is deprecated and should not be used in new code. - Use :symbol:`mongoc_collection_command_simple()` instead. - -Synopsis --------- - -.. code-block:: c - - mongoc_cursor_t * - mongoc_collection_command (mongoc_collection_t *collection, - mongoc_query_flags_t flags, - uint32_t skip, - uint32_t limit, - uint32_t batch_size, - const bson_t *command, - const bson_t *fields, - const mongoc_read_prefs_t *read_prefs); - -.. include:: includes/not-retryable-read.txt - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``flags``: Unused. -* ``skip``: Unused. -* ``limit``: Unused. -* ``batch_size``: Unused. -* ``command``: A :symbol:`bson:bson_t` containing the command to execute. -* ``fields``: Unused. -* ``read_prefs``: An optional :symbol:`mongoc_read_prefs_t`. Otherwise, the command uses mode ``MONGOC_READ_PRIMARY``. - -Migrating ---------- - -:symbol:`mongoc_collection_command` is deprecated. - -The following example uses :symbol:`mongoc_collection_command`: - -.. literalinclude:: ../examples/migrating.c - :language: c - :dedent: 6 - :start-after: // mongoc_collection_command ... before ... begin - :end-before: // mongoc_collection_command ... before ... end - :caption: Before - -The above code block may be rewritten to use :symbol:`mongoc_collection_command_simple` instead, as shown below: - -.. literalinclude:: ../examples/migrating.c - :language: c - :dedent: 6 - :start-after: // mongoc_collection_command ... after ... begin - :end-before: // mongoc_collection_command ... after ... end - :caption: After - -Returns -------- - -.. include:: includes/returns-cursor.txt diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_command_simple.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_command_simple.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_command_simple.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_command_simple.rst 2025-06-19 15:42:22.000000000 +0000 @@ -27,7 +27,7 @@ Parameters Description ----------- -This is a simplified version of :symbol:`mongoc_collection_command()` that returns the first result document in ``reply``. The collection's read preference, read concern, and write concern are not applied to the command. The parameter ``reply`` is initialized even upon failure to simplify memory management. +The collection's read preference, read concern, and write concern are not applied to the command. The parameter ``reply`` is initialized even upon failure to simplify memory management. This function tries to unwrap an embedded error in the command when possible. The unwrapped error will be propagated via the ``error`` parameter. Additionally, the result document is set in ``reply``. diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_count.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_count.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_count.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_count.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -:man_page: mongoc_collection_count - -mongoc_collection_count() -========================= - -.. warning:: - .. deprecated:: 1.11.0 - - Use :symbol:`mongoc_collection_count_documents` or :symbol:`mongoc_collection_estimated_document_count` instead. - - :symbol:`mongoc_collection_count_documents` has similar performance to calling :symbol:`mongoc_collection_count` with a non-NULL ``query``, and is guaranteed to retrieve an accurate collection count. See :ref:`migrating from deprecated count functions ` for details. - - :symbol:`mongoc_collection_estimated_document_count` has the same performance as calling :symbol:`mongoc_collection_count` with a NULL ``query``, but is not guaranteed to retrieve an accurate collection count. - -.. include:: includes/retryable-read.txt - -Synopsis --------- - -.. code-block:: c - - int64_t - mongoc_collection_count (mongoc_collection_t *collection, - mongoc_query_flags_t flags, - const bson_t *query, - int64_t skip, - int64_t limit, - const mongoc_read_prefs_t *read_prefs, - bson_error_t *error); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``flags``: A :symbol:`mongoc_query_flags_t`. -* ``query``: A :symbol:`bson:bson_t` containing the query. -* ``skip``: A int64_t, zero to ignore. -* ``limit``: A int64_t, zero to ignore. -* ``read_prefs``: A :symbol:`mongoc_read_prefs_t` or ``NULL``. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. - -Description ------------ - -This function shall execute a count query on the underlying 'collection'. The bson 'query' is not validated, simply passed along as appropriate to the server. As such, compatibility and errors should be validated in the appropriate server documentation. - -For more information, see the `query reference `_ at the MongoDB website. - -The :symbol:`mongoc_read_concern_t` specified on the :symbol:`mongoc_collection_t` will be used, if any. If ``read_prefs`` is NULL, the collection's read preferences are used. - -Errors ------- - -Errors are propagated via the ``error`` parameter. - -Returns -------- - --1 on failure, otherwise the number of documents counted. - -Example -------- - -.. code-block:: c - - #include - #include - #include - - static void - print_query_count (mongoc_collection_t *collection, bson_t *query) - { - bson_error_t error; - int64_t count; - - count = mongoc_collection_count ( - collection, MONGOC_QUERY_NONE, query, 0, 0, NULL, &error); - - if (count < 0) { - fprintf (stderr, "Count failed: %s\n", error.message); - } else { - printf ("%" PRId64 " documents counted.\n", count); - } - } - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_count_documents.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_count_documents.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_count_documents.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_count_documents.rst 2025-06-19 15:42:22.000000000 +0000 @@ -76,29 +76,6 @@ Example } } -.. _migrating-from-deprecated-count: - -Migrating from deprecated count functions ------------------------------------------ - -When migrating to :symbol:`mongoc_collection_count_documents` from the deprecated :symbol:`mongoc_collection_count` or :symbol:`mongoc_collection_count_with_opts`, the following query operators in the filter must be replaced: - -+-------------+-------------------------------------+ -| Operator | Replacement | -+=============+=====================================+ -| $where | `$expr`_ | -+-------------+-------------------------------------+ -| $near | `$geoWithin`_ with `$center`_ | -+-------------+-------------------------------------+ -| $nearSphere | `$geoWithin`_ with `$centerSphere`_ | -+-------------+-------------------------------------+ - -$expr requires MongoDB 3.6+ - -.. _$expr: https://www.mongodb.com/docs/manual/reference/operator/query/expr/ -.. _$geoWithin: https://www.mongodb.com/docs/manual/reference/operator/query/geoWithin/ -.. _$center: https://www.mongodb.com/docs/manual/reference/operator/query/center/#op._S_center -.. _$centerSphere: https://www.mongodb.com/docs/manual/reference/operator/query/centerSphere/#op._S_centerSphere .. seealso:: diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_count_with_opts.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_count_with_opts.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_count_with_opts.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_count_with_opts.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,139 +0,0 @@ -:man_page: mongoc_collection_count_with_opts - -mongoc_collection_count_with_opts() -=================================== - -.. warning:: - .. deprecated:: 1.11.0 - - Use :symbol:`mongoc_collection_count_documents` or :symbol:`mongoc_collection_estimated_document_count` instead. - - :symbol:`mongoc_collection_count_documents` has similar performance to calling :symbol:`mongoc_collection_count` with a non-NULL ``query``, and is guaranteed to retrieve an accurate collection count. See :ref:`migrating from deprecated count functions ` for details. - - :symbol:`mongoc_collection_estimated_document_count` has the same performance as calling :symbol:`mongoc_collection_count` with a NULL ``query``, but is not guaranteed to retrieve an accurate collection count. - -Synopsis --------- - -.. code-block:: c - - int64_t - mongoc_collection_count_with_opts (mongoc_collection_t *collection, - mongoc_query_flags_t flags, - const bson_t *query, - int64_t skip, - int64_t limit, - const bson_t *opts, - const mongoc_read_prefs_t *read_prefs, - bson_error_t *error); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``flags``: A :symbol:`mongoc_query_flags_t`. -* ``query``: A :symbol:`bson:bson_t` containing the query. -* ``skip``: A int64_t, zero to ignore. -* ``limit``: A int64_t, zero to ignore. -* ``opts``: A :symbol:`bson:bson_t`, ``NULL`` to ignore. -* ``read_prefs``: An optional :symbol:`mongoc_read_prefs_t`, otherwise uses the collection's read preference. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. - -.. |opts-source| replace:: ``collection`` - -.. include:: includes/read-opts.txt - -Description ------------ - -This function shall execute a count query on the underlying 'collection'. The bson 'query' is not validated, simply passed along as appropriate to the server. As such, compatibility and errors should be validated in the appropriate server documentation. - -The :symbol:`mongoc_read_concern_t` specified on the :symbol:`mongoc_collection_t` will be used, if any. If ``read_prefs`` is NULL, the collection's read preferences are used. - -In addition to the standard functionality available from mongoc_collection_count, this function allows the user to add arbitrary extra keys to the count. This pass through enables features such as hinting for counts. - -For more information, see the `query reference `_ at the MongoDB website. - -.. include:: includes/retryable-read.txt - -Errors ------- - -Errors are propagated via the ``error`` parameter. - -Returns -------- - --1 on failure, otherwise the number of documents counted. - -Examples --------- - -.. code-block:: c - :caption: Basic Counting - - #include - #include - #include - - static void - print_query_count (mongoc_collection_t *collection, bson_t *query) - { - bson_error_t error; - int64_t count; - bson_t opts; - - bson_init (&opts); - BSON_APPEND_UTF8 (&opts, "hint", "_id_"); - - count = mongoc_collection_count_with_opts ( - collection, MONGOC_QUERY_NONE, query, 0, 0, &opts, NULL, &error); - - bson_destroy (&opts); - - if (count < 0) { - fprintf (stderr, "Count failed: %s\n", error.message); - } else { - printf ("%" PRId64 " documents counted.\n", count); - } - } - -.. code-block:: c - :caption: Counting with Collation - - #include - #include - #include - - static void - print_query_count (mongoc_collection_t *collection, bson_t *query) - { - bson_t *selector; - bson_t *opts; - bson_error_t error; - int64_t count; - - selector = BCON_NEW ("_id", "{", "$gt", BCON_UTF8 ("one"), "}"); - - /* "One" normally sorts before "one"; make "one" come first */ - opts = BCON_NEW ("collation", - "{", - "locale", - BCON_UTF8 ("en_US"), - "caseFirst", - BCON_UTF8 ("lower"), - "}"); - - count = mongoc_collection_count_with_opts ( - collection, MONGOC_QUERY_NONE, query, 0, 0, opts, NULL, &error); - - bson_destroy (selector); - bson_destroy (opts); - - if (count < 0) { - fprintf (stderr, "Count failed: %s\n", error.message); - } else { - printf ("%" PRId64 " documents counted.\n", count); - } - } - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_create_bulk_operation.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_create_bulk_operation.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_create_bulk_operation.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_create_bulk_operation.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -:man_page: mongoc_collection_create_bulk_operation - -mongoc_collection_create_bulk_operation() -========================================= - -.. warning:: - .. deprecated:: 1.9.0 - - Use :symbol:`mongoc_collection_create_bulk_operation_with_opts()` instead. - -Synopsis --------- - -.. code-block:: c - - mongoc_bulk_operation_t * - mongoc_collection_create_bulk_operation ( - mongoc_collection_t *collection, - bool ordered, - const mongoc_write_concern_t *write_concern); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``ordered``: If the operations must be performed in order. -* ``write_concern``: An optional :symbol:`mongoc_write_concern_t` or ``NULL``. - -Description ------------ - -This function shall begin a new bulk operation. After creating this you may call various functions such as :symbol:`mongoc_bulk_operation_update()`, :symbol:`mongoc_bulk_operation_insert()` and others. - -After calling :symbol:`mongoc_bulk_operation_execute()` the commands will be executed in as large as batches as reasonable by the client. - -If ``ordered`` is true, then processing will stop at the first error. - -If ``ordered`` is not true, then the bulk operation will attempt to continue processing even after the first failure. - -``write_concern`` contains the write concern for all operations in the bulk operation. If ``NULL``, the collection's write concern is used. The global default is acknowledged writes: MONGOC_WRITE_CONCERN_W_DEFAULT. - -Errors ------- - -Errors are propagated when executing the bulk operation. - -Returns -------- - -A newly allocated :symbol:`mongoc_bulk_operation_t` that should be freed with :symbol:`mongoc_bulk_operation_destroy()` when no longer in use. - -.. warning:: - - Failure to handle the result of this function is a programming error. - -.. seealso:: - - | `Bulk Write Operations `_ - - :symbol:`mongoc_bulk_operation_t` - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_create_index.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_create_index.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_create_index.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_create_index.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -:man_page: mongoc_collection_create_index - -mongoc_collection_create_index() -================================ - -.. warning:: - .. deprecated:: 1.8.0 - - See `Manage Collection Indexes `_ for alternatives. - -Synopsis --------- - -.. code-block:: c - - bool - mongoc_collection_create_index (mongoc_collection_t *collection, - const bson_t *keys, - const mongoc_index_opt_t *opt, - bson_error_t *error); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``keys``: A :symbol:`bson:bson_t`. -* ``opt``: A mongoc_index_opt_t. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_create_index_with_opts.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_create_index_with_opts.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_create_index_with_opts.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_create_index_with_opts.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -:man_page: mongoc_collection_create_index_with_opts - -mongoc_collection_create_index_with_opts() -========================================== - -.. warning:: - .. deprecated:: 1.8.0 - - See `Manage Collection Indexes `_ for alternatives. - -Synopsis --------- - -.. code-block:: c - - bool - mongoc_collection_create_index_with_opts (mongoc_collection_t *collection, - const bson_t *keys, - const mongoc_index_opt_t *index_opts, - const bson_t *command_opts, - bson_t *reply, - bson_error_t *error); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``keys``: A :symbol:`bson:bson_t`. -* ``index_opts``: A mongoc_index_opt_t. -* ``reply``: A |bson_t-opt-storage-ptr| to contain the results. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. - -.. |opts-source| replace:: ``collection`` - -.. include:: includes/create-index-opts.txt - -Description ------------ - -This function will request the creation of a new index. - -This function will use the ``createIndexes`` command. -The server's reply is stored in ``reply``. - -If no write concern is provided in ``command_opts``, the collection's write concern is used. - -See :symbol:`mongoc_index_opt_t` for options on creating indexes. - -Errors ------- - -Errors are propagated via the ``error`` parameter. - -Returns -------- - -Returns ``true`` if successful. Returns ``false`` and sets ``error`` if there are invalid arguments or a server or network error. - -``reply`` is always initialized and must be destroyed with :symbol:`bson:bson_destroy()`. If the server is running an obsolete version of MongoDB then ``reply`` may be empty, though it will still be initialized. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_delete.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_delete.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_delete.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_delete.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -:man_page: mongoc_collection_delete - -mongoc_collection_delete() -========================== - -.. warning:: - .. deprecated:: 1.9.0 - - Use :symbol:`mongoc_collection_remove`, :symbol:`mongoc_collection_delete_one()` or :symbol:`mongoc_collection_delete_many()` instead. - -Synopsis --------- - -.. code-block:: c - - bool - mongoc_collection_delete (mongoc_collection_t *collection, - mongoc_delete_flags_t flags, - const bson_t *selector, - const mongoc_write_concern_t *write_concern, - bson_error_t *error); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``flags``: A :symbol:`mongoc_delete_flags_t`. -* ``selector``: A :symbol:`bson:bson_t` containing the query to match documents. -* ``write_concern``: A :symbol:`mongoc_write_concern_t` or ``NULL``. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. - -Description ------------ - -This function shall delete documents in the given ``collection`` that match ``selector``. The bson ``selector`` is not validated, simply passed along as appropriate to the server. As such, compatibility and errors should be validated in the appropriate server documentation. - -If you want to limit deletes to a single document, provide ``MONGOC_DELETE_SINGLE_REMOVE`` in ``flags``. - -Errors ------- - -Errors are propagated via the ``error`` parameter. - -Returns -------- - -Returns ``true`` if successful. Returns ``false`` and sets ``error`` if there are invalid arguments or a server or network error. - -A write concern timeout or write concern error is considered a failure. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_ensure_index.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_ensure_index.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_ensure_index.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_ensure_index.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -:man_page: mongoc_collection_ensure_index - -mongoc_collection_ensure_index() -================================ - -.. warning:: - .. deprecated:: 1.8.0 - - See `Manage Collection Indexes `_ for alternatives. - -Synopsis --------- - -.. code-block:: c - - bool - mongoc_collection_ensure_index (mongoc_collection_t *collection, - const bson_t *keys, - const mongoc_index_opt_t *opt, - bson_error_t *error); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``keys``: A :symbol:`bson:bson_t`. -* ``opt``: A mongoc_index_opt_t. -* ``error``: An optional location for a :symbol:`bson_error_t ` or ``NULL``. - -Errors ------- - -Errors are propagated via the ``error`` parameter. - diff -pruN 1.30.4-1/src/libmongoc/doc/mongoc_collection_find.rst 2.0.2-1/src/libmongoc/doc/mongoc_collection_find.rst --- 1.30.4-1/src/libmongoc/doc/mongoc_collection_find.rst 2025-05-07 19:11:51.000000000 +0000 +++ 2.0.2-1/src/libmongoc/doc/mongoc_collection_find.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,159 +0,0 @@ -:man_page: mongoc_collection_find - -mongoc_collection_find() -======================== - -.. warning:: - .. deprecated:: 1.5.0 - - Use :symbol:`mongoc_collection_find_with_opts` instead. - -Synopsis --------- - -.. code-block:: c - - mongoc_cursor_t * - mongoc_collection_find (mongoc_collection_t *collection, - mongoc_query_flags_t flags, - uint32_t skip, - uint32_t limit, - uint32_t batch_size, - const bson_t *query, - const bson_t *fields, - const mongoc_read_prefs_t *read_prefs); - -Parameters ----------- - -* ``collection``: A :symbol:`mongoc_collection_t`. -* ``flags``: A :symbol:`mongoc_query_flags_t`. -* ``skip``: A uint32_t of number of documents to skip or 0. -* ``limit``: A uint32_t of max number of documents to return or 0. -* ``batch_size``: A uint32_t containing batch size of document result sets or 0 for default. Default is 100. -* ``query``: A :symbol:`bson:bson_t` containing the query and options to execute. -* ``fields``: A :symbol:`bson:bson_t` containing fields to return or ``NULL``. -* ``read_prefs``: A :symbol:`mongoc_read_prefs_t` or ``NULL`` for default read preferences. - -Description ------------ - -This function shall execute a query on the underlying ``collection``. - -If no options are necessary, ``query`` can simply contain a query such as ``{a:1}``. If you would like to specify options such as a sort order, the query must be placed inside of ``{"$query": {}}``. See the example below for how to properly specify additional options to ``query``. - -.. include:: includes/retryable-read.txt - -Returns -------- - -.. include:: includes/returns-cursor.txt - -Example -------- - -.. code-block:: c - :caption: Print All Documents in a Collection - - #include - #include - #include - - static void - print_all_documents (mongoc_collection_t *collection) - { - mongoc_cursor_t *cursor; - bson_error_t error; - const bson_t *doc; - char *str; - bson_t *query; - - query = BCON_NEW ("$query", - "{", - "foo", - BCON_INT32 (1), - "}", - "$orderby", - "{", - "bar", - BCON_INT32 (-1), - "}"); - cursor = mongoc_collection_find ( - collection, MONGOC_QUERY_NONE, 0, 0, 0, query, NULL, NULL); - - while (mongoc_cursor_next (cursor, &doc)) { - str = bson_as_canonical_extended_json (doc, NULL); - printf ("%s\n", str); - bson_free (str); - } - - if (mongoc_cursor_error (cursor, &error)) { - fprintf (stderr, "An error occurred: %s\n", error.message); - } - - mongoc_cursor_destroy (cursor); - bson_destroy (query); - } - -The "find" command ------------------- - -Queries have historically been sent as OP_QUERY wire protocol messages, but beginning in MongoDB 3.2 queries use `the "find" command `_ instead. - -The driver automatically converts queries to the new "find" command syntax if needed, so this change is typically invisible to C Driver users. However, an application written exclusively for MongoDB 3.2 and later can choose to use the new syntax directly instead of relying on the driver to convert from the old syntax: - -.. code-block:: c - - /* MongoDB 3.2+ "find" command syntax */ - query = BCON_NEW ("filter", - "{", - "foo", - BCON_INT32 (1), - "}", - "sort", - "{", - "bar", - BCON_INT32 (-1), - "}"); - cursor = mongoc_collection_find ( - collection, MONGOC_QUERY_NONE, 0, 0, 0, query, NULL, NULL); - -The "find" command takes different options from the traditional OP_QUERY message. - -==================== ================== ================= -Query ``$query`` ``filter`` -Sort ``$orderby`` ``sort`` -Show record location ``$showDiskLoc`` ``showRecordId`` -Other $-options ``$