This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 21a74537b6 Merge branch '2.1'
add ec5954eddb Modified IteratorEnvironment to no longer throw UOE (#5490)
add 98ee7a5e6c Merge branch '2.1'
No new revisions were added by this update.
Summary of changes:
.../core/client/ClientSideIteratorScanner.java | 71 +------
.../accumulo/core/client/rfile/RFileScanner.java | 83 +++++---
.../accumulo/core/clientImpl/OfflineIterator.java | 96 +---------
.../core/iterators/IteratorEnvironment.java | 40 +---
.../iteratorsImpl/ClientIteratorEnvironment.java | 208 +++++++++++++++++++++
.../apache/accumulo/core/file/rfile/RFileTest.java | 36 +---
.../core/iterators/DefaultIteratorEnvironment.java | 42 -----
.../iterators/FirstEntryInRowIteratorTest.java | 4 +-
.../core/iterators/SortedMapIteratorTest.java | 16 +-
.../core/iterators/user/ColumnSliceFilterTest.java | 4 +-
.../accumulo/core/iterators/user/CombinerTest.java | 31 +--
.../accumulo/core/iterators/user/FilterTest.java | 20 +-
.../iterators/user/IndexedDocIteratorTest.java | 4 +-
.../iterators/user/IntersectingIteratorTest.java | 4 +-
.../core/iterators/user/LargeRowFilterTest.java | 3 +-
.../core/iterators/user/RegExFilterTest.java | 32 ++--
.../iterators/user/RowDeletingIteratorTest.java | 34 +---
.../iterators/user/RowEncodingIteratorTest.java | 22 +--
.../core/iterators/user/RowFilterTest.java | 16 +-
.../iterators/user/TransformingIteratorTest.java | 13 +-
.../core/iteratorsImpl/IteratorConfigUtilTest.java | 4 +-
.../accumulo/iteratortest/IteratorTestInput.java | 10 +-
.../environments/SimpleIteratorEnvironment.java | 33 ----
.../iterators/TabletIteratorEnvironment.java | 25 +++
.../apache/accumulo/tserver/InMemoryMapTest.java | 105 ++++++-----
.../test/functional/MemoryConsumingCompactor.java | 22 +--
.../test/performance/scan/CollectTabletStats.java | 14 +-
.../test/iterator/SummingCombinerTest.java | 12 +-
28 files changed, 481 insertions(+), 523 deletions(-)
create mode 100644
core/src/main/java/org/apache/accumulo/core/iteratorsImpl/ClientIteratorEnvironment.java
delete mode 100644
core/src/test/java/org/apache/accumulo/core/iterators/DefaultIteratorEnvironment.java
delete mode 100644
iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/environments/SimpleIteratorEnvironment.java
