Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ public final Object transform(InternalRow row) {
return null;
}

String sourceJavaString = sourceString.toString();
int sourceLength = sourceString.numChars();
int beginIndex = readPosition(inputs.get(1), row);
if (beginIndex > sourceJavaString.length()) {
if (beginIndex > sourceLength) {
return BinaryString.EMPTY_UTF8;
}

int endIndex = sourceJavaString.length();
int endIndex = sourceLength;
if (hasLength) {
endIndex = beginIndex + readPosition(inputs.get(2), row) - 1;
}
endIndex = Math.min(endIndex, sourceJavaString.length());
endIndex = Math.min(endIndex, sourceLength);
beginIndex--;
checkArgument(beginIndex < endIndex);

return BinaryString.fromString(sourceJavaString.substring(beginIndex, endIndex));
return sourceString.substring(beginIndex, endIndex);
}

private static boolean isNullPosition(Object position, InternalRow row) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import static org.assertj.core.api.Assertions.assertThat;
Expand Down Expand Up @@ -82,6 +83,14 @@ public void testNormalInputs() {
assertThat(result).isEqualTo(BinaryString.fromString(""));
}

@Test
public void testSubstringWithSupplementaryCharacter() {
SubstringTransform transform =
new SubstringTransform(Arrays.asList(BinaryString.fromString("A😀B"), 2, 1));

assertThat(transform.transform(GenericRow.of())).isEqualTo(BinaryString.fromString("😀"));
}

@Test
public void testSubstringRefInputs() {
List<Object> inputs = new ArrayList<>();
Expand Down
Loading