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 7e843611d2 Improve locking mechanism in ClientTabletCacheImpl (#5538) add 001eaefedc fixes NPE in coordinator (#5612) add b3aed75b87 Removed TabletIteratorEnvironment, replaced with smaller impl (#5587) new 52de3d5637 Merge branch '2.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../iteratorsImpl/ClientIteratorEnvironment.java | 23 +- .../iterators/SystemIteratorEnvironmentImpl.java | 131 +++++++++++ .../iterators/TabletIteratorEnvironment.java | 241 --------------------- .../manager/state/TabletManagementIterator.java | 4 +- .../server/manager/state/ZooTabletStateStore.java | 9 +- .../server/tablets/ConditionCheckerContext.java | 13 +- .../org/apache/accumulo/compactor/ExtCEnv.java | 44 +++- .../apache/accumulo/tserver/tablet/MinCEnv.java | 8 +- .../accumulo/tserver/tablet/ScanDataSource.java | 15 +- .../apache/accumulo/tserver/InMemoryMapTest.java | 99 ++++----- .../test/functional/MemoryConsumingCompactor.java | 12 +- .../test/performance/scan/CollectTabletStats.java | 7 +- 12 files changed, 273 insertions(+), 333 deletions(-) create mode 100644 server/base/src/main/java/org/apache/accumulo/server/iterators/SystemIteratorEnvironmentImpl.java delete mode 100644 server/base/src/main/java/org/apache/accumulo/server/iterators/TabletIteratorEnvironment.java