Simplify Lockable interface, adds safety for data formats#199
Merged
alchemist51 merged 4 commits intoalchemist51:cieefrom Mar 21, 2026
Merged
Simplify Lockable interface, adds safety for data formats#199alchemist51 merged 4 commits intoalchemist51:cieefrom
alchemist51 merged 4 commits intoalchemist51:cieefrom
Conversation
Signed-off-by: Arpit Bandejiya <abandeji@amazon.com>
Signed-off-by: Bukhtawar Khan <bukhtawa@amazon.com>
Bukhtawar
changed the title
alchemist51
reviewed
Mar 21, 2026
| ); | ||
| } | ||
| this.secondaryWriters = Collections.unmodifiableMap(secondaries); | ||
| this.secondaryWritersByFormat = Map.copyOf(secondaries); |
Owner
There was a problem hiding this comment.
Should this not be unmodifiableMap?
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description
DataFormat — Interface → abstract class with final equals()/hashCode() on name(). → Eliminates bugs from inconsistent equality; makes DataFormat safe as a Map key everywhere.
CompositeWriter — Positional list iteration → keyed Map<DataFormat, Writer> lookup for secondaries. → O(1) writer lookup instead of fragile index-based coupling between inputs and writers.
Lockable — New minimal interface (lock, tryLock, unlock) replacing java.util.concurrent.locks.Lock. → Separates writing concern from concurrency control; removes dead methods like newCondition() that threw UnsupportedOperationException.
LockableConcurrentQueue — Type bound changed from Lock to Lockable. → Queue no longer forces pooled objects to implement the full Lock contract they don't need.
CompositeEnginePlugin — Added null/blank name validation on plugin registration and secondary format settings. → Fails fast at startup instead of producing cryptic NPEs at indexing time.
DataFormatPlugin — Simplified indexingEngine return from generic <T, P> to IndexingExecutionEngine. → Removes unchecked casts from every plugin implementation; the generic parameters weren't providing type safety anyway.
Related Issues
Resolves opensearch-project#20909
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.