accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] 02/02: Merge branch 'ACCUMULO-4074-2'
Date Tue, 10 Jul 2018 22:02:34 GMT
This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 5e5c74f3f11aa65ce8f1643f03c0e4efbbd1d0b3
Merge: f2d0371 aaa757e
Author: Keith Turner <kturner@apache.org>
AuthorDate: Tue Jul 10 17:59:24 2018 -0400

    Merge branch 'ACCUMULO-4074-2'

 core/pom.xml                                       |  19 ++
 .../accumulo/core/conf/AccumuloConfiguration.java  | 136 ++++++++++++++
 .../accumulo/core/conf/DefaultConfiguration.java   |   5 +
 .../org/apache/accumulo/core/conf/Property.java    |  50 ++++-
 .../accumulo/core/conf/SiteConfiguration.java      |  10 +
 .../common/IteratorConfiguration.java}             |  31 ++--
 .../common/Stats.java}                             |  43 +++--
 .../core/spi/scan/IdleRatioScanPrioritizer.java    |  51 ++++++
 .../accumulo/core/spi/scan/ScanDispatcher.java     |  52 ++++++
 .../accumulo/core/spi/scan/ScanExecutor.java       |  60 ++++++
 .../apache/accumulo/core/spi/scan/ScanInfo.java    | 116 ++++++++++++
 .../scan/ScanPrioritizer.java}                     |  33 ++--
 .../core/spi/scan/SimpleScanDispatcher.java        |  74 ++++++++
 ....java => AccumuloUncaughtExceptionHandler.java} |  18 +-
 .../accumulo/core/util/NamingThreadFactory.java    |  19 +-
 .../java/org/apache/accumulo/core/util/Stat.java   |  75 ++++----
 .../core/conf/AccumuloConfigurationTest.java       | 112 +++++++++++-
 .../spi/scan/IdleRatioScanPrioritizerTest.java     |  61 +++++++
 .../core/spi/scan/SimpleScanDispatcherTest.java    |  62 +++++++
 .../accumulo/core/spi/scan/TestScanInfo.java       | 101 +++++++++++
 .../org/apache/accumulo/core/util/StatTest.java    |  40 ++--
 .../accumulo/server/conf/TableConfiguration.java   |  37 ++++
 .../accumulo/server/conf/ZooConfiguration.java     |  13 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  41 +++--
 .../tserver/TabletServerResourceManager.java       | 202 ++++++++++++++++++---
 .../accumulo/tserver/scan/NextBatchTask.java       |   7 +-
 .../accumulo/tserver/session/MultiScanSession.java |  22 ++-
 .../accumulo/tserver/session/ScanSession.java      | 162 +++++++++++++----
 .../apache/accumulo/tserver/session/Session.java   |   2 +-
 .../accumulo/tserver/session/SessionManager.java   |   8 +-
 .../{ScanSession.java => SingleScanSession.java}   |  29 ++-
 .../org/apache/accumulo/tserver/tablet/Tablet.java |   9 +-
 .../org/apache/accumulo/test/IMMLGBenchmark.java   |   2 +-
 .../test/performance/scan/CollectTabletStats.java  |   5 +-
 34 files changed, 1449 insertions(+), 258 deletions(-)


Mime
View raw message