Fix PgVectorStore doDelete function as batch

Signed-off-by: CChuYong <[email protected]>

Author: CChuYong

vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/PgVectorStore.java

@@ -319,12 +319,21 @@ private Object convertIdToPgType(String id) {
 
 	@Override
 	public void doDelete(List<String> idList) {
-		int updateCount = 0;
-		for (String id : idList) {
-			int count = this.jdbcTemplate.update("DELETE FROM " + getFullyQualifiedTableName() + " WHERE id = ?",
-					UUID.fromString(id));
-			updateCount = updateCount + count;
-		}
+		String sql = "DELETE FROM " + getFullyQualifiedTableName() + " WHERE id = ?";
+
+		this.jdbcTemplate.batchUpdate(sql, new BatchPreparedStatementSetter() {
+
+			@Override
+			public void setValues(PreparedStatement ps, int i) throws SQLException {
+				var id = idList.get(i);
+				StatementCreatorUtils.setParameterValue(ps, 1, SqlTypeValue.TYPE_UNKNOWN, convertIdToPgType(id));
+			}
+
+			@Override
+			public int getBatchSize() {
+				return idList.size();
+			}
+		});
 	}
 
 	@Override

vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorStoreIT.java

@@ -75,6 +75,7 @@
  * @author Christian Tzolov
  * @author Thomas Vitale
  * @author Jihoon Kim
+ * @author CChuYong
  */
 @Testcontainers
 @EnabledIfEnvironmentVariable(named = "OPENAI_API_KEY", matches = ".+")
@@ -232,6 +233,48 @@ public void testToPgTypeWithNonUuidIdType() {
 			});
 	}
 
+	@Test
+	public void testBulkOperationWithUuidIdType() {
+		this.contextRunner.withPropertyValues("test.spring.ai.vectorstore.pgvector.distanceType=" + "COSINE_DISTANCE")
+			.run(context -> {
+
+				VectorStore vectorStore = context.getBean(VectorStore.class);
+
+				List<Document> documents = List.of(
+						new Document(new RandomIdGenerator().generateId(), "TEXT", new HashMap<>()),
+						new Document(new RandomIdGenerator().generateId(), "TEXT", new HashMap<>()),
+						new Document(new RandomIdGenerator().generateId(), "TEXT", new HashMap<>()));
+				vectorStore.add(documents);
+
+				List<String> idList = documents.stream().map(Document::getId).toList();
+				vectorStore.delete(idList);
+
+				dropTable(context);
+			});
+	}
+
+	@Test
+	public void testBulkOperationWithNonUuidIdType() {
+		this.contextRunner.withPropertyValues("test.spring.ai.vectorstore.pgvector.distanceType=" + "COSINE_DISTANCE")
+			.withPropertyValues("test.spring.ai.vectorstore.pgvector.initializeSchema=" + false)
+			.withPropertyValues("test.spring.ai.vectorstore.pgvector.idType=" + "TEXT")
+			.run(context -> {
+
+				VectorStore vectorStore = context.getBean(VectorStore.class);
+				initSchema(context);
+
+				List<Document> documents = List.of(new Document("NON_UUID_1", "TEXT", new HashMap<>()),
+						new Document("NON_UUID_2", "TEXT", new HashMap<>()),
+						new Document("NON_UUID_3", "TEXT", new HashMap<>()));
+				vectorStore.add(documents);
+
+				List<String> idList = documents.stream().map(Document::getId).toList();
+				vectorStore.delete(idList);
+
+				dropTable(context);
+			});
+	}
+
 	@ParameterizedTest(name = "Filter expression {0} should return {1} records ")
 	@MethodSource("provideFilters")
 	public void searchWithInFilter(String expression, Integer expectedRecords) {