(accumulo) branch main updated: Use LogEntry to parse log entries (#4070)

[ctubbsii]

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

ctubbsii 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 4bb8c286a5 Use LogEntry to parse log entries (#4070)
4bb8c286a5 is described below

commit 4bb8c286a5cde4d82f51c257c9a9fd915e4fe6f4
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Wed Dec 13 20:08:41 2023 -0500

    Use LogEntry to parse log entries (#4070)
    
    Use LogEntry.fromMetaWalEntry to parse log entries from the metadata
    table in MetaDataTableScanner. It previously implemented a manual
    parsing of a very old and outdated schema that just happened to still
    work with the current format.
    
    This fixes #4065 and will be compatible with the changes in PR #3997.
---
 .../apache/accumulo/server/manager/state/MetaDataTableScanner.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/manager/state/MetaDataTableScanner.java
 
b/server/base/src/main/java/org/apache/accumulo/server/manager/state/MetaDataTableScanner.java
index 86cd0f3f25..900387fa06 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/manager/state/MetaDataTableScanner.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/manager/state/MetaDataTableScanner.java
@@ -22,7 +22,6 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.lang.ref.Cleaner.Cleanable;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -54,6 +53,7 @@ import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Su
 import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.Location;
 import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.tabletserver.log.LogEntry;
 import org.apache.accumulo.core.util.cleaner.CleanerUtil;
 import org.apache.hadoop.io.Text;
 import org.slf4j.Logger;
@@ -176,8 +176,7 @@ public class MetaDataTableScanner implements 
ClosableIterator<TabletLocationStat
         }
         current = location;
       } else if (cf.compareTo(LogColumnFamily.NAME) == 0) {
-        String[] split = 
entry.getValue().toString().split("\\|")[0].split(";");
-        walogs.add(Arrays.asList(split));
+        
walogs.add(Collections.singleton(LogEntry.fromMetaWalEntry(entry).getFilePath()));
       } else if (cf.compareTo(LastLocationColumnFamily.NAME) == 0) {
         if (lastTimestamp < entry.getKey().getTimestamp()) {
           last = Location.last(new TServerInstance(entry.getValue(), cq));