This is an automated email from the ASF dual-hosted git repository. jmark99 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a7a58d6dd7b918072712549c2b08913e58bfcece Merge: 476ebf2001 d15493b275 Author: Mark Owens <jmar...@apache.org> AuthorDate: Tue Feb 14 09:40:05 2023 -0500 Merge branch '2.1' .../core/client/sample/AbstractHashSampler.java | 37 +++++----- .../core/client/sample/RowColumnSampler.java | 5 +- .../apache/accumulo/test/shell/ShellServerIT.java | 79 +++++++++++++++++++++- 3 files changed, 101 insertions(+), 20 deletions(-) diff --cc test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java index 6c1cae6764,d24363a169..129eff219b --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java @@@ -879,8 -889,20 +880,8 @@@ public class ShellServerIT extends Shar assertEquals(3, countFiles(clone2Id)); } - @Test - public void testCompactionSelectionAndStrategy() throws Exception { - - final String table = getUniqueNames(1)[0]; - - ts.exec("createtable " + table); - - // expect this to fail - ts.exec("compact -t " + table + " -w --sf-ename F.* -s " - + TestCompactionStrategy.class.getName() + " -sc inputPrefix=F,dropPrefix=A", false); - } - @Test - public void testScanScample() throws Exception { + public void testScanSample() throws Exception { final String table = getUniqueNames(1)[0]; // compact