(accumulo) branch 3.1 updated: fix issue with converting text to string in MetadataConstraints in 3.x (#4897)

[krathbun]

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

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


The following commit(s) were added to refs/heads/3.1 by this push:
     new 8139d1ee23 fix issue with converting text to string in 
MetadataConstraints in 3.x (#4897)
8139d1ee23 is described below

commit 8139d1ee232925aa38c6a0a22490af330b7827d7
Author: Kevin Rathbun <krath...@apache.org>
AuthorDate: Mon Sep 23 16:09:14 2024 -0400

    fix issue with converting text to string in MetadataConstraints in 3.x 
(#4897)
    
    * fix issue with converting text to string in MetadataConstraints in 3.x
    
    * Trivial change to SuspendLocationColumn
    
    made the Text name and qualifier string accessible through 
SuspendLocationColumn; accessed in MetadataConstraints
---
 .../org/apache/accumulo/core/metadata/schema/MetadataSchema.java     | 5 +++--
 .../org/apache/accumulo/server/constraints/MetadataConstraints.java  | 3 +--
 2 files changed, 4 insertions(+), 4 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 e4356c5247..4d5a3dea3f 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
@@ -262,8 +262,9 @@ public class MetadataSchema {
      */
     public static class SuspendLocationColumn {
       public static final String STR_NAME = "suspend";
-      public static final ColumnFQ SUSPEND_COLUMN =
-          new ColumnFQ(new Text(STR_NAME), new Text("loc"));
+      public static final Text NAME = new Text(STR_NAME);
+      public static final String SUSPEND_QUAL = "loc";
+      public static final ColumnFQ SUSPEND_COLUMN = new ColumnFQ(NAME, new 
Text(SUSPEND_QUAL));
     }
 
     /**
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
 
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index 0e18fa0a01..8395a8b407 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -377,8 +377,7 @@ public class MetadataConstraints implements Constraint {
   private void validateSuspendLocationFamily(ArrayList<Short> violations,
       ColumnUpdate columnUpdate) {
     String qualStr = new String(columnUpdate.getColumnQualifier(), UTF_8);
-    String suspendColQualStr =
-        new 
String(SuspendLocationColumn.SUSPEND_COLUMN.getColumnQualifier().getBytes(), 
UTF_8);
+    String suspendColQualStr = SuspendLocationColumn.SUSPEND_QUAL;
 
     if (qualStr.equals(suspendColQualStr)) {
       try {