forked from apache/beam
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[flink] add support for Flink 1.17 (apache#29939)
- Loading branch information
Showing
10 changed files
with
233 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 50 additions & 0 deletions
50
...apache/beam/runners/flink/translation/types/compat/UnversionedTypeSerializerSnapshot.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| /* | ||
| * 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.beam.runners.flink.translation.types.compat; | ||
|
|
||
| import org.apache.beam.runners.flink.translation.types.CoderTypeSerializer; | ||
| import org.apache.flink.api.common.typeutils.TypeSerializer; | ||
| import org.apache.flink.api.common.typeutils.TypeSerializerConfigSnapshot; | ||
| import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; | ||
| import org.apache.flink.core.io.VersionedIOReadableWritable; | ||
|
|
||
| /** A legacy snapshot which does not care about schema compatibility. */ | ||
| @SuppressWarnings("allcheckers") | ||
| public class UnversionedTypeSerializerSnapshot<T> extends TypeSerializerConfigSnapshot<T> { | ||
|
|
||
| /** Needs to be public to work with {@link VersionedIOReadableWritable}. */ | ||
| public UnversionedTypeSerializerSnapshot() {} | ||
|
|
||
| @SuppressWarnings("initialization") | ||
| public UnversionedTypeSerializerSnapshot(CoderTypeSerializer<T> serializer) { | ||
| super.setPriorSerializer(serializer); | ||
| } | ||
|
|
||
| @Override | ||
| public int getVersion() { | ||
| // We always return the same version | ||
| return 1; | ||
| } | ||
|
|
||
| @Override | ||
| public TypeSerializerSchemaCompatibility<T> resolveSchemaCompatibility( | ||
| TypeSerializer<T> newSerializer) { | ||
| // We assume compatibility because we don't have a way of checking schema compatibility | ||
| return TypeSerializerSchemaCompatibility.compatibleAsIs(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| def basePath = '..' | ||
|
|
||
| /* All properties required for loading the Flink build script */ | ||
| project.ext { | ||
| // Set the version of all Flink-related dependencies here. | ||
| flink_version = '1.17.0' | ||
| // Version specific code overrides. | ||
| main_source_overrides = ["${basePath}/1.14/src/main/java", "${basePath}/1.15/src/main/java", "${basePath}/1.16/src/main/java", './src/main/java'] | ||
| test_source_overrides = ["${basePath}/1.14/src/test/java", "${basePath}/1.15/src/test/java", "${basePath}/1.16/src/test/java", './src/test/java'] | ||
| main_resources_overrides = [] | ||
| test_resources_overrides = [] | ||
| archives_base_name = 'beam-runners-flink-1.17' | ||
| } | ||
|
|
||
| // Load the main build script which contains all build logic. | ||
| apply from: "$basePath/flink_runner.gradle" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| def basePath = '../../job-server-container' | ||
|
|
||
| project.ext { | ||
| resource_path = basePath | ||
| } | ||
|
|
||
| // Load the main build script which contains all build logic. | ||
| apply from: "$basePath/flink_job_server_container.gradle" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| def basePath = '../../job-server' | ||
|
|
||
| project.ext { | ||
| // Look for the source code in the parent module | ||
| main_source_dirs = ["$basePath/src/main/java"] | ||
| test_source_dirs = ["$basePath/src/test/java"] | ||
| main_resources_dirs = ["$basePath/src/main/resources"] | ||
| test_resources_dirs = ["$basePath/src/test/resources"] | ||
| archives_base_name = 'beam-runners-flink-1.17-job-server' | ||
| } | ||
|
|
||
| // Load the main build script which contains all build logic. | ||
| apply from: "$basePath/flink_job_server.gradle" |
81 changes: 81 additions & 0 deletions
81
...apache/beam/runners/flink/translation/types/compat/UnversionedTypeSerializerSnapshot.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * 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.beam.runners.flink.translation.types.compat; | ||
|
|
||
| import java.io.IOException; | ||
| import org.apache.beam.runners.flink.translation.types.CoderTypeSerializer; | ||
| import org.apache.beam.sdk.util.SerializableUtils; | ||
| import org.apache.flink.api.common.typeutils.TypeSerializer; | ||
| import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility; | ||
| import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot; | ||
| import org.apache.flink.core.memory.DataInputView; | ||
| import org.apache.flink.core.memory.DataOutputView; | ||
|
|
||
| /** A legacy snapshot which does not care about schema compatibility. */ | ||
| @SuppressWarnings("allcheckers") | ||
| public class UnversionedTypeSerializerSnapshot<T> implements TypeSerializerSnapshot<T> { | ||
|
|
||
| private CoderTypeSerializer<T> serializer = null; | ||
|
|
||
| /** Needs to be public to work with {@link VersionedIOReadableWritable}. */ | ||
| public UnversionedTypeSerializerSnapshot() {} | ||
|
|
||
| @SuppressWarnings("initialization") | ||
| public UnversionedTypeSerializerSnapshot(CoderTypeSerializer<T> serializer) { | ||
| this.serializer = serializer; | ||
| } | ||
|
|
||
| @Override | ||
| public int getCurrentVersion() { | ||
| // We always return the same version | ||
| return 1; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeSnapshot(DataOutputView dataOutputView) throws IOException { | ||
| byte[] bytes = SerializableUtils.serializeToByteArray(serializer); | ||
| dataOutputView.writeInt(getCurrentVersion()); | ||
| dataOutputView.writeInt(bytes.length); | ||
| dataOutputView.write(bytes); | ||
| } | ||
|
|
||
| @Override | ||
| public void readSnapshot(int i, DataInputView dataInputView, ClassLoader classLoader) | ||
| throws IOException { | ||
| // discard version | ||
| dataInputView.readInt(); | ||
| int length = dataInputView.readInt(); | ||
| byte[] bytes = new byte[length]; | ||
| dataInputView.readFully(bytes); | ||
| this.serializer = | ||
| (CoderTypeSerializer<T>) | ||
| SerializableUtils.deserializeFromByteArray(bytes, "CoderTypeSerializer"); | ||
| } | ||
|
|
||
| @Override | ||
| public TypeSerializer<T> restoreSerializer() { | ||
| return serializer; | ||
| } | ||
|
|
||
| @Override | ||
| public TypeSerializerSchemaCompatibility<T> resolveSchemaCompatibility( | ||
| TypeSerializer<T> newSerializer) { | ||
| // We assume compatibility because we don't have a way of checking schema compatibility | ||
| return TypeSerializerSchemaCompatibility.compatibleAsIs(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters