kl0u commented on a change in pull request #13825: URL: https://github.com/apache/flink/pull/13825#discussion_r513479320
########## File path: flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java ########## @@ -0,0 +1,163 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.core.io; + +import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.util.InstantiationUtil; + +import java.io.IOException; +import java.io.Serializable; +import java.util.function.Supplier; + +/** + * A {@link TypeSerializer} that delegates to an underlying {@link SimpleVersionedSerializer}. + */ +@Internal +public class SimpleVersionedSerializerTypeSerializerProxy<T> extends TypeSerializer<T> implements Serializable { + + private final SerializableSupplier<SimpleVersionedSerializer<T>> serializerSupplier; + private transient SimpleVersionedSerializer<T> cachedSerializer; + + public SimpleVersionedSerializerTypeSerializerProxy( + SerializableSupplier<SimpleVersionedSerializer<T>> serializerSupplier) { + this.serializerSupplier = serializerSupplier; Review comment: I would add a `checkNotNull` here to be safe. ########## File path: flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java ########## @@ -0,0 +1,163 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.core.io; + +import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.util.InstantiationUtil; + +import java.io.IOException; +import java.io.Serializable; +import java.util.function.Supplier; + +/** + * A {@link TypeSerializer} that delegates to an underlying {@link SimpleVersionedSerializer}. + */ +@Internal +public class SimpleVersionedSerializerTypeSerializerProxy<T> extends TypeSerializer<T> implements Serializable { + + private final SerializableSupplier<SimpleVersionedSerializer<T>> serializerSupplier; + private transient SimpleVersionedSerializer<T> cachedSerializer; + + public SimpleVersionedSerializerTypeSerializerProxy( + SerializableSupplier<SimpleVersionedSerializer<T>> serializerSupplier) { + this.serializerSupplier = serializerSupplier; + } + + @Override + public boolean isImmutableType() { + return false; + } + + @Override + public TypeSerializer<T> duplicate() { + final byte[] serializedSerializer; + try { + serializedSerializer = InstantiationUtil.serializeObject(serializerSupplier); + } catch (IOException e) { + throw new RuntimeException("Could not serialize SimpleVersionedSerializer.", e); + } + try { + return new SimpleVersionedSerializerTypeSerializerProxy<>( + InstantiationUtil.deserializeObject( + serializedSerializer, + serializerSupplier.getClass().getClassLoader())); + } catch (ClassNotFoundException | IOException e) { + throw new RuntimeException("Could not duplicate SimpleVersionedSerializer.", e); + } + } + + @Override + public T createInstance() { + return null; + } + + @Override + public T copy(T from) { + SimpleVersionedSerializer<T> serializer = getSerializer(); + try { + byte[] serializedFrom = serializer.serialize(from); + return serializer.deserialize( + serializer.getVersion(), + serializedFrom); + } catch (IOException e) { + throw new RuntimeException("Could not copy element.", e); + } + } + + @Override + public T copy(T from, T reuse) { + // the reuse is optional, we can just ignore it + return copy(from); + } + + @Override + public int getLength() { + return -1; + } + + @Override + public void serialize(T record, DataOutputView target) throws IOException { + SimpleVersionedSerializer<T> serializer = getSerializer(); + target.writeInt(serializer.getVersion()); + byte[] serializedRecord = serializer.serialize(record); + target.writeInt(serializedRecord.length); + target.write(serializedRecord); + } + + @Override + public T deserialize(DataInputView source) throws IOException { + SimpleVersionedSerializer<T> serializer = getSerializer(); + int version = source.readInt(); + int length = source.readInt(); + byte[] serializedRecord = new byte[length]; + source.readFully(serializedRecord); + return serializer.deserialize(version, serializedRecord); + } + + @Override + public T deserialize(T reuse, DataInputView source) throws IOException { + // the reuse is optional, we can just ignore it + return deserialize(source); + } + + @Override + public void copy(DataInputView source, DataOutputView target) throws IOException { + target.writeInt(source.readInt()); // version + int length = source.readInt(); + target.writeInt(length); // length + byte[] serializedRecord = new byte[length]; + source.readFully(serializedRecord); + target.write(serializedRecord); + } + + @Override + public boolean equals(Object other) { + return other instanceof SimpleVersionedSerializerTypeSerializerProxy + && ((SimpleVersionedSerializerTypeSerializerProxy<?>) other).serializerSupplier + .get() + .equals(serializerSupplier.get()); + } + + @Override + public int hashCode() { + return serializerSupplier.get().hashCode(); + } + + @Override + public TypeSerializerSnapshot<T> snapshotConfiguration() { + throw new UnsupportedOperationException( + "SimpleVersionedSerializerWrapper is not meant to be used as a general TypeSerializer for state"); + } + + private SimpleVersionedSerializer<T> getSerializer() { + if (cachedSerializer != null) { + return cachedSerializer; + } + cachedSerializer = serializerSupplier.get(); + return cachedSerializer; + } + + @FunctionalInterface Review comment: If you want, maybe move it to a `Utils` class as it may be useful in other places as well. ########## File path: flink-core/src/main/java/org/apache/flink/core/io/SimpleVersionedSerializerTypeSerializerProxy.java ########## @@ -0,0 +1,163 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.core.io; + +import org.apache.flink.annotation.Internal; +import org.apache.flink.api.common.typeutils.TypeSerializer; +import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; +import org.apache.flink.core.memory.DataInputView; +import org.apache.flink.core.memory.DataOutputView; +import org.apache.flink.util.InstantiationUtil; + +import java.io.IOException; +import java.io.Serializable; +import java.util.function.Supplier; + +/** + * A {@link TypeSerializer} that delegates to an underlying {@link SimpleVersionedSerializer}. + */ +@Internal +public class SimpleVersionedSerializerTypeSerializerProxy<T> extends TypeSerializer<T> implements Serializable { Review comment: We do not need to implement `Serializable` because the `TypeSerializer` already does so. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
