Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
b0acd979
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,发现更多精彩内容 >>
提交
b0acd979
编写于
5月 27, 2016
作者:
R
Robert Metzger
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-3129] Fix breaking changes in flink-core
上级
6c079360
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
89 addition
and
9 deletion
+89
-9
flink-core/pom.xml
flink-core/pom.xml
+20
-0
flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
...ain/java/org/apache/flink/api/common/ExecutionConfig.java
+0
-4
flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java
...org/apache/flink/api/common/functions/RuntimeContext.java
+1
-0
flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
.../java/org/apache/flink/configuration/ConfigConstants.java
+6
-0
flink-core/src/main/java/org/apache/flink/types/DoubleValue.java
...ore/src/main/java/org/apache/flink/types/DoubleValue.java
+1
-1
flink-core/src/main/java/org/apache/flink/types/FloatValue.java
...core/src/main/java/org/apache/flink/types/FloatValue.java
+1
-1
flink-core/src/main/java/org/apache/flink/types/Key.java
flink-core/src/main/java/org/apache/flink/types/Key.java
+59
-0
flink-core/src/main/java/org/apache/flink/types/NormalizableKey.java
...src/main/java/org/apache/flink/types/NormalizableKey.java
+1
-1
flink-streaming-scala/pom.xml
flink-streaming-scala/pom.xml
+0
-1
pom.xml
pom.xml
+0
-1
未找到文件。
flink-core/pom.xml
浏览文件 @
b0acd979
...
...
@@ -112,6 +112,26 @@ under the License.
</execution>
</executions>
</plugin>
<!-- Exclude removed CONFIG_KEY from ccheck -->
<plugin>
<groupId>
com.github.siom79.japicmp
</groupId>
<artifactId>
japicmp-maven-plugin
</artifactId>
<configuration>
<parameter>
<excludes
combine.children=
"append"
>
<exclude>
org.apache.flink.api.common.ExecutionConfig#CONFIG_KEY
</exclude>
</excludes>
</parameter>
</configuration>
<executions>
<execution>
<phase>
verify
</phase>
<goals>
<goal>
cmp
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
...
...
flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
浏览文件 @
b0acd979
...
...
@@ -82,10 +82,6 @@ public class ExecutionConfig implements Serializable {
private
static
final
long
DEFAULT_RESTART_DELAY
=
10000L
;
// This field was used as a key for storing the EC in the Job Configuration
@Deprecated
public
static
final
String
CONFIG_KEY
=
"runtime.config"
;
// --------------------------------------------------------------------------------------------
/** Defines how data exchange happens - batch or pipelined */
...
...
flink-core/src/main/java/org/apache/flink/api/common/functions/RuntimeContext.java
浏览文件 @
b0acd979
...
...
@@ -64,6 +64,7 @@ public interface RuntimeContext {
*
* @return The metric group for this parallel subtask.
*/
@PublicEvolving
MetricGroup
getMetricGroup
();
/**
...
...
flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
浏览文件 @
b0acd979
...
...
@@ -355,6 +355,12 @@ public final class ConfigConstants {
@Deprecated
public
static
final
String
YARN_APPLICATION_MASTER_ENV_PREFIX
=
"yarn.application-master.env."
;
// these default values are not used anymore, but remain here until Flink 2.0
@Deprecated
public
static
final
String
DEFAULT_YARN_APPLICATION_MASTER_PORT
=
"deprecated"
;
@Deprecated
public
static
final
int
DEFAULT_YARN_MIN_HEAP_CUTOFF
=
-
1
;
/**
* Similar to the {@see YARN_APPLICATION_MASTER_ENV_PREFIX}, this configuration prefix allows
* setting custom environment variables.
...
...
flink-core/src/main/java/org/apache/flink/types/DoubleValue.java
浏览文件 @
b0acd979
...
...
@@ -30,7 +30,7 @@ import org.apache.flink.core.memory.DataOutputView;
* type {@code double}.
*/
@Public
public
class
DoubleValue
implements
Comparable
<
DoubleValue
>,
ResettableValue
<
DoubleValue
>,
CopyableValue
<
DoubleValue
>
{
public
class
DoubleValue
implements
Comparable
<
DoubleValue
>,
ResettableValue
<
DoubleValue
>,
CopyableValue
<
DoubleValue
>
,
Key
<
DoubleValue
>
{
private
static
final
long
serialVersionUID
=
1L
;
private
double
value
;
...
...
flink-core/src/main/java/org/apache/flink/types/FloatValue.java
浏览文件 @
b0acd979
...
...
@@ -30,7 +30,7 @@ import org.apache.flink.core.memory.DataOutputView;
* type {@code float}.
*/
@Public
public
class
FloatValue
implements
Comparable
<
FloatValue
>,
ResettableValue
<
FloatValue
>,
CopyableValue
<
FloatValue
>
{
public
class
FloatValue
implements
Comparable
<
FloatValue
>,
ResettableValue
<
FloatValue
>,
CopyableValue
<
FloatValue
>
,
Key
<
FloatValue
>
{
private
static
final
long
serialVersionUID
=
1L
;
private
float
value
;
...
...
flink-core/src/main/java/org/apache/flink/types/Key.java
0 → 100644
浏览文件 @
b0acd979
/*
* 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.types
;
import
org.apache.flink.annotation.PublicEvolving
;
/**
* This interface has to be implemented by all data types that act as key. Keys are used to establish
* relationships between values. A key must always be {@link java.lang.Comparable} to other keys of
* the same type. In addition, keys must implement a correct {@link java.lang.Object#hashCode()} method
* and {@link java.lang.Object#equals(Object)} method to ensure that grouping on keys works properly.
* <p>
* This interface extends {@link org.apache.flink.types.Value} and requires to implement
* the serialization of its value.
*
* @see org.apache.flink.types.Value
* @see org.apache.flink.core.io.IOReadableWritable
* @see java.lang.Comparable
*
* @deprecated The Key type is a relict of a deprecated and removed API and will be removed
* in future (2.0) versions as well.
*/
@Deprecated
@PublicEvolving
public
interface
Key
<
T
>
extends
Value
,
Comparable
<
T
>
{
/**
* All keys must override the hash-code function to generate proper deterministic hash codes,
* based on their contents.
*
* @return The hash code of the key
*/
public
int
hashCode
();
/**
* Compares the object on equality with another object.
*
* @param other The other object to compare against.
*
* @return True, iff this object is identical to the other object, false otherwise.
*/
public
boolean
equals
(
Object
other
);
}
\ No newline at end of file
flink-core/src/main/java/org/apache/flink/types/NormalizableKey.java
浏览文件 @
b0acd979
...
...
@@ -36,7 +36,7 @@ import org.apache.flink.core.memory.MemorySegment;
* key length.
*/
@Public
public
interface
NormalizableKey
<
T
>
extends
Comparable
<
T
>
{
public
interface
NormalizableKey
<
T
>
extends
Comparable
<
T
>
,
Key
<
T
>
{
/**
* Gets the maximal length of normalized keys that the data type would produce to determine
...
...
flink-streaming-scala/pom.xml
浏览文件 @
b0acd979
...
...
@@ -221,7 +221,6 @@ under the License.
<plugin>
<groupId>
com.github.siom79.japicmp
</groupId>
<artifactId>
japicmp-maven-plugin
</artifactId>
<version>
0.7.0
</version>
<configuration>
<parameter>
<excludes>
...
...
pom.xml
浏览文件 @
b0acd979
...
...
@@ -744,7 +744,6 @@ under the License.
<build>
<plugins>
<plugin>
<groupId>
com.github.siom79.japicmp
</groupId>
<artifactId>
japicmp-maven-plugin
</artifactId>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录