Skip to content

Add opt-in MongoDB multi-document transactions to GORM for MongoDB #15744

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

Open
codeconsole wants to merge 8 commits into
base: 8.0.x
Choose a base branch
from
Open

Add opt-in MongoDB multi-document transactions to GORM for MongoDB #15744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dfe1234
Add opt-in MongoDB multi-document transactions to GORM for MongoDB
codeconsole Jun 5, 2026
59d51fd
Merge branch '8.0.x' into feat/mongo-server-transactions
codeconsole Jun 18, 2026
7adbb2a
Address review: explicit transaction abort on commit failure and nati…
codeconsole Jun 20, 2026
9993091
Document that the Mongo session's ClientSession is single-thread conf…
codeconsole Jun 20, 2026
51fe9ae
Merge branch '8.0.x' into feat/mongo-server-transactions
codeconsole Jun 26, 2026
5348e14
Address review feedback on MongoDB server-side transactions
codeconsole Jul 1, 2026
90e5103
Frame TransientTransactionError retry as an application concern
codeconsole Jul 1, 2026
134146a
Rename MongoStaticApi session variable to mongoSession for consistency
codeconsole Jul 3, 2026
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
131 changes: 64 additions & 67 deletions ...ta-mongodb/core/src/main/groovy/org/grails/datastore/gorm/mongo/api/MongoStaticApi.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,37 +68,34 @@ class MongoStaticApi<D> extends GormStaticApi<D> implements MongoAllOperations<D
}

FindIterable<D> find(Bson filter) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
filter = wrapFilterWithMultiTenancy(filter)
return session.getCollection(entity)
MongoCollection<D> collection = mongoSession.getCollection(entity)
.withDocumentClass(persistentClass)
.find(filter)
return mongoSession.find(collection, filter)
}
}

@Override
D findOneAndDelete(Bson filter, FindOneAndDeleteOptions options = null) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
filter = wrapFilterWithMultiTenancy(filter)
MongoCollection<D> mongoCollection = session.getCollection(entity)
MongoCollection<D> mongoCollection = mongoSession.getCollection(entity)
.withDocumentClass(persistentClass)
D result = options ? mongoCollection
.findOneAndDelete(filter, options) :
mongoCollection
.findOneAndDelete(filter)
D result = options ? mongoSession.findOneAndDelete(mongoCollection, filter, options) :
mongoSession.findOneAndDelete(mongoCollection, filter)

return result
}
}

Number count(Bson filter) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
filter = wrapFilterWithMultiTenancy(filter)
return session.getCollection(entity)
.countDocuments(filter)
return mongoSession.countDocuments(mongoSession.getCollection(entity), filter)
}
}

Expand All @@ -112,74 +109,74 @@ class MongoStaticApi<D> extends GormStaticApi<D> implements MongoAllOperations<D

@Override
MongoDatabase getDB() {
(MongoDatabase) withSession({ AbstractMongoSession session ->
def databaseName = session.getDatabase(session.mappingContext.getPersistentEntity(persistentClass.name))
session.getNativeInterface()
(MongoDatabase) withSession({ AbstractMongoSession mongoSession ->
def databaseName = mongoSession.getDatabase(mongoSession.mappingContext.getPersistentEntity(persistentClass.name))
mongoSession.getNativeInterface()
.getDatabase(databaseName)

})
}

@Override
String getCollectionName() {
(String) withSession({ AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
return session.getCollectionName(entity)
(String) withSession({ AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
return mongoSession.getCollectionName(entity)
})
}

@Override
MongoCollection<Document> getCollection() {
(MongoCollection<Document>) withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
return session.getCollection(entity)
(MongoCollection<Document>) withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
return mongoSession.getCollection(entity)
}
}

@Override
def <T> T withCollection(String collectionName, Closure<T> callable) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
final previous = session.useCollection(entity, collectionName)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
final previous = mongoSession.useCollection(entity, collectionName)
try {
def dbName = session.getDatabase(entity)
MongoClient mongoClient = (MongoClient) session.getNativeInterface()
def dbName = mongoSession.getDatabase(entity)
MongoClient mongoClient = (MongoClient) mongoSession.getNativeInterface()
MongoDatabase db = mongoClient.getDatabase(dbName)
def coll = db.getCollection(collectionName)
return callable.call(coll)
} finally {
session.useCollection(entity, previous)
mongoSession.useCollection(entity, previous)
}
}
}

@Override
String useCollection(String collectionName) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
session.useCollection(entity, collectionName)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
mongoSession.useCollection(entity, collectionName)
}
}

@Override
def <T> T withDatabase(String databaseName, Closure<T> callable) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
final previous = session.useDatabase(entity, databaseName)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
final previous = mongoSession.useDatabase(entity, databaseName)
try {
MongoDatabase db = session.getNativeInterface().getDatabase(databaseName)
MongoDatabase db = mongoSession.getNativeInterface().getDatabase(databaseName)
return callable.call(db)
} finally {
session.useDatabase(entity, previous)
mongoSession.useDatabase(entity, previous)
}
}
}

@Override
String useDatabase(String databaseName) {
withSession { AbstractMongoSession session ->
def entity = session.mappingContext.getPersistentEntity(persistentClass.name)
session.useDatabase(entity, databaseName)
withSession { AbstractMongoSession mongoSession ->
def entity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
mongoSession.useDatabase(entity, databaseName)
}
}

Expand All @@ -190,47 +187,47 @@ class MongoStaticApi<D> extends GormStaticApi<D> implements MongoAllOperations<D

@Override
List<D> aggregate(List pipeline, Function<AggregateIterable, AggregateIterable> doWithAggregate = Function.identity()) {
(List<D>) withSession({ AbstractMongoSession session ->
def persistentEntity = session.mappingContext.getPersistentEntity(persistentClass.name)
def mongoCollection = session.getCollection(persistentEntity)
if (session instanceof MongoCodecSession) {
MongoDatastore datastore = (MongoDatastore)session.getDatastore()
(List<D>) withSession({ AbstractMongoSession mongoSession ->
def persistentEntity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
def mongoCollection = mongoSession.getCollection(persistentEntity)
if (mongoSession instanceof MongoCodecSession) {
MongoDatastore datastore = (MongoDatastore)mongoSession.getDatastore()
mongoCollection = mongoCollection
.withDocumentClass(persistentEntity.javaClass)
.withCodecRegistry(datastore.getCodecRegistry())
}

List<? extends Bson> newPipeline = preparePipeline(pipeline)
AggregateIterable aggregateIterable = mongoCollection.aggregate(newPipeline)
AggregateIterable aggregateIterable = mongoSession.aggregate(mongoCollection, newPipeline)
if (doWithAggregate != null) {
aggregateIterable = doWithAggregate.apply(aggregateIterable)
}
new MongoQuery.MongoResultList(aggregateIterable.iterator(), 0, (EntityPersister)session.getPersister(persistentEntity) as EntityPersister)
new MongoQuery.MongoResultList(aggregateIterable.iterator(), 0, (EntityPersister)mongoSession.getPersister(persistentEntity) as EntityPersister)
})
}

@Override
List<D> aggregate(List pipeline, Function<AggregateIterable, AggregateIterable> doWithAggregate, ReadPreference readPreference) {
(List<D>) withSession({ AbstractMongoSession session ->
def persistentEntity = session.mappingContext.getPersistentEntity(persistentClass.name)
(List<D>) withSession({ AbstractMongoSession mongoSession ->
def persistentEntity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
List<? extends Bson> newPipeline = preparePipeline(pipeline)
def mongoCollection = session.getCollection(persistentEntity)
def mongoCollection = mongoSession.getCollection(persistentEntity)
.withReadPreference(readPreference)
def aggregateIterable = mongoCollection.aggregate(newPipeline)
def aggregateIterable = mongoSession.aggregate(mongoCollection, newPipeline)
if (doWithAggregate != null) {
aggregateIterable = doWithAggregate.apply(aggregateIterable)
}
new MongoQuery.MongoResultList(aggregateIterable.iterator(), 0, (EntityPersister)session.getPersister(persistentEntity))
new MongoQuery.MongoResultList(aggregateIterable.iterator(), 0, (EntityPersister)mongoSession.getPersister(persistentEntity))
})
}

@Override
List<D> search(String query, Map options = Collections.emptyMap()) {
(List<D>) withSession({ AbstractMongoSession session ->
def persistentEntity = session.mappingContext.getPersistentEntity(persistentClass.name)
def coll = session.getCollection(persistentEntity)
if (session instanceof MongoCodecSession) {
MongoDatastore datastore = (MongoDatastore)session.datastore
(List<D>) withSession({ AbstractMongoSession mongoSession ->
def persistentEntity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)
def coll = mongoSession.getCollection(persistentEntity)
if (mongoSession instanceof MongoCodecSession) {
MongoDatastore datastore = (MongoDatastore)mongoSession.datastore
coll = coll
.withDocumentClass(persistentEntity.javaClass)
.withCodecRegistry(datastore.codecRegistry)
Expand All @@ -243,29 +240,29 @@ class MongoStaticApi<D> extends GormStaticApi<D> implements MongoAllOperations<D
search = Filters.text(query)
}
search = wrapFilterWithMultiTenancy(search)
FindIterable cursor = coll.find(search)
FindIterable cursor = mongoSession.find(coll, search)

int offset = options.offset instanceof Number ? ((Number)options.offset).intValue() : 0
int max = options.max instanceof Number ? ((Number)options.max).intValue() : -1
if (offset > 0) cursor.skip(offset)
if (max > -1) cursor.limit(max)
new MongoQuery.MongoResultList(cursor.iterator(), offset, (EntityPersister)session.getPersister(persistentEntity))
new MongoQuery.MongoResultList(cursor.iterator(), offset, (EntityPersister)mongoSession.getPersister(persistentEntity))
})
}

@Override
List<D> searchTop(String query, int limit = 5, Map options = Collections.emptyMap()) {
(List<D>) withSession({ AbstractMongoSession session ->
def persistentEntity = session.mappingContext.getPersistentEntity(persistentClass.name)
(List<D>) withSession({ AbstractMongoSession mongoSession ->
def persistentEntity = mongoSession.mappingContext.getPersistentEntity(persistentClass.name)

MongoCollection coll = session.getCollection(persistentEntity)
if (session instanceof MongoCodecSession) {
MongoDatastore datastore = (MongoDatastore)session.datastore
MongoCollection coll = mongoSession.getCollection(persistentEntity)
if (mongoSession instanceof MongoCodecSession) {
MongoDatastore datastore = (MongoDatastore)mongoSession.datastore
coll = coll
.withDocumentClass(persistentEntity.javaClass)
.withCodecRegistry(datastore.codecRegistry)
}
EntityPersister persister = (EntityPersister)session.getPersister(persistentEntity)
EntityPersister persister = (EntityPersister)mongoSession.getPersister(persistentEntity)

Bson search
if (options.language) {
Expand All @@ -277,7 +274,7 @@ class MongoStaticApi<D> extends GormStaticApi<D> implements MongoAllOperations<D

def score = Projections.metaTextScore('score')
search = wrapFilterWithMultiTenancy(search)
FindIterable cursor = coll.find(search)
FindIterable cursor = mongoSession.find(coll, search)
.projection(score)
.sort(score)
.limit(limit)
Expand Down
Loading
Loading