Replace non-public SortedMapIterator with DataWave utility #3322
+311
−32
Conversation
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
Create datawave.test.util.SortedMapIterator as a replacement for the non-public org.apache.accumulo.core.iteratorsImpl.system.SortedMapIterator class for Accumulo 4 compatibility. New utility class created in both modules: - warehouse/query-core/src/test/java/datawave/test/util/SortedMapIterator.java - warehouse/ingest-core/src/test/java/datawave/test/util/SortedMapIterator.java Updated 32 test files to use the new utility. Fixes #3321 Part of #2443
foster33
requested changes
Jan 9, 2026
Collaborator
foster33
left a comment
foster33
left a comment
There was a problem hiding this comment.
There seems to be other uses of SortedMapIterator:
core/in-memory-accumulo/src/main/java/datawave/accumulo/inmemory/InMemoryScannercore/in-memory-accumulo/src/main/java/datawave/accumulo/inmemory/InMemoryBatchScannerwarehouse/query-core/src/main/java/datawave/query/iterator/logic/ArrayIterator
Is this PR / Issue only focusing on the tests that use SortedMapIterator? Or should these also be included in this PR?
Also, is it necessary to make two SortedMapIterator utility classes? I feel like it would be best to only have one for consistency.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Create DataWave replacement for non-public Accumulo SortedMapIterator class.
New Utility Class
datawave.test.util.SortedMapIterator- implementsSortedKeyValueIterator<Key,Value>:SortedMap<Key,Value>for testing iterator logic without a full Accumulo instanceFiles Changed
Fixes #3321
Part of #2443