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

[ddanielr]

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

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

commit 553078d6a81a361c46c8ada9b23f8ea0a371947c
Merge: f66a51409a f3bd1b8dff
Author: Daniel Roberts ddanielr <ddani...@gmail.com>
AuthorDate: Tue Jan 14 13:18:19 2025 +0000

    Merge branch '2.1' into 3.1

 .../main/java/org/apache/accumulo/shell/Shell.java |  5 +-
 .../org/apache/accumulo/test/shell/MockShell.java  |  2 -
 .../apache/accumulo/test/shell/ShellServerIT.java  | 64 +++++++++++-----------
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
index 9433b0b351,c275558186..5b41b20d85
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
@@@ -1566,9 -1659,9 +1566,9 @@@ public class ShellServerIT extends Shar
  
      ts.exec("insert foo f q v", true);
  
 -    sleepUninterruptibly(250, TimeUnit.MILLISECONDS);
 +    Thread.sleep(250);
  
-     ts.exec("scan -np", true, "foo", false);
+     ts.exec("scan ", true, "foo", false);
  
      ts.exec("constraint -a FooConstraint", true);
  
@@@ -1756,10 -1855,14 +1756,10 @@@
      assertTrue(result.contains("value"));
  
      setupRealContextPath();
 -    // Define a new classloader context, but don't set it on the table
 -    result = ts.exec("config -s " + VFS_CONTEXT_CLASSPATH_PROPERTY + 
REAL_CONTEXT + "="
 -        + REAL_CONTEXT_CLASSPATH);
 -    assertEquals("root@miniInstance " + tableName + "> config -s " + 
VFS_CONTEXT_CLASSPATH_PROPERTY
 -        + REAL_CONTEXT + "=" + REAL_CONTEXT_CLASSPATH + "\n", result);
 +
      // Override the table classloader context with the REAL implementation of
      // ValueReversingIterator, which does reverse the value.
-     result = ts.exec("scan -pn baz -np -b row1 -e row1 -cc " + REAL_CONTEXT);
+     result = ts.exec("scan -pn baz -b row1 -e row1 -cc " + REAL_CONTEXT);
      assertEquals(2, result.split("\n").length);
      assertTrue(result.contains("eulav"));
      assertFalse(result.contains("value"));
@@@ -1931,8 -2046,7 +1931,8 @@@
    private List<String> getFiles(String tableId) {
      ts.output.clear();
  
-     ts.exec("scan -t " + AccumuloTable.METADATA.tableName() + " -np -c file 
-b " + tableId + " -e "
 -    ts.exec("scan -t " + MetadataTable.NAME + " -c file -b " + tableId + " -e 
" + tableId + "~");
++    ts.exec("scan -t " + AccumuloTable.METADATA.tableName() + " -c file -b " 
+ tableId + " -e "
 +        + tableId + "~");
  
      log.debug("countFiles(): {}", ts.output.get());