This is an automated email from the ASF dual-hosted git repository.
cshannon pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push:
new 73125e90ef Update tests to handle new range validation added in (#4626)
73125e90ef is described below
commit 73125e90efda2a79796172915e534a0216361764
Author: Christopher L. Shannon <cshan...@apache.org>
AuthorDate: Sun Jun 2 11:14:35 2024 -0400
Update tests to handle new range validation added in (#4626)
---
test/src/main/java/org/apache/accumulo/test/ImportExportIT.java | 9 ++++++---
test/src/main/java/org/apache/accumulo/test/SampleIT.java | 6 +++---
.../apache/accumulo/test/compaction/ExternalCompaction_1_IT.java | 6 +++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
index 4fc909c4d5..8e5b076557 100644
--- a/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ImportExportIT.java
@@ -463,8 +463,11 @@ public class ImportExportIT extends AccumuloClusterHarness
{
private Set<Range> createRanges() {
// Split file into ranges of 10000, 20000, and 5000 for a total of 35000
return Set.of(
- new Range("row_" + String.format("%010d", 100), "row_" +
String.format("%010d", 199)),
- new Range("row_" + String.format("%010d", 300), "row_" +
String.format("%010d", 499)),
- new Range("row_" + String.format("%010d", 700), "row_" +
String.format("%010d", 749)));
+ new Range("row_" + String.format("%010d", 99), false, "row_" +
String.format("%010d", 199),
+ true),
+ new Range("row_" + String.format("%010d", 299), false, "row_" +
String.format("%010d", 499),
+ true),
+ new Range("row_" + String.format("%010d", 699), false, "row_" +
String.format("%010d", 749),
+ true));
}
}
diff --git a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
index c4f4a5fbd6..30908254db 100644
--- a/test/src/main/java/org/apache/accumulo/test/SampleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/SampleIT.java
@@ -160,8 +160,8 @@ public class SampleIT extends AccumuloClusterHarness {
client.tableOperations().flush(tableName, null, null, true);
// Fence off the data to a Range that is a subset of the original data
- Range fenced = new Range(new Text(String.format("r_%06d", 3000)),
- new Text(String.format("r_%06d", 6000)));
+ Range fenced = new Range(new Text(String.format("r_%06d", 2999)),
false,
+ new Text(String.format("r_%06d", 6000)), true);
FileMetadataUtil.splitFilesIntoRanges(getServerContext(), tableName,
Set.of(fenced));
assertEquals(1, countFiles(getServerContext(), tableName));
@@ -620,7 +620,7 @@ public class SampleIT extends AccumuloClusterHarness {
for (int i = 0; i < splits; i++) {
Text start = i > 0 ? new Text(String.format("r_%06d", i * 1000)) : null;
Text end = i < splits - 1 ? new Text(String.format("r_%06d", (i + 1) *
1000)) : null;
- ranges.add(new Range(start, end));
+ ranges.add(new Range(start, false, end, true));
}
return ranges;
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
index a1a85e7b1c..f712777e85 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
@@ -473,13 +473,13 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
// Split file in table1 into two files each fenced off by 100 rows for a
total of 200
splitFilesIntoRanges(getCluster().getServerContext(), table1,
- Set.of(new Range(new Text(row(100)), new Text(row(199))),
- new Range(new Text(row(300)), new Text(row(399)))));
+ Set.of(new Range(new Text(row(99)), false, new Text(row(199)), true),
+ new Range(new Text(row(299)), false, new Text(row(399)), true)));
assertEquals(2, countFencedFiles(getCluster().getServerContext(),
table1));
// Fence file in table2 to 600 rows
splitFilesIntoRanges(getCluster().getServerContext(), table2,
- Set.of(new Range(new Text(row(200)), new Text(row(799)))));
+ Set.of(new Range(new Text(row(199)), false, new Text(row(799)),
true)));
assertEquals(1, countFencedFiles(getCluster().getServerContext(),
table2));
// Verify that a subset of the data is now seen after fencing
