This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from ff07df3a5a Fix ConstructorThrow SpotBugs warnings in core module
(#5785)
add 6d4c37b1d8 Reduce thread contention by shuffling rfile order (#5998)
new 54e5758727 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:
.../accumulo/core/client/rfile/RFileScanner.java | 15 ++++-
.../accumulo/core/clientImpl/OfflineIterator.java | 8 ++-
.../org/apache/accumulo/core/conf/Property.java | 3 +
.../accumulo/core/file/rfile/GenerateSplits.java | 4 +-
.../core/iteratorsImpl/system/MultiIterator.java | 35 +++++++----
...pleIterator.java => MultiShuffledIterator.java} | 35 ++++++-----
.../core/iterators/system/MultiIteratorTest.java | 72 ++++++++++++++++++++--
.../system/MultiShuffledIteratorTest.java | 19 +++---
.../org/apache/accumulo/server/fs/FileManager.java | 7 +++
.../iterators/SystemIteratorEnvironmentImpl.java | 2 +-
.../accumulo/tserver/tablet/ScanDataSource.java | 14 ++++-
.../test/performance/scan/CollectTabletStats.java | 2 +-
12 files changed, 168 insertions(+), 48 deletions(-)
copy
core/src/main/java/org/apache/accumulo/core/iteratorsImpl/system/{SampleIterator.java
=> MultiShuffledIterator.java} (54%)
copy
server/base/src/main/java/org/apache/accumulo/server/iterators/SystemIteratorEnvironment.java
=>
core/src/test/java/org/apache/accumulo/core/iterators/system/MultiShuffledIteratorTest.java
(66%)
