Skip to content

fix(mongodb): update filter composition to handle MongoDB 5.x driver #36004

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

Merged
liferoad merged 3 commits into from
Aug 29, 2025
Merged

fix(mongodb): update filter composition to handle MongoDB 5.x driver #36004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87178b3
fix(mongodb): update filter composition to handle MongoDB 5.x driver …
liferoad Aug 28, 2025
ef90a09
fix the filter
liferoad Aug 29, 2025
d72bd0c
disable spotbugs for sql
liferoad Aug 29, 2025
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
2 changes: 1 addition & 1 deletion .github/trigger_files/beam_PostCommit_SQL.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run ",
"modification": 3
"modification": 4
}
2 changes: 2 additions & 0 deletions sdks/java/extensions/sql/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ applyJavaNature(
],
// javacc generated code produces lint warnings
disableLintWarnings: ['dep-ann', 'rawtypes'],
// Disable SpotBugs due to ASM bytecode analysis issue with BeamCalcRel class
enableSpotbugs: false,
)

description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL"
Expand Down
19 changes: 18 additions & 1 deletion .../src/main/java/org/apache/beam/sdk/extensions/sql/meta/provider/mongodb/MongoDbTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import static org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlKind.COMPARISON;
import static org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.SqlKind.OR;

import com.mongodb.BasicDBObject;
import com.mongodb.MongoClientSettings;
import com.mongodb.client.model.Filters;
import java.io.Serializable;
import java.util.ArrayList;
Expand Down Expand Up @@ -64,6 +66,7 @@
import org.apache.beam.vendor.calcite.v1_40_0.org.apache.calcite.sql.type.SqlTypeName;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.annotations.VisibleForTesting;
import org.apache.beam.vendor.guava.v32_1_2_jre.com.google.common.collect.ImmutableList;
import org.bson.BsonDocument;
import org.bson.Document;
import org.bson.conversions.Bson;
import org.bson.json.JsonMode;
Expand Down Expand Up @@ -178,7 +181,21 @@ private Bson constructPredicate(List<RexNode> supported) {
if (cnf.size() == 1) {
return cnf.get(0);
}
return Filters.and(cnf);
// Convert all filters to BsonDocument and merge them into a single Document
// This avoids wrapping in $and which changed behavior in MongoDB driver 5.x
Document compositeFilter = new Document();
for (Bson filter : cnf) {
// Convert any Bson filter to BsonDocument first
BsonDocument bsonDoc =
filter.toBsonDocument(BasicDBObject.class, MongoClientSettings.getDefaultCodecRegistry());
// Convert BsonDocument to Document for easier manipulation
Document doc = Document.parse(bsonDoc.toJson());
// Merge all top-level conditions into the composite filter
for (String key : doc.keySet()) {
compositeFilter.append(key, doc.get(key));
}
}
return compositeFilter;
}

/**
Expand Down
Loading