[accumulo] branch master updated (c8b55b1 -> 7a2ab3b)

[mm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

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


    from c8b55b1  Fix Warning in VolumeIT
     add 7a2ab3b  Use TabletFile for Tablet, Scans and compaction (#1501)

No new revisions were added by this update.

Summary of changes:
 .../accumulo/core/clientImpl/OfflineIterator.java  |   2 +-
 .../accumulo/core/clientImpl/Translator.java       |   2 +-
 .../apache/accumulo/core/logging/TabletLogger.java |  10 +-
 .../core/metadata/{schema => }/TabletFile.java     |  42 ++++++--
 .../accumulo/core/metadata/schema/Ample.java       |  13 +--
 .../core/metadata/schema/TabletMetadata.java       |   9 +-
 .../org/apache/accumulo/core/summary/Gatherer.java |   2 +-
 .../core/metadata/schema/TabletFileTest.java       |   1 +
 .../core/metadata/schema/TabletMetadataTest.java   |   9 +-
 .../org/apache/accumulo/server/fs/FileRef.java     |   2 +-
 .../org/apache/accumulo/server/fs/VolumeUtil.java  |  19 ++--
 .../accumulo/server/metadata/RootGcCandidates.java |  12 +--
 .../accumulo/server/metadata/ServerAmpleImpl.java  |  15 ++-
 .../server/metadata/TabletMutatorBase.java         |  21 ++--
 .../org/apache/accumulo/server/util/FileUtil.java  |  24 ++---
 .../accumulo/server/util/MasterMetadataUtil.java   |  44 +++-----
 .../accumulo/server/util/MetadataTableUtil.java    |  54 +++++-----
 .../apache/accumulo/server/util/FileUtilTest.java  |  12 +--
 .../apache/accumulo/master/TabletGroupWatcher.java |   8 +-
 .../master/tableOps/bulkVer2/LoadFiles.java        |   8 +-
 .../accumulo/master/upgrade/Upgrader9to10.java     |   4 +-
 .../org/apache/accumulo/tserver/FileManager.java   |  12 +--
 .../tserver/TabletIteratorEnvironment.java         |   9 +-
 .../org/apache/accumulo/tserver/TabletServer.java  |  10 +-
 .../tserver/TabletServerResourceManager.java       |   4 +-
 .../tserver/compaction/CompactionPlan.java         |  12 +--
 .../compaction/DefaultCompactionStrategy.java      |  22 ++--
 .../tserver/compaction/MajorCompactionRequest.java |  22 ++--
 .../compaction/SizeLimitCompactionStrategy.java    |   6 +-
 .../strategies/BasicCompactionStrategy.java        |   8 +-
 .../strategies/ConfigurableCompactionStrategy.java |  40 +++----
 .../TooManyDeletesCompactionStrategy.java          |   4 +-
 .../accumulo/tserver/tablet/CompactionInfo.java    |   6 +-
 .../apache/accumulo/tserver/tablet/Compactor.java  |  36 +++----
 .../accumulo/tserver/tablet/DatafileManager.java   | 115 +++++++++++----------
 .../tserver/tablet/MinorCompactionTask.java        |  16 +--
 .../accumulo/tserver/tablet/MinorCompactor.java    |  10 +-
 .../accumulo/tserver/tablet/ScanDataSource.java    |   6 +-
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 110 ++++++++++----------
 .../apache/accumulo/tserver/tablet/TabletData.java |  26 +++--
 .../tserver/compaction/CompactionPlanTest.java     |  24 ++---
 .../compaction/DefaultCompactionStrategyTest.java  |  36 +++----
 .../SizeLimitCompactionStrategyTest.java           |   8 +-
 .../tserver/compaction/SizeWindowTest.java         |  11 +-
 .../strategies/BasicCompactionStrategyTest.java    |  26 ++---
 .../ConfigurableCompactionStrategyTest.java        |   6 +-
 .../tserver/tablet/DatafileManagerTest.java        |  32 +++---
 .../accumulo/test/SizeCompactionStrategy.java      |   4 +-
 .../accumulo/test/TestCompactionStrategy.java      |  18 ++--
 .../java/org/apache/accumulo/test/VolumeIT.java    |   2 +-
 .../accumulo/test/functional/SplitRecoveryIT.java  |  40 +++----
 .../test/performance/scan/CollectTabletStats.java  |  40 +++----
 52 files changed, 531 insertions(+), 503 deletions(-)
 rename core/src/main/java/org/apache/accumulo/core/metadata/{schema => }/TabletFile.java (81%)