这是indexloc提供的服务，不要输入任何密码
Skip to content

use concise correlated subquery syntax for relations with single column mapping #65

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
merged 3 commits into from
May 1, 2024
Merged

use concise correlated subquery syntax for relations with single column mapping #65

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
1e56a1e
use concise correlated subquery syntax for relations with single colu…
hallettj Apr 29, 2024
4997cec
update changelog
hallettj Apr 29, 2024
d20c068
Merge branch 'main' into jesse/relation-optimization
hallettj Apr 29, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ This changelog documents the changes between release versions.
## [Unreleased]
- Enables logging events from the MongoDB driver by setting the `RUST_LOG` variable ([#67](https://github.com/hasura/ndc-mongodb/pull/67))
- To log all events set `RUST_LOG=mongodb::command=debug,mongodb::connection=debug,mongodb::server_selection=debug,mongodb::topology=debug`
- Relations with a single column mapping now use concise correlated subquery syntax in `$lookup` stage ([#65](https://github.com/hasura/ndc-mongodb/pull/65))

## [0.0.5] - 2024-04-26
- Fix incorrect order of results for query requests with more than 10 variable sets (#37)
Expand Down
118 changes: 58 additions & 60 deletions crates/mongodb-agent-common/src/query/relations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,50 @@ fn make_lookup_stage(
column_mapping: &ColumnMapping,
r#as: String,
lookup_pipeline: Pipeline,
) -> Result<Stage, MongoAgentError> {
// If we are mapping a single field in the source collection to a single field in the target
// collection then we can use the correlated subquery syntax.
if column_mapping.0.len() == 1 {
// Safe to unwrap because we just checked the hashmap size
let (source_selector, target_selector) = column_mapping.0.iter().next().unwrap();
single_column_mapping_lookup(
from,
source_selector,
target_selector,
r#as,
lookup_pipeline,
)
} else {
multiple_column_mapping_lookup(from, column_mapping, r#as, lookup_pipeline)
}
}

fn single_column_mapping_lookup(
from: String,
source_selector: &ColumnSelector,
target_selector: &ColumnSelector,
r#as: String,
lookup_pipeline: Pipeline,
) -> Result<Stage, MongoAgentError> {
Ok(Stage::Lookup {
from: Some(from),
local_field: Some(safe_column_selector(source_selector)?.to_string()),
foreign_field: Some(safe_column_selector(target_selector)?.to_string()),
r#let: None,
pipeline: if lookup_pipeline.is_empty() {
None
} else {
Some(lookup_pipeline)
},
r#as,
})
}

fn multiple_column_mapping_lookup(
from: String,
column_mapping: &ColumnMapping,
r#as: String,
lookup_pipeline: Pipeline,
) -> Result<Stage, MongoAgentError> {
let let_bindings: Document = column_mapping
.0
Expand Down Expand Up @@ -293,15 +337,9 @@ mod tests {
{
"$lookup": {
"from": "students",
"let": {
"v__id": "$_id"
},
"localField": "_id",
"foreignField": "classId",
"pipeline": [
{
"$match": { "$expr": {
"$eq": ["$$v__id", "$classId"]
} }
},
{
"$replaceWith": {
"student_name": { "$ifNull": ["$name", null] },
Expand Down Expand Up @@ -386,15 +424,9 @@ mod tests {
{
"$lookup": {
"from": "classes",
"let": {
"v_classId": "$classId"
},
"localField": "classId",
"foreignField": "_id",
"pipeline": [
{
"$match": { "$expr": {
"$eq": ["$$v_classId", "$_id"]
} }
},
{
"$replaceWith": {
"class_title": { "$ifNull": ["$title", null] },
Expand Down Expand Up @@ -602,31 +634,15 @@ mod tests {
{
"$lookup": {
"from": "students",
"let": {
"v__id": "$_id"
},
"localField": "_id",
"foreignField": "class_id",
"pipeline": [
{
"$match": {
"$expr": {
"$eq": ["$$v__id", "$class_id"]
}
}
},
{
"$lookup": {
"from": "assignments",
"let": {
"v__id": "$_id"
},
"localField": "_id",
"foreignField": "student_id",
"pipeline": [
{
"$match": {
"$expr": {
"$eq": ["$$v__id", "$student_id"]
}
}
},
{
"$replaceWith": {
"assignment_title": { "$ifNull": ["$title", null] },
Expand Down Expand Up @@ -734,15 +750,9 @@ mod tests {
{
"$lookup": {
"from": "students",
"let": {
"v__id": "$_id"
},
"localField": "_id",
"foreignField": "classId",
"pipeline": [
{
"$match": { "$expr": {
"$eq": ["$$v__id", "$classId"]
} }
},
{
"$facet": {
"aggregate_count": [
Expand Down Expand Up @@ -862,15 +872,9 @@ mod tests {
{
"$lookup": {
"from": "movies",
"let": {
"v_movie_id": "$movie_id"
},
"localField": "movie_id",
"foreignField": "_id",
"pipeline": [
{
"$match": { "$expr": {
"$eq": ["$$v_movie_id", "$_id"]
} }
},
{
"$replaceWith": {
"year": { "$ifNull": ["$year", null] },
Expand Down Expand Up @@ -997,15 +1001,9 @@ mod tests {
{
"$lookup": {
"from": "movies",
"let": {
"v_movie_id": "$movie_id",
},
"localField": "movie_id",
"foreignField": "_id",
"pipeline": [
{
"$match": { "$expr": {
"$eq": ["$$v_movie_id", "$_id"]
} }
},
{
"$replaceWith": {
"credits": {
Expand Down