[MONGOCRYPT-483]: Support Decimal128 in range-based Queryable Encryption

CMakeLists.txt

@@ -1,14 +1,9 @@
-cmake_minimum_required (VERSION 3.5)
+cmake_minimum_required (VERSION 3.12)
 
-if (CMAKE_VERSION VERSION_EQUAL 3.12 OR CMAKE_VERSION VERSION_GREATER 3.12)
-   project (mongocrypt C)
+project (mongocrypt C)
 
-   # Used for the csfle-markup util:
-   enable_language (CXX OPTIONAL)
-else ()
-   # GenerateExportHeader only works with C with 3.12 - https://gitlab.kitware.com/cmake/cmake/commit/de348a9638bd51af4523f36c68884b901d4aff18
-   project (mongocrypt C CXX)
-endif ()
+# Used for the csfle-markup util:
+enable_language (CXX OPTIONAL)
 
 set (CMAKE_C_STANDARD 99)
 
@@ -25,6 +20,7 @@ list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include (GNUInstallDirs)
 
 include (ImportBSON)
+include (IntelDFP)
 
 if (USE_SHARED_LIBBSON AND ENABLE_BUILD_FOR_PPA)
    message (FATAL_ERROR "PPA build requires static linking to libbson")
@@ -249,6 +245,7 @@ target_link_libraries (
       _mongocrypt::libbson_for_shared
       Threads::Threads
       kms_message_static
+      mongocrypt::intel_dfp
       $<BUILD_INTERFACE:mongo::mlib>
    PUBLIC
       ${CMAKE_DL_LIBS}
@@ -306,6 +303,7 @@ target_link_libraries (
    PRIVATE
       _mongocrypt::libbson_for_static
       kms_message_static
+      mongocrypt::intel_dfp
       $<BUILD_INTERFACE:mongo::mlib>
    PUBLIC
       ${CMAKE_THREAD_LIBS_INIT}
@@ -492,10 +490,27 @@ foreach (test IN ITEMS path str)
 endforeach ()
 
 if ("cxx_relaxed_constexpr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
-   add_executable(mlib.int128.test src/mlib/int128.test.cpp src/mlib/int128.test.c)
-   add_test (mlib.int128 mlib.int128.test)
-   target_link_libraries (mlib.int128.test PRIVATE mongo::mlib Threads::Threads)
-   target_compile_features (mlib.int128.test PRIVATE cxx_relaxed_constexpr)
+   file (GLOB_RECURSE test_files CONFIGURE_DEPENDS src/*.test.cpp)
+   foreach (file IN LISTS test_files)
+      # Compute a nice test name
+      file (RELATIVE_PATH relpath "${CMAKE_CURRENT_LIST_DIR}/src" "${file}")
+      file (TO_CMAKE_PATH "${relpath}" relpath)
+      string (REPLACE "src/" "" relpath "${relpath}")
+      string (REPLACE "/" "." test_name "${relpath}")
+      string (REGEX REPLACE "\\.test\\.cpp$" "" test_name "${test_name}")
+      # Generate a test executable:
+      set (exe_name "${test_name}.test")
+      add_executable ("${exe_name}" "${file}")
+      target_compile_features ("${exe_name}" PRIVATE cxx_relaxed_constexpr)
+      target_link_libraries ("${exe_name}" PRIVATE
+         mongocrypt
+         mongo::mlib
+         mongocrypt::intel_dfp
+         Threads::Threads
+         bson_static
+         )
+      add_test ("${test_name}" "${exe_name}")
+   endforeach ()
 endif ()
 
 if ("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES)

bindings/node/.evergreen/setup_environment.sh

@@ -1,10 +1,5 @@
 #!/usr/bin/env bash
 
-if [ -z "$NODE_NVM_USE_VERSION" ]; then 
-  echo "NODE_NVM_USE_VERSION environment variable must be set."
-  exit 1
-fi
-
 set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with error if any of the commands fail
 
@@ -26,16 +21,8 @@ mkdir -p "${BIN_DIR}"
 # Add mongodb toolchain to path
 export PATH="$BIN_DIR:/opt/mongodbtoolchain/v2/bin:$PATH"
 
-# locate cmake
-if [ "$OS" == "Windows_NT" ]; then
-  CMAKE=/cygdrive/c/cmake/bin/cmake
-  if [ "$WINDOWS_32BIT" != "ON" ]; then
-      ADDITIONAL_CMAKE_FLAGS="-Thost=x64 -A x64"
-  fi
-else
-  chmod u+x ./.evergreen/find_cmake.sh
-  IGNORE_SYSTEM_CMAKE=1 . ./.evergreen/find_cmake.sh
-fi
+test -n "${NODE_NVM_USE_VERSION-}" || echo "Defaulting to using the current Node LTS Release. Set NODE_NVM_USE_VERSION to change."
+: "${NODE_NVM_USE_VERSION:="lts"}"
 
 # this needs to be explicitly exported for the nvm install below
 export NVM_DIR="${NODE_ARTIFACTS_PATH}/nvm"

bindings/node/.evergreen/test.sh

@@ -11,7 +11,7 @@ export MONGODB_CLIENT_ENCRYPTION_OVERRIDE="$(pwd)"
 
 # install node dependencies
 echo "Installing package dependencies (includes a static build)"
-. ./etc/build-static.sh
+bash ./etc/build-static.sh
 # npm install
 
 # Run tests
@@ -21,4 +21,4 @@ MONGODB_NODE_SKIP_LIVE_TESTS=true npm test
 
 # Run prebuild and deploy
 echo "Running prebuild and deploy"
-. ./.evergreen/prebuild.sh
+bash ./.evergreen/prebuild.sh

bindings/node/etc/build-static.sh

@@ -1,33 +1,35 @@
-#!/usr/bin/env bash -x
+#!/usr/bin/env bash
 
-DEPS_PREFIX="$(pwd)/deps"
+THIS_DIR="$(dirname "${BASH_SOURCE[0]}")"
+. "$THIS_DIR/../../../.evergreen/init.sh"
+
+NODE_DIR="$(abspath "$THIS_DIR/..")"
+
+DEPS_PREFIX="$NODE_DIR/deps"
 BUILD_DIR=$DEPS_PREFIX/tmp
-LIBMONGOCRYPT_DIR="$(pwd)/../../"
-TOP_DIR="$(pwd)/../../../"
+: "${CMAKE_FLAGS:=}"
+: "${WINDOWS_CMAKE_FLAGS:=}"
+: "${NPM_OPTIONS:=}"
 
 export NPM_OPTIONS="${NPM_OPTIONS}"
 
-if [[ -z $CMAKE ]]; then
-  CMAKE=`type -P cmake`
-fi
-
 # build and install libmongocrypt
 mkdir -p $BUILD_DIR/libmongocrypt-build
 pushd $BUILD_DIR/libmongocrypt-build  #./deps/tmp/libmongocrypt-build
 
 CMAKE_FLAGS="-DDISABLE_NATIVE_CRYPTO=1 -DCMAKE_INSTALL_LIBDIR=lib -DENABLE_MORE_WARNINGS_AS_ERRORS=ON"
-if [ "$OS" == "Windows_NT" ]; then
-  if [ "$WINDOWS_32BIT" != "ON" ]; then
+if [ "$OS_NAME" == "windows" ]; then
+  if [ "${WINDOWS_32BIT-}" != "ON" ]; then
     WINDOWS_CMAKE_FLAGS="-Thost=x64 -A x64 -DCMAKE_C_FLAGS_RELWITHDEBINFO=\"/MT\""
   else
     WINDOWS_CMAKE_FLAGS="-DCMAKE_C_FLAGS_RELWITHDEBINFO=\"/MT\""
   fi
-  $CMAKE $CMAKE_FLAGS $WINDOWS_CMAKE_FLAGS -DCMAKE_PREFIX_PATH="`cygpath -w $DEPS_PREFIX`" -DCMAKE_INSTALL_PREFIX="`cygpath -w $DEPS_PREFIX`" "`cygpath -w $LIBMONGOCRYPT_DIR`"
+  run_cmake $CMAKE_FLAGS $WINDOWS_CMAKE_FLAGS -DCMAKE_PREFIX_PATH="$(native_path "$DEPS_PREFIX")" -DCMAKE_INSTALL_PREFIX="$(native_path "$DEPS_PREFIX")" "$(native_path "$LIBMONGOCRYPT_DIR")"
 else
-  $CMAKE $CMAKE_FLAGS -DCMAKE_PREFIX_PATH=$DEPS_PREFIX -DCMAKE_INSTALL_PREFIX=$DEPS_PREFIX -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12" $LIBMONGOCRYPT_DIR
+  run_cmake $CMAKE_FLAGS -DCMAKE_PREFIX_PATH=$DEPS_PREFIX -DCMAKE_INSTALL_PREFIX=$DEPS_PREFIX -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12" $LIBMONGOCRYPT_DIR
 fi
 
-$CMAKE --build . --target install --config RelWithDebInfo
+run_cmake --build . --target install --config RelWithDebInfo
 
 popd #./