Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
26bc321c
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,发现更多精彩内容 >>
提交
26bc321c
编写于
7月 09, 2014
作者:
S
Stephan Ewen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix optimizer error in channel instantiation (wrong parameterization)
上级
49ca3edd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
7 deletion
+14
-7
stratosphere-compiler/src/main/java/eu/stratosphere/compiler/costs/DefaultCostEstimator.java
.../eu/stratosphere/compiler/costs/DefaultCostEstimator.java
+1
-1
stratosphere-compiler/src/main/java/eu/stratosphere/compiler/dag/TwoInputNode.java
.../main/java/eu/stratosphere/compiler/dag/TwoInputNode.java
+6
-2
stratosphere-tests/src/test/java/eu/stratosphere/test/compiler/examples/RelationalQueryCompilerTest.java
...e/test/compiler/examples/RelationalQueryCompilerTest.java
+1
-0
stratosphere-tests/src/test/java/eu/stratosphere/test/compiler/iterations/ConnectedComponentsTest.java
...ere/test/compiler/iterations/ConnectedComponentsTest.java
+6
-4
未找到文件。
stratosphere-compiler/src/main/java/eu/stratosphere/compiler/costs/DefaultCostEstimator.java
浏览文件 @
26bc321c
...
...
@@ -42,7 +42,7 @@ public class DefaultCostEstimator extends CostEstimator {
private
static
final
float
HASHING_CPU_FACTOR
=
4
;
private
static
final
float
SORTING_CPU_FACTOR
=
7
;
private
static
final
float
SORTING_CPU_FACTOR
=
9
;
// --------------------------------------------------------------------------------------------
...
...
stratosphere-compiler/src/main/java/eu/stratosphere/compiler/dag/TwoInputNode.java
浏览文件 @
26bc321c
...
...
@@ -474,12 +474,16 @@ public abstract class TwoInputNode extends OptimizerNode {
if
(
dps
.
areCoFulfilled
(
lpp
.
getProperties1
(),
lpp
.
getProperties2
(),
in1
.
getLocalProperties
(),
in2
.
getLocalProperties
()))
{
// copy, because setting required properties and instantiation may
// change the channels and should not affect prior candidates
Channel
in1Copy
=
in1
.
clone
();
in1Copy
.
setRequiredLocalProps
(
lpp
.
getProperties1
());
in2
.
setRequiredLocalProps
(
lpp
.
getProperties2
());
Channel
in2Copy
=
in2
.
clone
();
in2Copy
.
setRequiredLocalProps
(
lpp
.
getProperties2
());
// all right, co compatible
instantiate
(
dps
,
in1Copy
,
in2
,
broadcastPlanChannels
,
target
,
estimator
,
rgps1
,
rgps2
,
ilp1
,
ilp2
);
instantiate
(
dps
,
in1Copy
,
in2
Copy
,
broadcastPlanChannels
,
target
,
estimator
,
rgps1
,
rgps2
,
ilp1
,
ilp2
);
break
;
}
else
{
// meet, but not co-compatible
...
...
stratosphere-tests/src/test/java/eu/stratosphere/test/compiler/examples/RelationalQueryCompilerTest.java
浏览文件 @
26bc321c
...
...
@@ -60,6 +60,7 @@ public class RelationalQueryCompilerTest extends CompilerTestBase {
// compile
final
OptimizedPlan
plan
=
compileNoStats
(
p
);
final
OptimizerPlanNodeResolver
or
=
getOptimizerPlanNodeResolver
(
plan
);
// get the nodes from the final plan
...
...
stratosphere-tests/src/test/java/eu/stratosphere/test/compiler/iterations/ConnectedComponentsTest.java
浏览文件 @
26bc321c
...
...
@@ -102,7 +102,9 @@ public class ConnectedComponentsTest extends CompilerTestBase {
Assert
.
assertEquals
(
DriverStrategy
.
NONE
,
vertexSource
.
getDriverStrategy
());
Assert
.
assertEquals
(
DriverStrategy
.
NONE
,
edgesSource
.
getDriverStrategy
());
Assert
.
assertEquals
(
DriverStrategy
.
HYBRIDHASH_BUILD_SECOND
,
neighborsJoin
.
getDriverStrategy
());
Assert
.
assertEquals
(
DriverStrategy
.
HYBRIDHASH_BUILD_SECOND_CACHED
,
neighborsJoin
.
getDriverStrategy
());
Assert
.
assertTrue
(!
neighborsJoin
.
getInput1
().
getTempMode
().
isCached
());
Assert
.
assertTrue
(!
neighborsJoin
.
getInput2
().
getTempMode
().
isCached
());
Assert
.
assertEquals
(
set0
,
neighborsJoin
.
getKeysForInput1
());
Assert
.
assertEquals
(
set0
,
neighborsJoin
.
getKeysForInput2
());
...
...
@@ -120,7 +122,6 @@ public class ConnectedComponentsTest extends CompilerTestBase {
Assert
.
assertEquals
(
ShipStrategyType
.
FORWARD
,
neighborsJoin
.
getInput1
().
getShipStrategy
());
// workset
Assert
.
assertEquals
(
ShipStrategyType
.
PARTITION_HASH
,
neighborsJoin
.
getInput2
().
getShipStrategy
());
// edges
Assert
.
assertEquals
(
set0
,
neighborsJoin
.
getInput2
().
getShipStrategyKeys
());
Assert
.
assertTrue
(
neighborsJoin
.
getInput2
().
getTempMode
().
isCached
());
Assert
.
assertEquals
(
ShipStrategyType
.
PARTITION_HASH
,
minIdReducer
.
getInput
().
getShipStrategy
());
Assert
.
assertEquals
(
set0
,
minIdReducer
.
getInput
().
getShipStrategyKeys
());
...
...
@@ -182,7 +183,9 @@ public class ConnectedComponentsTest extends CompilerTestBase {
Assert
.
assertEquals
(
DriverStrategy
.
NONE
,
vertexSource
.
getDriverStrategy
());
Assert
.
assertEquals
(
DriverStrategy
.
NONE
,
edgesSource
.
getDriverStrategy
());
Assert
.
assertEquals
(
DriverStrategy
.
HYBRIDHASH_BUILD_SECOND
,
neighborsJoin
.
getDriverStrategy
());
Assert
.
assertEquals
(
DriverStrategy
.
HYBRIDHASH_BUILD_SECOND_CACHED
,
neighborsJoin
.
getDriverStrategy
());
Assert
.
assertTrue
(!
neighborsJoin
.
getInput1
().
getTempMode
().
isCached
());
Assert
.
assertTrue
(!
neighborsJoin
.
getInput2
().
getTempMode
().
isCached
());
Assert
.
assertEquals
(
set0
,
neighborsJoin
.
getKeysForInput1
());
Assert
.
assertEquals
(
set0
,
neighborsJoin
.
getKeysForInput2
());
...
...
@@ -200,7 +203,6 @@ public class ConnectedComponentsTest extends CompilerTestBase {
Assert
.
assertEquals
(
ShipStrategyType
.
FORWARD
,
neighborsJoin
.
getInput1
().
getShipStrategy
());
// workset
Assert
.
assertEquals
(
ShipStrategyType
.
PARTITION_HASH
,
neighborsJoin
.
getInput2
().
getShipStrategy
());
// edges
Assert
.
assertEquals
(
set0
,
neighborsJoin
.
getInput2
().
getShipStrategyKeys
());
Assert
.
assertTrue
(
neighborsJoin
.
getInput2
().
getTempMode
().
isCached
());
Assert
.
assertEquals
(
ShipStrategyType
.
PARTITION_HASH
,
minIdReducer
.
getInput
().
getShipStrategy
());
Assert
.
assertEquals
(
set0
,
minIdReducer
.
getInput
().
getShipStrategyKeys
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录