Fix Issue #202: Add $bitAnd operator expression compatibility tests

.github/workflows/pr-tests.yml

@@ -61,6 +61,17 @@ jobs:
             --json-report --json-report-file=${{ github.workspace }}/.test-results/${{ matrix.target.name }}-report.json \
             --junitxml=${{ github.workspace }}/.test-results/${{ matrix.target.name }}-results.xml
 
+      - name: Dump container logs
+        if: always()
+        run: |
+          # One file per service in the profile
+          mkdir -p "${{ github.workspace }}/.test-results/container-logs"
+          for svc in $(docker compose -f dev/compose.yaml --profile ${{ matrix.target.profile }} config --services); do
+            docker compose -f dev/compose.yaml --profile ${{ matrix.target.profile }} \
+              logs --no-color --timestamps "$svc" \
+              > "${{ github.workspace }}/.test-results/container-logs/${svc}.log" 2>&1 || true
+          done
+
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v7

dev/compose.yaml

@@ -27,7 +27,7 @@
 #     query: <optional connection-string query string, without leading '?'>
 #
 # A service with no `x-test-target` is not a test target and is ignored by the
-# registry.
+# registry (e.g. the mongot sidecar, which is reached only through its mongod).
 #
 # Memory: each mongod caps its WiredTiger cache (--wiredTigerCacheSizeGB). By
 # default a mongod sizes its cache to ~50% of the host/VM RAM; with several
@@ -60,7 +60,26 @@ services:
   mongo-replset:
     image: mongo:8.2.4
     profiles: ["mongo-replset", "all"]
-    command: ["--replSet", "rs0", "--bind_ip_all", "--wiredTigerCacheSizeGB", "1.5"]
+    command:
+      - "--replSet"
+      - "rs0"
+      - "--bind_ip_all"
+      - "--wiredTigerCacheSizeGB"
+      - "1.5"
+      # Point at the mongot search sidecar so this replica set also serves the
+      # search surfaces. mongot is transparent to all other behavior, so the
+      # set behaves identically to a plain replica set apart from gaining
+      # search; it is one target, not two.
+      - "--setParameter"
+      - "mongotHost=mongot:27028"
+      - "--setParameter"
+      - "searchIndexManagementHostAndPort=mongot:27028"
+      - "--setParameter"
+      - "useGrpcForSearch=true"
+      - "--setParameter"
+      - "skipAuthenticationToMongot=true"
+      - "--setParameter"
+      - "skipAuthenticationToSearchIndexManagementServer=true"
     ports:
       - "27018:27017"
     healthcheck:
@@ -71,3 +90,31 @@ services:
     x-test-target:
       engine: mongodb
       query: directConnection=true
+
+  # mongot: the search sidecar for the mongo-replset target. Not a test target
+  # on its own; the suite reaches it only through mongo-replset. mongot is
+  # MongoDB Search Community Edition (SSPL, same license as the server). It
+  # replicates from the replica set as an authenticated sync source and reads
+  # its password from a file, so the entrypoint writes that file (a fixed
+  # local-dev secret, matched by the searchCoordinator user the harness creates
+  # on the replica set) with owner-only permissions before launching. It retries
+  # the connection until that user exists.
+  mongot:
+    image: mongodb/mongodb-community-search:1.70.1
+    profiles: ["mongo-replset", "all"]
+    entrypoint:
+      - "sh"
+      - "-c"
+      - >
+        umask 077 &&
+        mkdir -p /mongot-secrets &&
+        printf '%s' "$$MONGOT_SYNC_PASSWORD" > /mongot-secrets/passwordFile &&
+        exec /mongot-community/mongot --config /mongot-config/mongot.yml
+    environment:
+      # Fixed local-dev secret shared with the searchCoordinator user the
+      # harness provisions on mongo-replset. Not a real credential.
+      MONGOT_SYNC_PASSWORD: "searchSyncPassword"
+      # Cap mongot's JVM heap. Unset, the JVM sizes its max heap to ~25% of host RAM.
+      JAVA_TOOL_OPTIONS: "-Xmx1g"
+    volumes:
+      - ./mongot.yml:/mongot-config/mongot.yml:ro

dev/mongot.yml

@@ -0,0 +1,32 @@
+# mongot configuration for the mongo-replset target (dev/compose.yaml service
+# "mongot"). mongot is MongoDB Search Community Edition (SSPL), the same license
+# as the server. It runs alongside the replica set's mongod and serves the
+# search and vector search surfaces.
+#
+# mongot replicates from the mongod replica set as a sync source. It requires an
+# authenticated connection (it has no unauthenticated mode), so it logs in as a
+# dedicated user holding the searchCoordinator role. That user and its password
+# file are provisioned by the target's startup (see dev/compose.yaml).
+syncSource:
+  replicaSet:
+    hostAndPort: "mongo-replset:27017"
+    scramAuth:
+      username: "searchSyncUser"
+      authSource: "admin"
+      passwordFile: "/mongot-secrets/passwordFile"
+      tls:
+        enabled: false
+storage:
+  dataPath: "/var/lib/mongot"
+server:
+  grpc:
+    # mongod reaches mongot here (see mongotHost / searchIndexManagementHostAndPort
+    # on the mongo-replset service). Bound on all interfaces so the mongod
+    # container can connect over the compose network.
+    address: "0.0.0.0:27028"
+    tls:
+      mode: "disabled"
+healthCheck:
+  address: "0.0.0.0:8080"
+logging:
+  verbosity: INFO

documentdb_tests/compatibility/tests/core/collation/command_level/operations/test_operations_bulk_write.py

@@ -1,4 +1,4 @@
-"""Tests for collation in bulkWrite operations."""
+"""Tests for collation in the bulkWrite command."""
 
 from __future__ import annotations
 
@@ -8,13 +8,14 @@
     CommandContext,
     CommandTestCase,
 )
-from documentdb_tests.framework.assertions import assertResult
-from documentdb_tests.framework.executor import execute_command
+from documentdb_tests.framework.assertions import assertSuccessPartial
+from documentdb_tests.framework.executor import execute_admin_command
 from documentdb_tests.framework.parametrize import pytest_params
 from documentdb_tests.framework.target_collection import CustomCollection
 
 # Property [BulkWrite Update Collation]: individual update operations within a
-# bulkWrite can specify collation, affecting filter matching independently.
+# bulkWrite command can specify collation, affecting filter matching
+# independently of other operations in the same command.
 COLLATION_BULK_UPDATE_TESTS: list[CommandTestCase] = [
     CommandTestCase(
         "bulk_update_case_insensitive",
@@ -23,21 +24,24 @@
             {"_id": 2, "x": "banana", "v": 1},
         ],
         command=lambda ctx: {
-            "update": ctx.collection,
-            "updates": [
+            "bulkWrite": 1,
+            "ops": [
                 {
-                    "q": {"x": "apple"},
-                    "u": {"$set": {"v": 2}},
+                    "update": 0,
+                    "filter": {"x": "apple"},
+                    "updateMods": {"$set": {"v": 2}},
                     "collation": {"locale": "en", "strength": 2},
                 },
                 {
-                    "q": {"x": "BANANA"},
-                    "u": {"$set": {"v": 3}},
+                    "update": 0,
+                    "filter": {"x": "BANANA"},
+                    "updateMods": {"$set": {"v": 3}},
                     "collation": {"locale": "en", "strength": 2},
                 },
             ],
+            "nsInfo": [{"ns": ctx.namespace}],
         },
-        expected={"ok": 1.0, "n": 2, "nModified": 2},
+        expected={"ok": 1.0, "nMatched": 2, "nModified": 2},
         msg="bulkWrite updates should each use their own collation",
     ),
     CommandTestCase(
@@ -47,26 +51,30 @@
             {"_id": 2, "x": "banana", "v": 1},
         ],
         command=lambda ctx: {
-            "update": ctx.collection,
-            "updates": [
+            "bulkWrite": 1,
+            "ops": [
                 {
-                    "q": {"x": "apple"},
-                    "u": {"$set": {"v": 2}},
+                    "update": 0,
+                    "filter": {"x": "apple"},
+                    "updateMods": {"$set": {"v": 2}},
                     "collation": {"locale": "en", "strength": 2},
                 },
                 {
-                    "q": {"x": "BANANA"},
-                    "u": {"$set": {"v": 3}},
+                    "update": 0,
+                    "filter": {"x": "BANANA"},
+                    "updateMods": {"$set": {"v": 3}},
                 },
             ],
+            "nsInfo": [{"ns": ctx.namespace}],
         },
-        expected={"ok": 1.0, "n": 1, "nModified": 1},
+        expected={"ok": 1.0, "nMatched": 1, "nModified": 1},
         msg="bulkWrite with mixed collation: only collated op should match case-insensitively",
     ),
 ]
 
 # Property [BulkWrite Delete Collation]: individual delete operations within a
-# bulkWrite can specify collation, affecting filter matching independently.
+# bulkWrite command can specify collation, affecting filter matching
+# independently of other operations in the same command.
 COLLATION_BULK_DELETE_TESTS: list[CommandTestCase] = [
     CommandTestCase(
         "bulk_delete_case_insensitive",
@@ -76,16 +84,18 @@
             {"_id": 3, "x": "cherry"},
         ],
         command=lambda ctx: {
-            "delete": ctx.collection,
-            "deletes": [
+            "bulkWrite": 1,
+            "ops": [
                 {
-                    "q": {"x": "apple"},
-                    "limit": 0,
+                    "delete": 0,
+                    "filter": {"x": "apple"},
+                    "multi": True,
                     "collation": {"locale": "en", "strength": 2},
                 },
             ],
+            "nsInfo": [{"ns": ctx.namespace}],
         },
-        expected={"ok": 1.0, "n": 1},
+        expected={"ok": 1.0, "nDeleted": 1},
         msg="bulkWrite delete with collation should match case-insensitively",
     ),
     CommandTestCase(
@@ -96,15 +106,17 @@
             {"_id": 3, "x": "banana"},
         ],
         command=lambda ctx: {
-            "delete": ctx.collection,
-            "deletes": [
+            "bulkWrite": 1,
+            "ops": [
                 {
-                    "q": {"x": "apple"},
-                    "limit": 0,
+                    "delete": 0,
+                    "filter": {"x": "apple"},
+                    "multi": True,
                 },
             ],
+            "nsInfo": [{"ns": ctx.namespace}],
         },
-        expected={"ok": 1.0, "n": 1},
+        expected={"ok": 1.0, "nDeleted": 1},
         msg="bulkWrite delete without collation should use binary comparison",
     ),
 ]
@@ -120,15 +132,17 @@
             {"_id": 2, "x": "banana", "v": 1},
         ],
         command=lambda ctx: {
-            "update": ctx.collection,
-            "updates": [
+            "bulkWrite": 1,
+            "ops": [
                 {
-                    "q": {"x": "apple"},
-                    "u": {"$set": {"v": 2}},
+                    "update": 0,
+                    "filter": {"x": "apple"},
+                    "updateMods": {"$set": {"v": 2}},
                 },
             ],
+            "nsInfo": [{"ns": ctx.namespace}],
         },
-        expected={"ok": 1.0, "n": 1, "nModified": 1},
+        expected={"ok": 1.0, "nMatched": 1, "nModified": 1},
         msg="bulkWrite update should inherit collection default collation",
     ),
     CommandTestCase(
@@ -139,15 +153,17 @@
             {"_id": 2, "x": "banana"},
         ],
         command=lambda ctx: {
-            "delete": ctx.collection,
-            "deletes": [
+            "bulkWrite": 1,
+            "ops": [
                 {
-                    "q": {"x": "apple"},
-                    "limit": 0,
+                    "delete": 0,
+                    "filter": {"x": "apple"},
+                    "multi": True,
                 },
             ],
+            "nsInfo": [{"ns": ctx.namespace}],
         },
-        expected={"ok": 1.0, "n": 1},
+        expected={"ok": 1.0, "nDeleted": 1},
         msg="bulkWrite delete should inherit collection default collation",
     ),
 ]
@@ -161,14 +177,8 @@
 
 @pytest.mark.parametrize("test", pytest_params(COLLATION_BULK_WRITE_TESTS))
 def test_collation_bulk_write(database_client, collection, test):
-    """Test collation behavior in bulkWrite operations."""
+    """Test collation behavior in the bulkWrite command."""
     collection = test.prepare(database_client, collection)
     ctx = CommandContext.from_collection(collection)
-    result = execute_command(collection, test.build_command(ctx))
-    assertResult(
-        result,
-        expected=test.build_expected(ctx),
-        error_code=test.error_code,
-        msg=test.msg,
-        raw_res=True,
-    )
+    result = execute_admin_command(collection, test.build_command(ctx))
+    assertSuccessPartial(result, test.build_expected(ctx), msg=test.msg)