-
-
Notifications
You must be signed in to change notification settings - Fork 246
DRAFT: Switch from the Search session holder to an ORM session extension #4893
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.
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
Draft
marko-bekhta
wants to merge
2
commits into
hibernate:main
Choose a base branch
from
marko-bekhta:wip/orm-session-extension
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...java/org/hibernate/search/mapper/orm/session/impl/HibernateOrmSearchSessionExtension.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * Copyright Red Hat Inc. and Hibernate Authors | ||
| */ | ||
| package org.hibernate.search.mapper.orm.session.impl; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.hibernate.Transaction; | ||
| import org.hibernate.engine.extension.spi.Extension; | ||
| import org.hibernate.engine.spi.SharedSessionContractImplementor; | ||
| import org.hibernate.search.mapper.pojo.work.spi.PojoIndexingPlan; | ||
|
|
||
| public class HibernateOrmSearchSessionExtension implements Serializable, Extension { | ||
|
|
||
| public static HibernateOrmSearchSessionExtension get(SharedSessionContractImplementor session) { | ||
| return session.getExtension( HibernateOrmSearchSessionExtension.class ); | ||
| } | ||
|
|
||
| // Everything here should be transient because the holder might get serialized along with a Hibernate ORM session. | ||
| // The Hibernate Search data (indexing plans in particular) will be lost in the process, | ||
| // but that's the best we can do. | ||
| private transient HibernateOrmSearchSession searchSession; | ||
| private transient Map<Transaction, PojoIndexingPlan> planPerTransaction; | ||
|
|
||
| public static HibernateOrmSearchSessionExtension init() { | ||
| return new HibernateOrmSearchSessionExtension(); | ||
| } | ||
|
|
||
| public HibernateOrmSearchSession searchSession() { | ||
| return searchSession; | ||
| } | ||
|
|
||
| public void searchSession(HibernateOrmSearchSession searchSession) { | ||
| this.searchSession = searchSession; | ||
| } | ||
|
|
||
| public PojoIndexingPlan pojoIndexingPlan(Transaction transaction) { | ||
| return planPerTransaction == null ? null : planPerTransaction.get( transaction ); | ||
| } | ||
|
|
||
| public void pojoIndexingPlan(Transaction transaction, PojoIndexingPlan plan) { | ||
| if ( planPerTransaction == null ) { | ||
| planPerTransaction = new HashMap<>(); | ||
| } | ||
| planPerTransaction.put( transaction, plan ); | ||
| } | ||
|
|
||
| public void clear(Transaction transactionIdentifier) { | ||
| if ( planPerTransaction == null ) { | ||
| return; | ||
| } | ||
| planPerTransaction.remove( transactionIdentifier ); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we won't have a queue in stateless session so we'd need to deal with this one way or the other 😃,
but an ORM SPI would be nice 🙂