Merge branch 'mongodb:main' into main

Author: nhachicha

.evergreen/.evg.yml

@@ -287,7 +287,7 @@ functions:
 
           AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" SAFE_FOR_MULTI_MONGOS="${SAFE_FOR_MULTI_MONGOS}" TOPOLOGY="${TOPOLOGY}" \
           COMPRESSOR="${COMPRESSOR}" JAVA_VERSION="${JAVA_VERSION}" REQUIRE_API_VERSION=${REQUIRE_API_VERSION} \
-          .evergreen/run-tests.sh
+          TESTS="${TESTS}" .evergreen/run-tests.sh
 
   "run load-balancer tests":
     - command: shell.exec
@@ -335,7 +335,7 @@ functions:
         AUTH="${AUTH}" SSL="${SSL}" MONGODB_URI="${MONGODB_URI}" TOPOLOGY="${TOPOLOGY}" COMPRESSOR="${COMPRESSOR}" \
         JAVA_VERSION="${JAVA_VERSION}" \
         AZUREKMS_KEY_VAULT_ENDPOINT=${testazurekms_keyvaultendpoint} AZUREKMS_KEY_NAME=${testazurekms_keyname} \
-        SLOW_TESTS_ONLY=true .evergreen/run-tests.sh
+        TESTS="testSlowOnly" .evergreen/run-tests.sh
 
   "run scala tests":
     - command: shell.exec
@@ -861,11 +861,42 @@ tasks:
           vars:
             file: ".evergreen/static-checks.sh"
 
-    - name: "test"
+    - name: "test-bson-and-crypt"
+      commands:
+        - func: "run tests"
+          vars:
+            TESTS: 'bson:test bson-record-codec:test mongodb-crypt:test'
+
+    - name: "test-core"
+      commands:
+        - func: "bootstrap mongo-orchestration"
+        - func: "run tests"
+          vars:
+            TESTS: 'driver-core:test'
+
+    - name: "test-legacy"
+      commands:
+        - func: "start-kms-kmip-server"
+        - func: "bootstrap mongo-orchestration"
+        - func: "run tests"
+          vars:
+            TESTS: 'driver-legacy:test'
+
+    - name: "test-sync"
+      commands:
+        - func: "start-kms-kmip-server"
+        - func: "bootstrap mongo-orchestration"
+        - func: "run tests"
+          vars:
+            TESTS: 'driver-sync:test'
+
+    - name: "test-reactive"
       commands:
         - func: "start-kms-kmip-server"
         - func: "bootstrap mongo-orchestration"
         - func: "run tests"
+          vars:
+            TESTS: 'driver-reactive-streams:test'
 
     - name: load-balancer-test
       commands:
@@ -1826,11 +1857,11 @@ axes:
       - id: "2.12"
         display_name: "Scala 2.12"
         variables:
-          SCALA: "2.12.15"
+          SCALA: "2.12.20"
       - id: "2.13"
         display_name: "Scala 2.13"
         variables:
-          SCALA: "2.13.6"
+          SCALA: "2.13.15"
 
   # Choice of MongoDB storage engine
   - id: storage-engine
@@ -2105,14 +2136,20 @@ buildvariants:
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
   tags: ["tests-variant"]
   tasks:
-     - name: "test"
+     - name: "test-sync"
+     - name: "test-reactive"
+     - name: "test-core"
+     - name: "test-legacy"
 
 - matrix_name: "tests-snappy-compression"
   matrix_spec: { compressor : "snappy", auth: "noauth", ssl: "nossl", jdk: "jdk8", version: "*", topology: "standalone", os: "linux" }
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
   tags: ["tests-variant"]
   tasks:
-     - name: "test"
+    - name: "test-sync"
+    - name: "test-reactive"
+    - name: "test-core"
+    - name: "test-legacy"
 
 - matrix_name: "tests-zstd-compression"
   matrix_spec: { compressor : "zstd", auth: "noauth", ssl: "nossl", jdk: "jdk8",
@@ -2121,15 +2158,28 @@ buildvariants:
   display_name: "${version} ${compressor} ${topology} ${auth} ${ssl} ${jdk} ${os} "
   tags: ["tests-variant"]
   tasks:
-    - name: "test"
+    - name: "test-sync"
+    - name: "test-reactive"
+    - name: "test-core"
+    - name: "test-legacy"
+
+- matrix_name: "tests-unit"
+  matrix_spec: { jdk: [ "jdk8", "jdk11", "jdk17", "jdk21"], os: "linux" }
+  display_name: "${jdk} ${os} Unit"
+  tags: ["tests-variant"]
+  tasks:
+    - name: "test-bson-and-crypt"
 
 - matrix_name: "tests-jdk8-unsecure"
   matrix_spec: { auth: "noauth", ssl: "nossl", jdk: "jdk8", version: ["4.0", "4.2", "4.4", "5.0", "6.0", "7.0", "8.0", "latest"],
                  topology: "*", os: "linux" }
   display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
   tags: ["tests-variant"]
   tasks:
-    - name: "test"
+    - name: "test-sync"
+    - name: "test-reactive"
+    - name: "test-core"
+    - name: "test-legacy"
 
 - matrix_name: "tests-jdk-secure"
   matrix_spec: { auth: "auth", ssl: "ssl", jdk: [ "jdk8", "jdk17", "jdk21"],
@@ -2138,22 +2188,31 @@ buildvariants:
   display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
   tags: ["tests-variant"]
   tasks:
-     - name: "test"
+    - name: "test-sync"
+    - name: "test-reactive"
+    - name: "test-core"
+    - name: "test-legacy"
 
 - matrix_name: "tests-jdk-secure-jdk11"
   matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk11"], version: ["7.0"], topology: ["replicaset"], os: "linux" }
   display_name: "${version} ${topology} ${auth} ${ssl} ${jdk} ${os} "
   tags: ["tests-variant"]
   tasks:
-    - name: "test"
+    - name: "test-sync"
+    - name: "test-reactive"
+    - name: "test-core"
+    - name: "test-legacy"
 
 - matrix_name: "tests-require-api-version"
   matrix_spec: { api-version: "required", auth: "auth", ssl: "nossl", jdk: ["jdk21"], version: ["5.0", "6.0", "7.0", "8.0", "latest"],
                  topology: "standalone", os: "linux" }
   display_name: "${version} ${topology} ${api-version} "
   tags: ["tests-variant"]
   tasks:
-    - name: "test"
+    - name: "test-sync"
+    - name: "test-reactive"
+    - name: "test-core"
+    - name: "test-legacy"
 
 - matrix_name: "tests-load-balancer-secure"
   matrix_spec: { auth: "auth", ssl: "ssl", jdk: ["jdk21"], version: ["5.0", "6.0", "7.0", "8.0", "latest"], topology: "sharded-cluster",

.evergreen/run-atlas-search-tests.sh

@@ -16,4 +16,4 @@ echo "Running Atlas Search tests"
 ./gradlew --stacktrace --info \
     -Dorg.mongodb.test.atlas.search=true \
     -Dorg.mongodb.test.uri=${MONGODB_URI} \
-    driver-core:test --tests AggregatesSearchIntegrationTest
+    driver-core:test --tests AggregatesSearchIntegrationTest --tests AggregatesVectorSearchIntegrationTest

.evergreen/run-tests.sh

@@ -35,6 +35,7 @@ MONGODB_URI=${MONGODB_URI:-}
 TOPOLOGY=${TOPOLOGY:-server}
 COMPRESSOR=${COMPRESSOR:-}
 STREAM_TYPE=${STREAM_TYPE:-nio2}
+TESTS=${TESTS:-test}
 SLOW_TESTS_ONLY=${SLOW_TESTS_ONLY:-false}
 
 export ASYNC_TYPE="-Dorg.mongodb.test.async.type=${STREAM_TYPE}"
@@ -136,15 +137,8 @@ echo "Running $AUTH tests over $SSL for $TOPOLOGY and connecting to $MONGODB_URI
 echo "Running tests with Java ${JAVA_VERSION}"
 ./gradlew -version
 
-if [ "$SLOW_TESTS_ONLY" == "true" ]; then
-    ./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.uri=${MONGODB_URI} \
-              ${MULTI_MONGOS_URI_SYSTEM_PROPERTY} ${GRADLE_EXTRA_VARS} ${ASYNC_TYPE} \
-              ${JAVA_SYSPROP_NETTY_SSL_PROVIDER} \
-              --stacktrace --info testSlowOnly
-else
-    ./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.uri=${MONGODB_URI} \
-              ${MULTI_MONGOS_URI_SYSTEM_PROPERTY} ${API_VERSION} ${GRADLE_EXTRA_VARS} ${ASYNC_TYPE} \
-              ${JAVA_SYSPROP_NETTY_SSL_PROVIDER} \
-              -Dorg.mongodb.test.fle.on.demand.credential.test.failure.enabled=true \
-              --stacktrace --info --continue test
-fi
+./gradlew -PjavaVersion=${JAVA_VERSION} -Dorg.mongodb.test.uri=${MONGODB_URI} \
+          ${MULTI_MONGOS_URI_SYSTEM_PROPERTY} ${API_VERSION} ${GRADLE_EXTRA_VARS} ${ASYNC_TYPE} \
+          ${JAVA_SYSPROP_NETTY_SSL_PROVIDER} \
+          -Dorg.mongodb.test.fle.on.demand.credential.test.failure.enabled=true \
+          --stacktrace --info --continue ${TESTS}

bson-kotlinx/src/main/kotlin/org/bson/codecs/kotlinx/DateTimeSerializers.kt

@@ -54,11 +54,16 @@ import org.bson.codecs.kotlinx.utils.SerializationModuleUtils.isClassAvailable
 public val dateTimeSerializersModule: SerializersModule by lazy {
     var module = SerializersModule {}
     if (isClassAvailable("kotlinx.datetime.Instant")) {
-        module +=
-            InstantAsBsonDateTime.serializersModule +
-                LocalDateAsBsonDateTime.serializersModule +
-                LocalDateTimeAsBsonDateTime.serializersModule +
-                LocalTimeAsBsonDateTime.serializersModule
+        module += InstantAsBsonDateTime.serializersModule
+    }
+    if (isClassAvailable("kotlinx.datetime.LocalDate")) {
+        module += LocalDateAsBsonDateTime.serializersModule
+    }
+    if (isClassAvailable("kotlinx.datetime.LocalDateTime")) {
+        module += LocalDateTimeAsBsonDateTime.serializersModule
+    }
+    if (isClassAvailable("kotlinx.datetime.LocalTime")) {
+        module += LocalTimeAsBsonDateTime.serializersModule
     }
     module
 }

bson-scala/src/main/scala/org/mongodb/scala/bson/codecs/macrocodecs/MacroCodec.scala

@@ -22,6 +22,7 @@ import scala.collection.mutable
 import org.bson._
 import org.bson.codecs.configuration.{ CodecRegistries, CodecRegistry }
 import org.bson.codecs.{ Codec, DecoderContext, Encoder, EncoderContext }
+import scala.collection.immutable.Vector
 
 import org.mongodb.scala.bson.BsonNull
 

bson-scala/src/test/scala/org/mongodb/scala/bson/codecs/MacrosSpec.scala

@@ -30,6 +30,7 @@ import org.mongodb.scala.bson.annotations.{ BsonIgnore, BsonProperty }
 import org.mongodb.scala.bson.codecs.Macros.{ createCodecProvider, createCodecProviderIgnoreNone }
 import org.mongodb.scala.bson.codecs.Registry.DEFAULT_CODEC_REGISTRY
 import org.mongodb.scala.bson.collection.immutable.Document
+import scala.collection.immutable.Vector
 
 import scala.collection.JavaConverters._
 import scala.reflect.ClassTag

bson/src/main/org/bson/BsonBinary.java

@@ -18,10 +18,13 @@
 
 import org.bson.assertions.Assertions;
 import org.bson.internal.UuidHelper;
+import org.bson.internal.vector.VectorHelper;
 
 import java.util.Arrays;
 import java.util.UUID;
 
+import static org.bson.internal.vector.VectorHelper.encodeVectorToBinary;
+
 /**
  * A representation of the BSON Binary type.  Note that for performance reasons instances of this class are not immutable,
  * so care should be taken to only modify the underlying byte array if you know what you're doing, or else make a defensive copy.
@@ -89,6 +92,20 @@ public BsonBinary(final UUID uuid) {
         this(uuid, UuidRepresentation.STANDARD);
     }
 
+    /**
+     * Constructs a {@linkplain BsonBinarySubType#VECTOR subtype 9} {@link BsonBinary} from the given {@link Vector}.
+     *
+     * @param vector the {@link Vector}
+     * @since 5.3
+     */
+    public BsonBinary(final Vector vector) {
+        if (vector == null) {
+            throw new IllegalArgumentException("Vector must not be null");
+        }
+        this.data = encodeVectorToBinary(vector);
+        type = BsonBinarySubType.VECTOR.getValue();
+    }
+
     /**
      * Construct a new instance from the given UUID and UuidRepresentation
      *
@@ -127,6 +144,21 @@ public UUID asUuid() {
         return UuidHelper.decodeBinaryToUuid(this.data.clone(), this.type, UuidRepresentation.STANDARD);
     }
 
+    /**
+     * Returns the binary as a {@link Vector}. The {@linkplain #getType() subtype} must be {@linkplain BsonBinarySubType#VECTOR 9}.
+     *
+     * @return the vector
+     * @throws BsonInvalidOperationException if the binary subtype is not {@link BsonBinarySubType#VECTOR}.
+     * @since 5.3
+     */
+    public Vector asVector() {
+        if (type != BsonBinarySubType.VECTOR.getValue()) {
+            throw new BsonInvalidOperationException("type must be a Vector subtype.");
+        }
+
+        return VectorHelper.decodeBinaryToVector(this.data);
+    }
+
     /**
      * Returns the binary as a UUID.
      *

bson/src/main/org/bson/BsonBinarySubType.java

@@ -17,7 +17,7 @@
 package org.bson;
 
 /**
- * The Binary subtype
+ * The Binary subtype.
  *
  * @since 3.0
  */
@@ -60,7 +60,7 @@ public enum BsonBinarySubType {
     ENCRYPTED((byte) 0x06),
 
     /**
-     * Columnar data
+     * Columnar data.
      *
      * @since 4.4
      */
@@ -73,6 +73,15 @@ public enum BsonBinarySubType {
      */
     SENSITIVE((byte) 0x08),
 
+    /**
+     * Vector data.
+     *
+     * @mongodb.server.release 6.0
+     * @since 5.3
+     * @see Vector
+     */
+    VECTOR((byte) 0x09),
+
     /**
      * User defined binary data.
      */
@@ -81,10 +90,10 @@ public enum BsonBinarySubType {
     private final byte value;
 
     /**
-     * Returns true if the given value is a UUID subtype
+     * Returns true if the given value is a UUID subtype.
      *
-     * @param value the subtype value as a byte
-     * @return true if value is a UUID subtype
+     * @param value the subtype value as a byte.
+     * @return true if value is a UUID subtype.
      * @since 3.4
      */
     public static boolean isUuid(final byte value) {