Skip to content

[FLINK-40597][core] Fix input type validation for Types.UUID #29133

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

Open
dylanhz wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −3
Open

[FLINK-40597][core] Fix input type validation for Types.UUID #29133

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
13 changes: 10 additions & 3 deletions flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

import static org.apache.flink.api.java.typeutils.TypeExtractionUtils.checkAndExtractLambda;
import static org.apache.flink.api.java.typeutils.TypeExtractionUtils.getAllDeclaredMethods;
Expand Down Expand Up @@ -1498,10 +1499,16 @@ private static void validateInfo(
// check for Java Basic Types
if (typeInfo instanceof BasicTypeInfo) {

TypeInformation<?> actual;
// check if basic type at all
if (!(type instanceof Class<?>)
|| (actual = BasicTypeInfo.getInfoFor((Class<?>) type)) == null) {
if (!(type instanceof Class<?>)) {
throw new InvalidTypesException("Basic type expected.");
}
// UUID is not registered for automatic extraction to preserve existing serializers.
final TypeInformation<?> actual =
type == UUID.class
? BasicTypeInfo.UUID_TYPE_INFO
: BasicTypeInfo.getInfoFor((Class<?>) type);
if (actual == null) {
throw new InvalidTypesException("Basic type expected.");
}
// check if correct basic type
Expand Down
26 changes: 26 additions & 0 deletions flink-streaming-java/src/test/java/org/apache/flink/streaming/api/DataStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
import java.lang.reflect.Method;
import java.time.Duration;
import java.util.List;
import java.util.UUID;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
Expand Down Expand Up @@ -836,6 +837,31 @@ public Long reduce(Long value1, Long value2) throws Exception {
.isEqualTo(preferredResource7);
}

@Test
void testMapWithExplicitUuidType() {
final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
// A lambda would bypass the input validation exercised by this test.
final MapFunction<UUID, String> mapper =
new MapFunction<UUID, String>() {
@Override
public String map(UUID value) {
return value.toString();
}
};

final DataStream<String> stream = env.fromData(Types.UUID, new UUID(0L, 0L)).map(mapper);

assertThat(stream.getType()).isEqualTo(Types.STRING);
}

@Test
void testUuidIsNotAutomaticallyExtracted() {
final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();

assertThat(env.fromData(new UUID(0L, 0L)).getType())
.isEqualTo(new GenericTypeInfo<>(UUID.class));
}

@Test
void testTypeInfo() {
StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
Expand Down