Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
38a35c4a
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,发现更多精彩内容 >>
提交
38a35c4a
编写于
6月 29, 2013
作者:
S
StephanEwen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Cleaned up connected components example and tests.
上级
7e3b9122
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
42 addition
and
20 deletion
+42
-20
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/WorksetConnectedComponentsCoGroupTest.java
...ler/iterations/WorksetConnectedComponentsCoGroupTest.java
+3
-3
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/WorksetConnectedComponentsTest.java
...t/compiler/iterations/WorksetConnectedComponentsTest.java
+2
-2
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/plandump/CompiledPlanDumpTest.java
...tosphere/pact/compiler/plandump/CompiledPlanDumpTest.java
+1
-1
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/plandump/PreviewPlanDumpTest.java
...atosphere/pact/compiler/plandump/PreviewPlanDumpTest.java
+1
-1
pact/pact-examples/pom.xml
pact/pact-examples/pom.xml
+22
-0
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/DuplicateLongInputFormat.java
...example/connectedcomponents/DuplicateLongInputFormat.java
+1
-1
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/LongLongInputFormat.java
...pact/example/connectedcomponents/LongLongInputFormat.java
+1
-1
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/WorksetConnectedComponents.java
...ample/connectedcomponents/WorksetConnectedComponents.java
+1
-1
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/connectedcomponents/WorksetConnectedComponentsWithCoGroup.java
...ctedcomponents/WorksetConnectedComponentsWithCoGroup.java
+4
-4
pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/CoGroupConnectedComponentsITCase.java
...pact/test/iterative/CoGroupConnectedComponentsITCase.java
+2
-2
pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/ConnectedComponentsITCase.java
...sphere/pact/test/iterative/ConnectedComponentsITCase.java
+1
-1
pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/nephele/ConnectedComponentsNepheleITCase.java
...t/iterative/nephele/ConnectedComponentsNepheleITCase.java
+3
-3
未找到文件。
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/
CoGroupConnectedComponents
Test.java
→
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/
WorksetConnectedComponentsCoGroup
Test.java
浏览文件 @
38a35c4a
...
...
@@ -28,7 +28,7 @@ import eu.stratosphere.pact.compiler.plan.candidate.SourcePlanNode;
import
eu.stratosphere.pact.compiler.plan.candidate.WorksetIterationPlanNode
;
import
eu.stratosphere.pact.compiler.plandump.PlanJSONDumpGenerator
;
import
eu.stratosphere.pact.compiler.plantranslate.NepheleJobGraphGenerator
;
import
eu.stratosphere.pact.example.
iterative.CoGroupConnectedComponents
;
import
eu.stratosphere.pact.example.
connectedcomponents.WorksetConnectedComponentsWithCoGroup
;
import
eu.stratosphere.pact.runtime.shipping.ShipStrategyType
;
import
eu.stratosphere.pact.runtime.task.DriverStrategy
;
import
eu.stratosphere.pact.runtime.task.util.LocalStrategy
;
...
...
@@ -36,7 +36,7 @@ import eu.stratosphere.pact.runtime.task.util.LocalStrategy;
/**
*
*/
public
class
CoGroupConnectedComponents
Test
extends
CompilerTestBase
{
public
class
WorksetConnectedComponentsCoGroup
Test
extends
CompilerTestBase
{
private
static
final
String
VERTEX_SOURCE
=
"Vertices"
;
...
...
@@ -55,7 +55,7 @@ public class CoGroupConnectedComponentsTest extends CompilerTestBase {
@Test
public
void
testWorksetConnectedComponents
()
{
CoGroupConnectedComponents
cc
=
new
CoGroupConnectedComponents
();
WorksetConnectedComponentsWithCoGroup
cc
=
new
WorksetConnectedComponentsWithCoGroup
();
Plan
plan
=
cc
.
getPlan
(
String
.
valueOf
(
DEFAULT_PARALLELISM
),
IN_FILE
,
IN_FILE
,
OUT_FILE
,
String
.
valueOf
(
100
));
...
...
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/
Incremental
ConnectedComponentsTest.java
→
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/iterations/
Workset
ConnectedComponentsTest.java
浏览文件 @
38a35c4a
...
...
@@ -29,7 +29,7 @@ import eu.stratosphere.pact.compiler.plan.candidate.SourcePlanNode;
import
eu.stratosphere.pact.compiler.plan.candidate.WorksetIterationPlanNode
;
import
eu.stratosphere.pact.compiler.plandump.PlanJSONDumpGenerator
;
import
eu.stratosphere.pact.compiler.plantranslate.NepheleJobGraphGenerator
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.runtime.shipping.ShipStrategyType
;
import
eu.stratosphere.pact.runtime.task.DriverStrategy
;
import
eu.stratosphere.pact.runtime.task.util.LocalStrategy
;
...
...
@@ -37,7 +37,7 @@ import eu.stratosphere.pact.runtime.task.util.LocalStrategy;
/**
*
*/
public
class
Incremental
ConnectedComponentsTest
extends
CompilerTestBase
{
public
class
Workset
ConnectedComponentsTest
extends
CompilerTestBase
{
private
static
final
String
VERTEX_SOURCE
=
"Vertices"
;
...
...
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/plandump/CompiledPlanDumpTest.java
浏览文件 @
38a35c4a
...
...
@@ -23,7 +23,7 @@ import org.junit.Test;
import
eu.stratosphere.pact.common.plan.Plan
;
import
eu.stratosphere.pact.compiler.CompilerTestBase
;
import
eu.stratosphere.pact.compiler.plan.candidate.OptimizedPlan
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.example.kmeans.KMeansIterative
;
import
eu.stratosphere.pact.example.kmeans.KMeansSingleStep
;
import
eu.stratosphere.pact.example.relational.TPCHQuery3
;
...
...
pact/pact-compiler-tests/src/test/java/eu/stratosphere/pact/compiler/plandump/PreviewPlanDumpTest.java
浏览文件 @
38a35c4a
...
...
@@ -25,7 +25,7 @@ import org.junit.Test;
import
eu.stratosphere.pact.common.plan.Plan
;
import
eu.stratosphere.pact.compiler.PactCompiler
;
import
eu.stratosphere.pact.compiler.plan.DataSinkNode
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.example.kmeans.KMeansIterative
;
import
eu.stratosphere.pact.example.kmeans.KMeansSingleStep
;
import
eu.stratosphere.pact.example.relational.TPCHQuery3
;
...
...
pact/pact-examples/pom.xml
浏览文件 @
38a35c4a
...
...
@@ -40,6 +40,28 @@
<version>
2.4
</version>
<executions>
<!-- Connected Components -->
<execution>
<id>
ConnectedComponents
</id>
<phase>
package
</phase>
<goals>
<goal>
jar
</goal>
</goals>
<configuration>
<classifier>
ConnectedComponents
</classifier>
<archive>
<manifestEntries>
<Pact-Assembler-Class>
eu.stratosphere.pact.example.connectedcomponents.WorksetConnectedComponents
</Pact-Assembler-Class>
</manifestEntries>
</archive>
<includes>
<include>
**/connectedcomponents/*.class
</include>
</includes>
</configuration>
</execution>
<!-- DanglingPageRank -->
<execution>
<id>
DanglingPageRank
</id>
...
...
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
iterative
/DuplicateLongInputFormat.java
→
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
connectedcomponents
/DuplicateLongInputFormat.java
浏览文件 @
38a35c4a
...
...
@@ -13,7 +13,7 @@
*
**********************************************************************************************************************/
package
eu.stratosphere.pact.example.
iterative
;
package
eu.stratosphere.pact.example.
connectedcomponents
;
import
eu.stratosphere.pact.common.io.TextInputFormat
;
import
eu.stratosphere.pact.common.type.PactRecord
;
...
...
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
iterative
/LongLongInputFormat.java
→
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
connectedcomponents
/LongLongInputFormat.java
浏览文件 @
38a35c4a
...
...
@@ -13,7 +13,7 @@
*
**********************************************************************************************************************/
package
eu.stratosphere.pact.example.
iterative
;
package
eu.stratosphere.pact.example.
connectedcomponents
;
import
eu.stratosphere.pact.common.io.TextInputFormat
;
import
eu.stratosphere.pact.common.type.PactRecord
;
...
...
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
iterative
/WorksetConnectedComponents.java
→
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
connectedcomponents
/WorksetConnectedComponents.java
浏览文件 @
38a35c4a
...
...
@@ -13,7 +13,7 @@
*
**********************************************************************************************************************/
package
eu.stratosphere.pact.example.
iterative
;
package
eu.stratosphere.pact.example.
connectedcomponents
;
import
java.util.Iterator
;
...
...
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
iterative/CoGroupConnectedComponents
.java
→
pact/pact-examples/src/main/java/eu/stratosphere/pact/example/
connectedcomponents/WorksetConnectedComponentsWithCoGroup
.java
浏览文件 @
38a35c4a
...
...
@@ -13,7 +13,7 @@
*
**********************************************************************************************************************/
package
eu.stratosphere.pact.example.
iterative
;
package
eu.stratosphere.pact.example.
connectedcomponents
;
import
java.util.Iterator
;
...
...
@@ -32,14 +32,14 @@ import eu.stratosphere.pact.common.stubs.StubAnnotation.ConstantFieldsFirst;
import
eu.stratosphere.pact.common.stubs.StubAnnotation.ConstantFieldsSecond
;
import
eu.stratosphere.pact.common.type.PactRecord
;
import
eu.stratosphere.pact.common.type.base.PactLong
;
import
eu.stratosphere.pact.example.
iterative
.DuplicateLongInputFormat
;
import
eu.stratosphere.pact.example.
iterative
.LongLongInputFormat
;
import
eu.stratosphere.pact.example.
connectedcomponents
.DuplicateLongInputFormat
;
import
eu.stratosphere.pact.example.
connectedcomponents
.LongLongInputFormat
;
import
eu.stratosphere.pact.generic.contract.WorksetIteration
;
/**
*
*/
public
class
CoGroupConnectedComponents
implements
PlanAssembler
,
PlanAssemblerDescription
{
public
class
WorksetConnectedComponentsWithCoGroup
implements
PlanAssembler
,
PlanAssemblerDescription
{
public
static
final
class
NeighborWithComponentIDJoin
extends
MatchStub
{
...
...
pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/CoGroupConnectedComponentsITCase.java
浏览文件 @
38a35c4a
...
...
@@ -24,7 +24,7 @@ import org.junit.runners.Parameterized.Parameters;
import
eu.stratosphere.nephele.configuration.Configuration
;
import
eu.stratosphere.pact.common.plan.Plan
;
import
eu.stratosphere.pact.example.
iterative.CoGroupConnectedComponents
;
import
eu.stratosphere.pact.example.
connectedcomponents.WorksetConnectedComponentsWithCoGroup
;
import
eu.stratosphere.pact.test.iterative.nephele.ConnectedComponentsNepheleITCase
;
import
eu.stratosphere.pact.test.util.TestBase2
;
...
...
@@ -60,7 +60,7 @@ public class CoGroupConnectedComponentsITCase extends TestBase2 {
int
maxIterations
=
config
.
getInteger
(
"ConnectedComponents#NumIterations"
,
1
);
String
[]
params
=
{
String
.
valueOf
(
dop
)
,
verticesPath
,
edgesPath
,
resultPath
,
String
.
valueOf
(
maxIterations
)
};
CoGroupConnectedComponents
cc
=
new
CoGroupConnectedComponents
();
WorksetConnectedComponentsWithCoGroup
cc
=
new
WorksetConnectedComponentsWithCoGroup
();
return
cc
.
getPlan
(
params
);
}
...
...
pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/ConnectedComponentsITCase.java
浏览文件 @
38a35c4a
...
...
@@ -24,7 +24,7 @@ import org.junit.runners.Parameterized.Parameters;
import
eu.stratosphere.nephele.configuration.Configuration
;
import
eu.stratosphere.pact.common.plan.Plan
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents
;
import
eu.stratosphere.pact.test.iterative.nephele.ConnectedComponentsNepheleITCase
;
import
eu.stratosphere.pact.test.util.TestBase2
;
...
...
pact/pact-tests/src/test/java/eu/stratosphere/pact/test/iterative/nephele/ConnectedComponentsNepheleITCase.java
浏览文件 @
38a35c4a
...
...
@@ -43,9 +43,9 @@ import eu.stratosphere.pact.common.stubs.aggregators.LongSumAggregator;
import
eu.stratosphere.pact.common.type.PactRecord
;
import
eu.stratosphere.pact.common.type.base.PactLong
;
import
eu.stratosphere.pact.common.type.base.parser.DecimalTextLongParser
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents.MinimumComponentIDReduce
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents.NeighborWithComponentIDJoin
;
import
eu.stratosphere.pact.example.
iterative
.WorksetConnectedComponents.UpdateComponentIdMatch
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents.MinimumComponentIDReduce
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents.NeighborWithComponentIDJoin
;
import
eu.stratosphere.pact.example.
connectedcomponents
.WorksetConnectedComponents.UpdateComponentIdMatch
;
import
eu.stratosphere.pact.generic.types.TypeComparatorFactory
;
import
eu.stratosphere.pact.generic.types.TypePairComparatorFactory
;
import
eu.stratosphere.pact.generic.types.TypeSerializerFactory
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录