Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
301be555
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
301be555
编写于
1月 07, 2019
作者:
T
Tzu-Li (Gordon) Tai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-11073] [core] Replace EitherSerializerSnapshot with new JavaEitherSerializerSnapshot
上级
e791b1a2
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
72 addition
and
9 deletion
+72
-9
flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java
...he/flink/api/java/typeutils/runtime/EitherSerializer.java
+2
-2
flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerSnapshot.java
.../api/java/typeutils/runtime/EitherSerializerSnapshot.java
+7
-5
flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaEitherSerializerSnapshot.java
.../java/typeutils/runtime/JavaEitherSerializerSnapshot.java
+61
-0
flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshotMigrationTest.java
...peutils/CompositeTypeSerializerSnapshotMigrationTest.java
+2
-2
未找到文件。
flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializer.java
浏览文件 @
301be555
...
@@ -205,7 +205,7 @@ public class EitherSerializer<L, R> extends TypeSerializer<Either<L, R>> {
...
@@ -205,7 +205,7 @@ public class EitherSerializer<L, R> extends TypeSerializer<Either<L, R>> {
// ------------------------------------------------------------------------
// ------------------------------------------------------------------------
@Override
@Override
public
EitherSerializerSnapshot
<
L
,
R
>
snapshotConfiguration
()
{
public
Java
EitherSerializerSnapshot
<
L
,
R
>
snapshotConfiguration
()
{
return
new
EitherSerializerSnapshot
<>(
leftSerializer
,
rightSerializer
);
return
new
JavaEitherSerializerSnapshot
<>(
this
);
}
}
}
}
flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/EitherSerializerSnapshot.java
浏览文件 @
301be555
...
@@ -35,8 +35,12 @@ import static org.apache.flink.util.Preconditions.checkState;
...
@@ -35,8 +35,12 @@ import static org.apache.flink.util.Preconditions.checkState;
/**
/**
* Configuration snapshot for the {@link EitherSerializer}.
* Configuration snapshot for the {@link EitherSerializer}.
*
* @deprecated this snapshot class is no longer used by any serializers.
* Instead, {@link JavaEitherSerializerSnapshot} is used.
*/
*/
@Internal
@Internal
@Deprecated
public
final
class
EitherSerializerSnapshot
<
L
,
R
>
implements
TypeSerializerSnapshot
<
Either
<
L
,
R
>>
{
public
final
class
EitherSerializerSnapshot
<
L
,
R
>
implements
TypeSerializerSnapshot
<
Either
<
L
,
R
>>
{
private
static
final
int
CURRENT_VERSION
=
2
;
private
static
final
int
CURRENT_VERSION
=
2
;
...
@@ -110,12 +114,10 @@ public final class EitherSerializerSnapshot<L, R> implements TypeSerializerSnaps
...
@@ -110,12 +114,10 @@ public final class EitherSerializerSnapshot<L, R> implements TypeSerializerSnaps
checkState
(
nestedSnapshot
!=
null
);
checkState
(
nestedSnapshot
!=
null
);
if
(
newSerializer
instanceof
EitherSerializer
)
{
if
(
newSerializer
instanceof
EitherSerializer
)
{
// delegate compatibility check to the new snapshot class
EitherSerializer
<
L
,
R
>
serializer
=
(
EitherSerializer
<
L
,
R
>)
newSerializer
;
EitherSerializer
<
L
,
R
>
serializer
=
(
EitherSerializer
<
L
,
R
>)
newSerializer
;
JavaEitherSerializerSnapshot
<
L
,
R
>
newSnapshot
=
new
JavaEitherSerializerSnapshot
<>(
serializer
);
return
nestedSnapshot
.
resolveCompatibilityWithNested
(
return
newSnapshot
.
resolveSchemaCompatibility
(
serializer
);
TypeSerializerSchemaCompatibility
.
compatibleAsIs
(),
serializer
.
getLeftSerializer
(),
serializer
.
getRightSerializer
());
}
}
else
{
else
{
return
TypeSerializerSchemaCompatibility
.
incompatible
();
return
TypeSerializerSchemaCompatibility
.
incompatible
();
...
...
flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/JavaEitherSerializerSnapshot.java
0 → 100644
浏览文件 @
301be555
/*
* 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.api.java.typeutils.runtime
;
import
org.apache.flink.api.common.typeutils.CompositeTypeSerializerSnapshot
;
import
org.apache.flink.api.common.typeutils.TypeSerializer
;
import
org.apache.flink.types.Either
;
/**
* Snapshot class for the {@link EitherSerializer}.
*/
public
class
JavaEitherSerializerSnapshot
<
L
,
R
>
extends
CompositeTypeSerializerSnapshot
<
Either
<
L
,
R
>,
EitherSerializer
>
{
private
static
final
int
CURRENT_VERSION
=
1
;
/**
* Constructor for read instantiation.
*/
@SuppressWarnings
(
"unused"
)
public
JavaEitherSerializerSnapshot
()
{
super
(
EitherSerializer
.
class
);
}
/**
* Constructor to create the snapshot for writing.
*/
public
JavaEitherSerializerSnapshot
(
EitherSerializer
<
L
,
R
>
eitherSerializer
)
{
super
(
eitherSerializer
);
}
@Override
protected
int
getCurrentOuterSnapshotVersion
()
{
return
CURRENT_VERSION
;
}
@Override
protected
EitherSerializer
createOuterSerializerWithNestedSerializers
(
TypeSerializer
<?>[]
nestedSerializers
)
{
return
new
EitherSerializer
<>(
nestedSerializers
[
0
],
nestedSerializers
[
1
]);
}
@Override
protected
TypeSerializer
<?>[]
getNestedSerializers
(
EitherSerializer
outerSerializer
)
{
return
new
TypeSerializer
<?>[]{
outerSerializer
.
getLeftSerializer
(),
outerSerializer
.
getRightSerializer
()
};
}
}
flink-core/src/test/java/org/apache/flink/api/common/typeutils/CompositeTypeSerializerSnapshotMigrationTest.java
浏览文件 @
301be555
...
@@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeutils.base.GenericArraySerializerSnapshot
...
@@ -23,7 +23,7 @@ import org.apache.flink.api.common.typeutils.base.GenericArraySerializerSnapshot
import
org.apache.flink.api.common.typeutils.base.IntSerializer
;
import
org.apache.flink.api.common.typeutils.base.IntSerializer
;
import
org.apache.flink.api.common.typeutils.base.StringSerializer
;
import
org.apache.flink.api.common.typeutils.base.StringSerializer
;
import
org.apache.flink.api.java.typeutils.runtime.EitherSerializer
;
import
org.apache.flink.api.java.typeutils.runtime.EitherSerializer
;
import
org.apache.flink.api.java.typeutils.runtime.EitherSerializerSnapshot
;
import
org.apache.flink.api.java.typeutils.runtime.
Java
EitherSerializerSnapshot
;
import
org.apache.flink.types.Either
;
import
org.apache.flink.types.Either
;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
...
@@ -48,7 +48,7 @@ public class CompositeTypeSerializerSnapshotMigrationTest extends TypeSerializer
...
@@ -48,7 +48,7 @@ public class CompositeTypeSerializerSnapshotMigrationTest extends TypeSerializer
// Either<String, Integer>
// Either<String, Integer>
final
TestSpecification
<
Either
<
String
,
Integer
>>
either
=
TestSpecification
.<
Either
<
String
,
Integer
>>
builder
(
"1.6-either"
,
EitherSerializer
.
class
,
EitherSerializerSnapshot
.
class
)
final
TestSpecification
<
Either
<
String
,
Integer
>>
either
=
TestSpecification
.<
Either
<
String
,
Integer
>>
builder
(
"1.6-either"
,
EitherSerializer
.
class
,
Java
EitherSerializerSnapshot
.
class
)
.
withSerializerProvider
(()
->
new
EitherSerializer
<>(
StringSerializer
.
INSTANCE
,
IntSerializer
.
INSTANCE
))
.
withSerializerProvider
(()
->
new
EitherSerializer
<>(
StringSerializer
.
INSTANCE
,
IntSerializer
.
INSTANCE
))
.
withSnapshotDataLocation
(
"flink-1.6-either-type-serializer-snapshot"
)
.
withSnapshotDataLocation
(
"flink-1.6-either-type-serializer-snapshot"
)
.
withTestData
(
"flink-1.6-either-type-serializer-data"
,
10
);
.
withTestData
(
"flink-1.6-either-type-serializer-data"
,
10
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录