Skip to content

HDDS-5479. s3g bucket list failed when there is non-english key name. #2450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChenSammi merged 1 commit into from
Jul 23, 2021
Merged

HDDS-5479. s3g bucket list failed when there is non-english key name. #2450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/ContinueToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,16 @@ public ContinueToken(String lastKey, String lastDir) {
public String encodeToString() {
if (this.lastKey != null) {

ByteBuffer buffer = ByteBuffer
.allocate(4 + lastKey.length()
+ (lastDir == null ? 0 : lastDir.length()));
buffer.putInt(lastKey.length());
buffer.put(lastKey.getBytes(StandardCharsets.UTF_8));
byte[] rawLastKey = lastKey.getBytes(StandardCharsets.UTF_8);
byte[] rawLastDir = (lastDir == null ? new byte[0] :
lastDir.getBytes(StandardCharsets.UTF_8));

ByteBuffer buffer = ByteBuffer.allocate(
4 + rawLastKey.length + rawLastDir.length);
buffer.putInt(rawLastKey.length);
buffer.put(rawLastKey);
if (lastDir != null) {
buffer.put(lastDir.getBytes(StandardCharsets.UTF_8));
buffer.put(rawLastDir);
}

String hex = Hex.encodeHexString(buffer.array());
Expand Down
20 changes: 20 additions & 0 deletions hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestContinueToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,26 @@ public void encodeDecode() throws OS3Exception {
Assert.assertEquals(ct, parsedToken);
}

@Test
public void encodeDecodeWithNonEnglishOne() throws OS3Exception {
ContinueToken ct = new ContinueToken("你好", null);

ContinueToken parsedToken =
ContinueToken.decodeFromString(ct.encodeToString());

Assert.assertEquals(ct, parsedToken);
}

@Test
public void encodeDecodeWithNonEnglishTwo() throws OS3Exception {
ContinueToken ct = new ContinueToken("你好", "上海");

ContinueToken parsedToken =
ContinueToken.decodeFromString(ct.encodeToString());

Assert.assertEquals(ct, parsedToken);
}

@Test
public void encodeDecodeNullDir() throws OS3Exception {
ContinueToken ct = new ContinueToken("key1", null);
Expand Down