(accumulo) 01/01: Merge branch '3.1'

[ddanielr]

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

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

commit 8f2abfc1a66b801bb78702e0bf93b3202e7b8a48
Merge: 8a19bc9368 e2d7cd3d99
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Fri Dec 6 19:40:54 2024 +0000

    Merge branch '3.1'

 .../apache/accumulo/core/util/cleaner/CleanerUtil.java  |  9 ---------
 .../server/constraints/MetadataConstraints.java         | 17 ++---------------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index 27c1e925f7,5e09a27700..f91828361f
--- 
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
@@@ -33,8 -32,6 +33,7 @@@ import org.apache.accumulo.core.data.Mu
  import org.apache.accumulo.core.data.Value;
  import org.apache.accumulo.core.data.constraints.Constraint;
  import org.apache.accumulo.core.dataImpl.KeyExtent;
 +import org.apache.accumulo.core.fate.FateId;
- import org.apache.accumulo.core.fate.zookeeper.ZooCache;
  import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
  import org.apache.accumulo.core.lock.ServiceLock;
  import org.apache.accumulo.core.metadata.AccumuloTable;
@@@ -54,17 -50,9 +53,16 @@@ import org.apache.accumulo.core.metadat
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.MergedColumnFamily;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ScanFileColumnFamily;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.SplitColumnFamily;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.SuspendLocationColumn;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Upgrade12to13;
 +import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.UserCompactionRequestedColumnFamily;
 +import org.apache.accumulo.core.metadata.schema.SelectedFiles;
 +import org.apache.accumulo.core.metadata.schema.TabletOperationId;
 +import org.apache.accumulo.core.metadata.schema.TabletOperationType;
 +import org.apache.accumulo.core.metadata.schema.UnSplittableMetadata;
  import org.apache.accumulo.core.util.ColumnFQ;
- import org.apache.accumulo.core.util.cleaner.CleanerUtil;
  import org.apache.accumulo.server.ServerContext;
  import org.apache.hadoop.io.Text;
  import org.slf4j.Logger;