diff --git a/agents/common/src/main/java/com/dbx/agent/AgentProtocol.java b/agents/common/src/main/java/com/dbx/agent/AgentProtocol.java index 0f5d2468f2..a68fd2278c 100644 --- a/agents/common/src/main/java/com/dbx/agent/AgentProtocol.java +++ b/agents/common/src/main/java/com/dbx/agent/AgentProtocol.java @@ -42,6 +42,7 @@ public final class AgentProtocol { public static final String MONGO_METHOD_SERVER_VERSION = "server_version"; public static final String MONGO_METHOD_INSERT_DOCUMENT = "insert_document"; public static final String MONGO_METHOD_UPDATE_DOCUMENT = "update_document"; + public static final String MONGO_METHOD_UPDATE_DOCUMENTS = "update_documents"; public static final String MONGO_METHOD_DELETE_DOCUMENT = "delete_document"; public static final String KV_METHOD_LIST_PREFIX = "kv_list_prefix"; @@ -117,6 +118,7 @@ public final class AgentProtocol { MONGO_METHOD_SERVER_VERSION, MONGO_METHOD_INSERT_DOCUMENT, MONGO_METHOD_UPDATE_DOCUMENT, + MONGO_METHOD_UPDATE_DOCUMENTS, MONGO_METHOD_DELETE_DOCUMENT )); diff --git a/agents/drivers/mongodb/src/main/java/com/dbx/agent/mongodb/MongoAgent.java b/agents/drivers/mongodb/src/main/java/com/dbx/agent/mongodb/MongoAgent.java index e8ae5da4a3..9c27ad7ea1 100644 --- a/agents/drivers/mongodb/src/main/java/com/dbx/agent/mongodb/MongoAgent.java +++ b/agents/drivers/mongodb/src/main/java/com/dbx/agent/mongodb/MongoAgent.java @@ -434,6 +434,22 @@ public final class MongoAgent { return Collections.singletonMap("modified_count", result.getModifiedCount()); } + private static Object updateDocuments(JsonObject params) { + MongoClient c = requireClient(); + String database = params.get("database").getAsString(); + String collection = params.get("collection").getAsString(); + String filterJson = params.get("filter_json").getAsString(); + String updateJson = params.get("update_json").getAsString(); + boolean many = params.get("many").getAsBoolean(); + + var col = c.getDatabase(database).getCollection(collection); + Document filter = documentForWrite(filterJson); + Document update = documentForWrite(updateJson); + requireBulkUpdateOperatorDocument(update); + var result = many ? col.updateMany(filter, update) : col.updateOne(filter, update); + return Collections.singletonMap("modified_count", result.getModifiedCount()); + } + static Document documentForWrite(String docJson) { Document doc = Document.parse(docJson); convertMongoShellDates(doc); @@ -458,6 +474,14 @@ public final class MongoAgent { return true; } + static void requireBulkUpdateOperatorDocument(Document doc) { + if (!isUpdateOperatorDocument(doc)) { + // updateOne/updateMany are shell-style bulk updates here; replacements stay on the + // single-document save path so a broad filter cannot replace many documents by accident. + throw new IllegalArgumentException("Bulk update requires update operators such as $set"); + } + } + private static Object deleteDocument(JsonObject params) { MongoClient c = requireClient(); String database = params.get("database").getAsString(); @@ -588,6 +612,7 @@ public final class MongoAgent { case AgentProtocol.MONGO_METHOD_SERVER_VERSION -> serverVersion(params); case AgentProtocol.MONGO_METHOD_INSERT_DOCUMENT -> insertDocument(params); case AgentProtocol.MONGO_METHOD_UPDATE_DOCUMENT -> updateDocument(params); + case AgentProtocol.MONGO_METHOD_UPDATE_DOCUMENTS -> updateDocuments(params); case AgentProtocol.MONGO_METHOD_DELETE_DOCUMENT -> deleteDocument(params); case AgentProtocol.METHOD_DISCONNECT, AgentProtocol.METHOD_SHUTDOWN -> { if (client != null) { diff --git a/agents/drivers/mongodb/src/test/java/com/dbx/agent/mongodb/MongoAgentTest.java b/agents/drivers/mongodb/src/test/java/com/dbx/agent/mongodb/MongoAgentTest.java index f5e7074ca9..fceb155bbe 100644 --- a/agents/drivers/mongodb/src/test/java/com/dbx/agent/mongodb/MongoAgentTest.java +++ b/agents/drivers/mongodb/src/test/java/com/dbx/agent/mongodb/MongoAgentTest.java @@ -135,6 +135,20 @@ class MongoAgentTest { assertFalse(json.getAsJsonObject("error").get("message").getAsString().contains("Unknown method")); } + @Test + void updateDocumentsMethodIsRecognizedOverJsonRpc() { + String response = MongoAgent.handleRequest( + "{\"jsonrpc\":\"2.0\",\"id\":10,\"method\":\"update_documents\"," + + "\"params\":{\"database\":\"app\",\"collection\":\"orders\",\"filter_json\":\"{}\"," + + "\"update_json\":\"{\\\"$set\\\":{\\\"data\\\":null}}\",\"many\":true}}"); + + JsonObject json = JsonParser.parseString(response).getAsJsonObject(); + assertEquals(10, json.get("id").getAsInt()); + assertEquals("Not connected", json.getAsJsonObject("error").get("message").getAsString()); + assertFalse(json.getAsJsonObject("error").get("message").getAsString().contains("Unknown method")); + assertTrue(AgentProtocol.MONGO_LEGACY_METHODS.contains(AgentProtocol.MONGO_METHOD_UPDATE_DOCUMENTS)); + } + @Test void extractsServerVersionFromBuildInfo() { assertEquals("4.4.29", MongoAgent.serverVersionFromBuildInfo(new Document("version", "4.4.29"))); @@ -366,6 +380,17 @@ class MongoAgentTest { assertEquals(1_755_138_343_718L, ((Date) set.get("CreateDate")).getTime()); } + @Test + void bulkUpdateRequiresOperatorDocument() { + Document update = MongoAgent.documentForWrite("{\"$set\":{\"data\":null}}"); + MongoAgent.requireBulkUpdateOperatorDocument(update); + + assertThrows( + IllegalArgumentException.class, + () -> MongoAgent.requireBulkUpdateOperatorDocument(MongoAgent.documentForWrite("{\"data\":null}")) + ); + } + // ─── helpers ─── private static JsonObject minimalConnection() { diff --git a/crates/dbx-core/src/db/agent_driver.rs b/crates/dbx-core/src/db/agent_driver.rs index 6dd3333633..5bfb3205ce 100644 --- a/crates/dbx-core/src/db/agent_driver.rs +++ b/crates/dbx-core/src/db/agent_driver.rs @@ -246,17 +246,19 @@ pub enum MongoAgentMethod { ServerVersion, InsertDocument, UpdateDocument, + UpdateDocuments, DeleteDocument, } impl MongoAgentMethod { - pub const ALL: [Self; 7] = [ + pub const ALL: [Self; 8] = [ Self::ListDatabases, Self::ListCollections, Self::FindDocuments, Self::ServerVersion, Self::InsertDocument, Self::UpdateDocument, + Self::UpdateDocuments, Self::DeleteDocument, ]; @@ -268,6 +270,7 @@ impl MongoAgentMethod { Self::ServerVersion => "server_version", Self::InsertDocument => "insert_document", Self::UpdateDocument => "update_document", + Self::UpdateDocuments => "update_documents", Self::DeleteDocument => "delete_document", } } @@ -945,6 +948,13 @@ impl AgentDriverClient { self.call_mongo_method(MongoAgentMethod::UpdateDocument, params).await } + pub async fn mongo_update_documents( + &mut self, + params: Value, + ) -> Result { + self.call_mongo_method(MongoAgentMethod::UpdateDocuments, params).await + } + pub async fn mongo_delete_document( &mut self, params: Value, diff --git a/crates/dbx-core/src/mongo_ops.rs b/crates/dbx-core/src/mongo_ops.rs index 615dd4322f..01e8c6a5e4 100644 --- a/crates/dbx-core/src/mongo_ops.rs +++ b/crates/dbx-core/src/mongo_ops.rs @@ -187,7 +187,19 @@ pub async fn mongo_update_documents_core( PoolKind::MongoDb(client) => { mongo_driver::update_documents(client, database, collection, filter_json, update_json, many).await } - PoolKind::Agent(_) => Err("MongoDB legacy agent does not support bulk updateOne/updateMany writes".to_string()), + PoolKind::Agent(client) => { + let mut client = client.lock().await; + let result: serde_json::Value = client + .mongo_update_documents(serde_json::json!({ + "database": database, + "collection": collection, + "filter_json": filter_json, + "update_json": update_json, + "many": many, + })) + .await?; + Ok(result.get("modified_count").and_then(|v| v.as_u64()).unwrap_or(0)) + } _ => Err("Not a MongoDB connection".to_string()), } }