[accumulo] 01/02: Merge branch 'main' into no-chop-merge

[cs...@apache.org]

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

cshannon pushed a commit to branch no-chop-merge
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit f24f8ac050cc9fac4d9e566449b6117493043f96
Merge: 8d39c8e34b 23bca6905c
Author: Christopher L. Shannon (cshannon) <ch...@gmail.com>
AuthorDate: Fri Jun 2 19:19:48 2023 -0400

    Merge branch 'main' into no-chop-merge

 .../accumulo/core/file/BloomFilterLayer.java       |  6 ++--
 .../{TabletFile.java => ReferencedTabletFile.java} | 23 +++++++------
 .../core/metadata/ScanServerRefTabletFile.java     |  2 +-
 .../accumulo/core/metadata/StoredTabletFile.java   | 12 +++----
 .../core/metadata/UnreferencedTabletFile.java      |  4 +--
 .../accumulo/core/metadata/schema/Ample.java       | 10 +++---
 .../schema/ExternalCompactionMetadata.java         | 15 +++++----
 ...FileTest.java => ReferencedTabletFileTest.java} | 14 ++++----
 .../accumulo/server/compaction/FileCompactor.java  | 10 +++---
 .../org/apache/accumulo/server/fs/VolumeUtil.java  |  6 ++--
 .../server/init/FileSystemInitializer.java         |  4 +--
 .../server/metadata/TabletMutatorBase.java         |  8 ++---
 .../org/apache/accumulo/server/util/FileUtil.java  |  7 ++--
 .../accumulo/server/util/ManagerMetadataUtil.java  | 11 +++---
 .../accumulo/server/util/MetadataTableUtil.java    |  7 ++--
 .../accumulo/server/util/TableDiskUsageTest.java   | 12 ++++---
 .../org/apache/accumulo/compactor/Compactor.java   |  5 +--
 .../manager/tableOps/bulkVer2/LoadFiles.java       |  6 ++--
 .../accumulo/tserver/TabletClientHandler.java      | 10 +++---
 .../tserver/compactions/ExternalCompactionJob.java |  6 ++--
 .../accumulo/tserver/tablet/CompactableImpl.java   |  7 ++--
 .../accumulo/tserver/tablet/CompactableUtils.java  | 13 ++++----
 .../accumulo/tserver/tablet/DatafileManager.java   | 17 +++++-----
 .../tserver/tablet/MinorCompactionTask.java        |  9 ++---
 .../accumulo/tserver/tablet/MinorCompactor.java    |  5 +--
 .../org/apache/accumulo/tserver/tablet/Tablet.java | 39 ++++++++++++----------
 .../apache/accumulo/tserver/tablet/TabletData.java |  8 ++---
 .../tserver/compaction/CompactableUtilsTest.java   |  9 ++---
 .../test/functional/GarbageCollectorTrashBase.java |  4 +--
 .../accumulo/test/functional/SplitRecoveryIT.java  | 18 +++++-----
 30 files changed, 163 insertions(+), 144 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
index 52cd13dc49,abda1e5672..70847d6ea3
--- a/core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
@@@ -47,21 -45,14 +47,22 @@@ public class ReferencedTabletFile exten
    private final TabletDirectory tabletDir; // hdfs://1.2.3.4/accumulo/tables/2a/t-0003
    private final String normalizedPath;
  
-   private static final Logger log = LoggerFactory.getLogger(TabletFile.class);
+   private static final Logger log = LoggerFactory.getLogger(ReferencedTabletFile.class);
  
-   private static final Comparator<TabletFile> comparator =
-       Comparator.comparing(TabletFile::getNormalizedPathStr).thenComparing(TabletFile::getRange);
++  private static final Comparator<ReferencedTabletFile> comparator =
++      Comparator.comparing(ReferencedTabletFile::getNormalizedPathStr)
++          .thenComparing(ReferencedTabletFile::getRange);
 +
-   public TabletFile(Path metaPath) {
++  public ReferencedTabletFile(Path metaPath) {
 +    this(metaPath, new Range());
 +  }
 +
    /**
     * Construct new tablet file using a Path. Used in the case where we had to use Path object to
     * qualify an absolute path or create a new file.
     */
-   public TabletFile(Path metaPath, Range range) {
 -  public ReferencedTabletFile(Path metaPath) {
 -    super(Objects.requireNonNull(metaPath));
++  public ReferencedTabletFile(Path metaPath, Range range) {
 +    super(Objects.requireNonNull(metaPath), range);
      String errorMsg = "Missing or invalid part of tablet file metadata entry: " + metaPath;
      log.trace("Parsing TabletFile from {}", metaPath);
  
@@@ -135,9 -126,9 +136,9 @@@
  
    @Override
    public boolean equals(Object obj) {
-     if (obj instanceof TabletFile) {
-       TabletFile that = (TabletFile) obj;
+     if (obj instanceof ReferencedTabletFile) {
+       ReferencedTabletFile that = (ReferencedTabletFile) obj;
 -      return normalizedPath.equals(that.normalizedPath);
 +      return normalizedPath.equals(that.normalizedPath) && range.equals(that.range);
      }
      return false;
    }
diff --cc core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
index e8f3b2ce9d,4b517360d1..0477e0098a
--- a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
@@@ -45,11 -44,9 +45,11 @@@ public class StoredTabletFile extends A
     * the entry can be deleted.
     */
    public StoredTabletFile(String metadataEntry) {
 -    super(new Path(metadataEntry));
 +    // TODO: Future version of metadataEntry will contains the path
 +    // and the range so we will need to parse the string here
 +    super(new Path(metadataEntry), new Range());
      this.metadataEntry = metadataEntry;
-     this.tabletFile = TabletFile.of(getPath());
+     this.referencedTabletFile = ReferencedTabletFile.of(getPath());
    }
  
    /**