Skip to content

Fix some JDBC SQL #4584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix some JDBC SQL #4584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions ...db-store/src/main/java/org/springframework/ai/vectorstore/mariadb/MariaDBVectorStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,11 @@ protected void doDelete(Filter.Expression filterExpression) {
try {
String nativeFilterExpression = this.filterExpressionConverter.convertExpression(filterExpression);

String sql = String.format("DELETE FROM %s WHERE %s", getFullyQualifiedTableName(), nativeFilterExpression);
String sql = "DELETE FROM ? WHERE ?";

logger.debug("Executing delete with filter: {}", sql);

this.jdbcTemplate.update(sql);
this.jdbcTemplate.update(sql, getFullyQualifiedTableName(), nativeFilterExpression);
}
catch (Exception e) {
logger.error("Failed to delete documents by filter: {}", e.getMessage(), e);
Expand All @@ -353,21 +353,19 @@ public List<Document> doSimilaritySearch(SearchRequest request) {
String jsonPathFilter = "";

if (StringUtils.hasText(nativeFilterExpression)) {
jsonPathFilter = "and " + nativeFilterExpression + " ";
jsonPathFilter = "and ? ";
}
String distanceType = this.distanceType.name().toLowerCase(Locale.ROOT);

double distance = 1 - request.getSimilarityThreshold();
final String sql = String.format(
"SELECT * FROM (select %s, %s, %s, vec_distance_%s(%s, ?) as distance "
+ "from %s) as t where distance < ? %sorder by distance asc LIMIT ?",
this.idFieldName, this.contentFieldName, this.metadataFieldName, distanceType, this.embeddingFieldName,
getFullyQualifiedTableName(), jsonPathFilter);
final String sql = "SELECT * FROM (select ?, ?, ?, vec_distance_?(?, ?) as distance "
+ "from ?) as t where distance < ? ?order by distance asc LIMIT ?";

logger.debug("SQL query: {}", sql);

return this.jdbcTemplate.query(sql, new DocumentRowMapper(this.objectMapper), embedding, distance,
request.getTopK());
return this.jdbcTemplate.query(sql, new DocumentRowMapper(this.objectMapper), this.idFieldName,
this.contentFieldName, this.metadataFieldName, distanceType, this.embeddingFieldName,
getFullyQualifiedTableName(), jsonPathFilter, embedding, distance, request.getTopK());
}

// ---------------------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions ...acle-store/src/main/java/org/springframework/ai/vectorstore/oracle/OracleVectorStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,11 @@ protected void doDelete(Filter.Expression filterExpression) {

try {
String jsonPath = this.filterExpressionConverter.convertExpression(filterExpression);
String sql = String.format("DELETE FROM %s WHERE JSON_EXISTS(metadata, '%s')", this.tableName, jsonPath);
String sql = "DELETE FROM ? WHERE JSON_EXISTS(metadata, '?')";

logger.debug("Executing delete with filter: {}", sql);
logger.debug("Executing delete with filter: {} with params: {} {}", sql, this.tableName, jsonPath);

int deletedCount = this.jdbcTemplate.update(sql);
int deletedCount = this.jdbcTemplate.update(sql, this.tableName, jsonPath);
logger.debug("Deleted {} documents matching filter expression", deletedCount);
}
catch (Exception e) {
Expand Down
5 changes: 2 additions & 3 deletions ...vector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/PgVectorStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,11 @@ public int getBatchSize() {
protected void doDelete(Filter.Expression filterExpression) {
String nativeFilterExpression = this.filterExpressionConverter.convertExpression(filterExpression);

String sql = "DELETE FROM " + getFullyQualifiedTableName() + " WHERE metadata::jsonb @@ '"
+ nativeFilterExpression + "'::jsonpath";
String sql = "DELETE FROM ? WHERE metadata::jsonb @@ '?'::jsonpath";

// Execute the delete
try {
this.jdbcTemplate.update(sql);
this.jdbcTemplate.update(sql, getFullyQualifiedTableName(), nativeFilterExpression);
}
catch (Exception e) {
throw new IllegalStateException("Failed to delete documents by filter", e);
Expand Down