Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
8791d4f0
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,发现更多精彩内容 >>
提交
8791d4f0
编写于
4月 26, 2015
作者:
G
Gyula Fora
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[streaming] Timestamp comparison bugfix
上级
b950d5b4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
5 deletion
+15
-5
flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java
...he/flink/streaming/api/datastream/WindowedDataStream.java
+2
-1
flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/windowing/helper/TimestampWrapper.java
...link/streaming/api/windowing/helper/TimestampWrapper.java
+7
-2
flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/windowing/policy/TimeTriggerPolicyTest.java
...streaming/api/windowing/policy/TimeTriggerPolicyTest.java
+3
-0
flink-staging/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/windowing/StockPrices.java
...pache/flink/streaming/examples/windowing/StockPrices.java
+3
-2
未找到文件。
flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/WindowedDataStream.java
浏览文件 @
8791d4f0
...
...
@@ -450,7 +450,8 @@ public class WindowedDataStream<OUT> {
// discretized stream, we also pass the type of the windowbuffer
DiscretizedStream
<
OUT
>
discretized
=
discretize
(
transformation
,
windowBuffer
);
if
(!(
windowBuffer
instanceof
PreAggregator
))
{
if
(
getEviction
()
instanceof
KeepAllEvictionPolicy
&&
!(
windowBuffer
instanceof
PreAggregator
))
{
throw
new
RuntimeException
(
"Error in preaggregator logic, parallel time reduce should always be preaggregated"
);
}
...
...
flink-staging/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/windowing/helper/TimestampWrapper.java
浏览文件 @
8791d4f0
...
...
@@ -50,8 +50,13 @@ public class TimestampWrapper<T> implements Serializable {
try
{
@SuppressWarnings
(
"unchecked"
)
TimestampWrapper
<
T
>
otherTSW
=
(
TimestampWrapper
<
T
>)
other
;
return
startTime
==
otherTSW
.
startTime
&&
timestamp
.
getClass
()
==
otherTSW
.
timestamp
.
getClass
();
if
(
timestamp
instanceof
SystemTimestamp
&&
otherTSW
.
timestamp
instanceof
SystemTimestamp
)
{
return
true
;
}
else
{
return
startTime
==
otherTSW
.
startTime
&&
timestamp
.
getClass
()
==
otherTSW
.
timestamp
.
getClass
();
}
}
catch
(
ClassCastException
e
)
{
return
false
;
}
...
...
flink-staging/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/windowing/policy/TimeTriggerPolicyTest.java
浏览文件 @
8791d4f0
...
...
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNotEquals;
import
static
org
.
junit
.
Assert
.
assertFalse
;
import
static
org
.
junit
.
Assert
.
assertTrue
;
import
org.apache.flink.streaming.api.windowing.helper.SystemTimestamp
;
import
org.apache.flink.streaming.api.windowing.helper.Timestamp
;
import
org.apache.flink.streaming.api.windowing.helper.TimestampWrapper
;
import
org.junit.Test
;
...
...
@@ -111,6 +112,8 @@ public class TimeTriggerPolicyTest {
assertNotEquals
(
new
TimeTriggerPolicy
<
Integer
>(
5
,
new
TimestampWrapper
<
Integer
>(
timeStamp
,
0
)),
new
TimeTriggerPolicy
<
Integer
>(
5
,
new
TimestampWrapper
<
Integer
>(
timeStamp
,
3
)));
assertEquals
(
SystemTimestamp
.
getWrapper
(),
SystemTimestamp
.
getWrapper
());
}
@Test
...
...
flink-staging/flink-streaming/flink-streaming-examples/src/main/java/org/apache/flink/streaming/examples/windowing/StockPrices.java
浏览文件 @
8791d4f0
...
...
@@ -17,6 +17,7 @@
package
org.apache.flink.streaming.examples.windowing
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Random
;
...
...
@@ -203,7 +204,7 @@ public class StockPrices {
// DATA TYPES
// *************************************************************************
public
static
class
StockPrice
{
public
static
class
StockPrice
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
public
String
symbol
;
...
...
@@ -226,7 +227,7 @@ public class StockPrices {
}
}
public
static
class
Count
{
public
static
class
Count
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
public
String
symbol
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录