Sanne Grinovero I tried to make sense of what you had in mind but that did not work. Can you make a summary.

From what I understood you wanted to:

• collect all flushed entities (via a flush entity event) and mark them as non clearable
• collect clear events (from ORM), flush the index work for non clearable entities and clear the queue of the other works

I don't think it makes sense. By definition all entities in the indexing queue are entities that have been flushed one way or the other. And conversely, no entity that have not bee flushed are part of the index queue. So the non clearable collecting business is unnecessary.

Did I incorrectly read what you had in mind?