SmorgasbordQ ( https://hibernate.atlassian.net/secure/ViewProfile.jspa?accountId=63cb143... ) *commented* on HSEARCH-4789 ( https://hibernate.atlassian.net/browse/HSEARCH-4789?atlOrigin=eyJpIjoiYjd... ) Re: Indexing entities with a shared id across tenants in HSearch 5 results in removal from those tenants ( https://hibernate.atlassian.net/browse/HSEARCH-4789?atlOrigin=eyJpIjoiYjd... ) I think I found the issue(s): ByTermUpdateWorkExecutor, DeleteExtWorkExecutor, UpdateExtWorkExecutor do not factor in a tenantId as needed. I added a tenantId option to NumericFieldUtils.createExactMatchQuery (to conditionally build a BooleanQuery) for numericIds, otherwise when updateDocument was called, I checked the tenantId to see if a call to Utility.deleteWorkByQuery+addDocument was needed (otherwise use updateDocument with idTerm) I’m not sure what the preferred coding practices / test cases / pull-requests are - if you’d like me to do anything more to help let me know… but otherwise I imagine this info would be enough 🙂 ( https://hibernate.atlassian.net/browse/HSEARCH-4789#add-comment?atlOrigin... ) Add Comment ( https://hibernate.atlassian.net/browse/HSEARCH-4789#add-comment?atlOrigin... ) Get Jira notifications on your phone! Download the Jira Cloud app for Android ( https://play.google.com/store/apps/details?id=com.atlassian.android.jira.... ) or iOS ( https://itunes.apple.com/app/apple-store/id1006972087?pt=696495&ct=Em... ) This message was sent by Atlassian Jira (v1001.0.0-SNAPSHOT#100214- sha1:fa7bc5f )