[accumulo] branch main updated: Revert "StoredTabletFile now lazy loads ReferencedTabletFile (#3502)"

[cshannon]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new f3ef6aca07 Revert "StoredTabletFile now lazy loads 
ReferencedTabletFile (#3502)"
f3ef6aca07 is described below

commit f3ef6aca078ed1fe949193fb2d85b33cb68b0d3a
Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com>
AuthorDate: Wed Jun 21 12:11:45 2023 -0400

    Revert "StoredTabletFile now lazy loads ReferencedTabletFile (#3502)"
    
    This reverts commit 3f491a4885783f3bcf43391ba0f06381a1df7118.
---
 .../apache/accumulo/core/metadata/AbstractTabletFile.java   |  1 +
 .../apache/accumulo/core/metadata/ReferencedTabletFile.java |  3 ---
 .../org/apache/accumulo/core/metadata/StoredTabletFile.java | 13 +++++--------
 .../accumulo/core/metadata/UnreferencedTabletFile.java      |  1 -
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/metadata/AbstractTabletFile.java 
b/core/src/main/java/org/apache/accumulo/core/metadata/AbstractTabletFile.java
index 99b4a00698..587636c207 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/metadata/AbstractTabletFile.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/metadata/AbstractTabletFile.java
@@ -37,6 +37,7 @@ public abstract class AbstractTabletFile<T extends 
AbstractTabletFile<T>>
   protected AbstractTabletFile(Path path) {
     this.path = Objects.requireNonNull(path);
     this.fileName = path.getName();
+    ValidationUtil.validateFileName(fileName);
   }
 
   @Override
diff --git 
a/core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
 
b/core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
index 53e72811e5..abda1e5672 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/metadata/ReferencedTabletFile.java
@@ -56,9 +56,6 @@ public class ReferencedTabletFile extends 
AbstractTabletFile<ReferencedTabletFil
     String errorMsg = "Missing or invalid part of tablet file metadata entry: 
" + metaPath;
     log.trace("Parsing TabletFile from {}", metaPath);
 
-    // Validate characters in file name
-    ValidationUtil.validateFileName(path.getName());
-
     // use Path object to step backwards from the filename through all the 
parts
     Path tabletDirPath = Objects.requireNonNull(metaPath.getParent(), 
errorMsg);
 
diff --git 
a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java 
b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
index 379aab4d8c..4b517360d1 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/StoredTabletFile.java
@@ -19,14 +19,11 @@
 package org.apache.accumulo.core.metadata;
 
 import java.util.Objects;
-import java.util.function.Supplier;
 
 import org.apache.accumulo.core.data.TableId;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 
-import com.google.common.base.Suppliers;
-
 /**
  * Object representing a tablet file entry stored in the metadata table. Keeps 
a string of the exact
  * entry of what is in the metadata table, which is important for updating and 
deleting metadata
@@ -40,7 +37,7 @@ import com.google.common.base.Suppliers;
  */
 public class StoredTabletFile extends AbstractTabletFile<StoredTabletFile> {
   private final String metadataEntry;
-  private final Supplier<ReferencedTabletFile> referencedTabletFile;
+  private final ReferencedTabletFile referencedTabletFile;
 
   /**
    * Construct a tablet file using the string read from the metadata. Preserve 
the exact string so
@@ -49,7 +46,7 @@ public class StoredTabletFile extends 
AbstractTabletFile<StoredTabletFile> {
   public StoredTabletFile(String metadataEntry) {
     super(new Path(metadataEntry));
     this.metadataEntry = metadataEntry;
-    this.referencedTabletFile = Suppliers.memoize(() -> 
ReferencedTabletFile.of(getPath()));
+    this.referencedTabletFile = ReferencedTabletFile.of(getPath());
   }
 
   /**
@@ -69,15 +66,15 @@ public class StoredTabletFile extends 
AbstractTabletFile<StoredTabletFile> {
   }
 
   public ReferencedTabletFile getTabletFile() {
-    return referencedTabletFile.get();
+    return referencedTabletFile;
   }
 
   public TableId getTableId() {
-    return referencedTabletFile.get().getTableId();
+    return referencedTabletFile.getTableId();
   }
 
   public String getNormalizedPathStr() {
-    return referencedTabletFile.get().getNormalizedPathStr();
+    return referencedTabletFile.getNormalizedPathStr();
   }
 
   /**
diff --git 
a/core/src/main/java/org/apache/accumulo/core/metadata/UnreferencedTabletFile.java
 
b/core/src/main/java/org/apache/accumulo/core/metadata/UnreferencedTabletFile.java
index 402b3b9194..a43fe48443 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/metadata/UnreferencedTabletFile.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/metadata/UnreferencedTabletFile.java
@@ -42,7 +42,6 @@ public class UnreferencedTabletFile extends 
AbstractTabletFile<UnreferencedTable
 
   public UnreferencedTabletFile(FileSystem fs, Path path) {
     
super(Objects.requireNonNull(fs).makeQualified(Objects.requireNonNull(path)));
-    ValidationUtil.validateFileName(path.getName());
   }
 
   @Override