[accumulo] branch main updated: Add missing chopped column to Ample (#2969)

[mm...@apache.org]

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

mmiller 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 941c596866 Add missing chopped column to Ample (#2969)
941c596866 is described below

commit 941c596866e4a438a2c9525f4051900796f81fe2
Author: Mike Miller <mm...@apache.org>
AuthorDate: Tue Sep 27 18:48:31 2022 +0000

    Add missing chopped column to Ample (#2969)
    
    * Fixes #2961
---
 .../apache/accumulo/core/metadata/schema/MetadataSchema.java  |  5 +++--
 .../apache/accumulo/core/metadata/schema/TabletMetadata.java  | 11 +++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
index 5f058bc6c7..eb39ac71d8 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
@@ -326,8 +326,9 @@ public class MetadataSchema {
      * data for the current tablet, so that they are safe to merge
      */
     public static class ChoppedColumnFamily {
-      public static final Text NAME = new Text("chopped");
-      public static final ColumnFQ CHOPPED_COLUMN = new ColumnFQ(NAME, new Text("chopped"));
+      public static final String STR_NAME = "chopped";
+      public static final Text NAME = new Text(STR_NAME);
+      public static final ColumnFQ CHOPPED_COLUMN = new ColumnFQ(NAME, new Text(STR_NAME));
     }
 
     public static class ExternalCompactionColumnFamily {
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
index 5305858d5d..89d7722958 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
@@ -54,6 +54,7 @@ import org.apache.accumulo.core.metadata.TabletFile;
 import org.apache.accumulo.core.metadata.TabletLocationState;
 import org.apache.accumulo.core.metadata.TabletState;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.BulkFileColumnFamily;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ChoppedColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ClonedColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.CurrentLocationColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
@@ -106,6 +107,7 @@ public class TabletMetadata {
   private OptionalLong compact = OptionalLong.empty();
   private Double splitRatio = null;
   private Map<ExternalCompactionId,ExternalCompactionMetadata> extCompactions;
+  private boolean chopped = false;
 
   public enum LocationType {
     CURRENT, FUTURE, LAST
@@ -127,6 +129,7 @@ public class TabletMetadata {
     COMPACT_ID,
     SPLIT_RATIO,
     SUSPEND,
+    CHOPPED,
     ECOMP
   }
 
@@ -265,6 +268,11 @@ public class TabletMetadata {
     return splitRatio;
   }
 
+  public boolean hasChopped() {
+    ensureFetched(ColumnType.CHOPPED);
+    return chopped;
+  }
+
   public SortedMap<Key,Value> getKeyValues() {
     Preconditions.checkState(keyValues != null, "Requested key values when it was not saved");
     return keyValues;
@@ -399,6 +407,9 @@ public class TabletMetadata {
           extCompBuilder.put(ExternalCompactionId.of(qual),
               ExternalCompactionMetadata.fromJson(val));
           break;
+        case ChoppedColumnFamily.STR_NAME:
+          te.chopped = true;
+          break;
         default:
           throw new IllegalStateException("Unexpected family " + fam);
       }