rich7420 commented on code in PR #11715:
URL: https://github.com/apache/ozone/pull/11715#discussion_r4366207232
##########
hadoop-ozone/integration-test-s3/src/test/java/org/apache/hadoop/ozone/s3/awssdk/v2/AbstractS3SDKV2Tests.java:
##########
@@ -1727,6 +1729,51 @@ public void testListObjectsV2FetchOwner() {
assertEquals(S3Owner.DEFAULT_S3OWNER_ID,
trueResponse.contents().get(0).owner().id());
}
+ /**
+ * StartAfter (and the V1 Marker) sorts before Prefix on a different branch,
and the bucket has keys
+ * between them that do not match Prefix. AWS returns every key and common
prefix that matches Prefix
+ * and sorts after StartAfter.
+ */
+ @ParameterizedTest
+ @EnumSource(value = BucketLayout.class, names = {"OBJECT_STORE",
"FILE_SYSTEM_OPTIMIZED"})
+ public void testListObjectsStartAfterBeforePrefix(BucketLayout layout)
throws Exception {
+ final String bucketName = getBucketName("start-after");
+ try (OzoneClient ozoneClient = cluster.newClient()) {
+ ozoneClient.getObjectStore().getS3Volume().createBucket(bucketName,
+ BucketArgs.newBuilder().setBucketLayout(layout).build());
+ }
+ for (String key : Arrays.asList("dir1/dir2/file1", "dir1/file2",
"dir1bh/file1", "dir1bha/file1", "dir2/file1")) {
+ s3Client.putObject(b -> b.bucket(bucketName).key(key),
RequestBody.fromString("x"));
+ }
+ final String prefix = "dir1bh";
+ final String startAfter = "dir1/dir2/file1";
+
+ ListObjectsV2Response v2WithDelimiter = s3Client.listObjectsV2(b ->
b.bucket(bucketName)
+ .prefix(prefix).delimiter("/").startAfter(startAfter));
+
assertThat(v2WithDelimiter.commonPrefixes()).extracting(CommonPrefix::prefix)
+ .containsExactly("dir1bh/", "dir1bha/");
+ assertThat(v2WithDelimiter.contents()).isEmpty();
+
+ ListObjectsResponse v1WithDelimiter = s3Client.listObjects(b ->
b.bucket(bucketName)
+ .prefix(prefix).delimiter("/").marker(startAfter));
+
assertThat(v1WithDelimiter.commonPrefixes()).extracting(CommonPrefix::prefix)
+ .containsExactly("dir1bh/", "dir1bha/");
+
+ // A non-delimited FSO listing of a Prefix that is also a directory lists
only that directory,
Review Comment:
FYI, filed [HDDS-17413](https://issues.apache.org/jira/browse/HDDS-17413)
for this FSO gap.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
