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

[kturner]

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

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

commit 978f8b9ecaac2518ad3f2559512cf11d5fdd3901
Merge: d91178f44c f28b55dc25
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Tue Feb 13 17:12:35 2024 +0000

    Merge branch '2.1'

 .../accumulo/test/functional/CompactionIT.java       | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index 6df72f17d9,46aa609e2c..18fdff715d
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@@ -81,9 -69,9 +81,10 @@@ import org.apache.accumulo.core.iterato
  import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
  import org.apache.accumulo.core.iterators.user.AgeOffFilter;
  import org.apache.accumulo.core.iterators.user.GrepIterator;
 -import org.apache.accumulo.core.metadata.MetadataTable;
 +import org.apache.accumulo.core.metadata.AccumuloTable;
 +import org.apache.accumulo.core.metadata.StoredTabletFile;
  import org.apache.accumulo.core.metadata.schema.Ample;
+ import org.apache.accumulo.core.metadata.schema.MetadataSchema;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
  import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
  import org.apache.accumulo.core.metadata.schema.TabletMetadata;
@@@ -985,9 -715,14 +986,14 @@@ public class CompactionIT extends Accum
      }
    }
  
-   private int countFiles(AccumuloClient c) throws Exception {
+   /**
+    * Counts the number of tablets and files in a table.
+    */
+   private int countFiles(AccumuloClient c, String tableName) throws Exception 
{
+     var tableId = getCluster().getServerContext().getTableId(tableName);
 -    try (Scanner s = c.createScanner(MetadataTable.NAME, 
Authorizations.EMPTY)) {
 +    try (Scanner s = c.createScanner(AccumuloTable.METADATA.tableName(), 
Authorizations.EMPTY)) {
-       s.fetchColumnFamily(new Text(TabletColumnFamily.NAME));
+       s.setRange(MetadataSchema.TabletsSection.getRange(tableId));
+       TabletColumnFamily.PREV_ROW_COLUMN.fetch(s);
        s.fetchColumnFamily(new Text(DataFileColumnFamily.NAME));
        return Iterators.size(s.iterator());
      }