Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
0ea2596e
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,发现更多精彩内容 >>
提交
0ea2596e
编写于
8月 01, 2016
作者:
S
Stephan Ewen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-4298] [storm compatibility] Clean up unnecessary dependencies in 'flink-storm'
上级
4456453b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
60 addition
and
76 deletion
+60
-76
flink-contrib/flink-storm/pom.xml
flink-contrib/flink-storm/pom.xml
+29
-54
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/api/FlinkClient.java
...src/main/java/org/apache/flink/storm/api/FlinkClient.java
+3
-2
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/BoltWrapper.java
...ain/java/org/apache/flink/storm/wrappers/BoltWrapper.java
+11
-8
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/FlinkTopologyContext.java
...org/apache/flink/storm/wrappers/FlinkTopologyContext.java
+1
-2
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/MergedInputsBoltWrapper.java
.../apache/flink/storm/wrappers/MergedInputsBoltWrapper.java
+4
-2
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java
...in/java/org/apache/flink/storm/wrappers/SpoutWrapper.java
+4
-4
flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
...g/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
+8
-4
未找到文件。
flink-contrib/flink-storm/pom.xml
浏览文件 @
0ea2596e
...
...
@@ -61,18 +61,40 @@ under the License.
<artifactId>
log4j-over-slf4j
</artifactId>
</exclusion>
<exclusion>
<artifactId>
logback-classic
</artifactId>
<groupId>
ch.qos.logback
</groupId>
<artifactId>
logback-classic
</artifactId>
</exclusion>
<exclusion>
<groupId>
ring
</groupId>
<artifactId>
ring-core
</artifactId>
</exclusion>
<exclusion>
<groupId>
ring
</groupId>
<artifactId>
ring-devel
</artifactId>
</exclusion>
<exclusion>
<groupId>
ring
</groupId>
<artifactId>
ring-servlet
</artifactId>
</exclusion>
<exclusion>
<groupId>
ring
</groupId>
<artifactId>
ring-jetty-adapter
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.mortbay.jetty
</groupId>
<artifactId>
jetty
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.mortbay.jetty
</groupId>
<artifactId>
jetty-util
</artifactId>
</exclusion>
<exclusion>
<groupId>
org.jgrapht
</groupId>
<artifactId>
jgrapht-core
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
<version>
${guava.version}
</version>
</dependency>
<!-- test dependencies -->
<dependency>
...
...
@@ -85,51 +107,4 @@ under the License.
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-jar-plugin
</artifactId>
<executions>
<execution>
<goals>
<goal>
test-jar
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>
org.eclipse.m2e
</groupId>
<artifactId>
lifecycle-mapping
</artifactId>
<version>
1.0.0
</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-dependency-plugin
</artifactId>
<versionRange>
[2.9,)
</versionRange>
<goals>
<goal>
unpack
</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/api/FlinkClient.java
浏览文件 @
0ea2596e
...
...
@@ -22,6 +22,7 @@ import akka.actor.ActorRef;
import
akka.actor.ActorSystem
;
import
akka.pattern.Patterns
;
import
akka.util.Timeout
;
import
backtype.storm.Config
;
import
backtype.storm.generated.AlreadyAliveException
;
import
backtype.storm.generated.InvalidTopologyException
;
...
...
@@ -32,7 +33,6 @@ import backtype.storm.utils.NimbusClient;
import
backtype.storm.utils.Utils
;
import
com.esotericsoftware.kryo.Serializer
;
import
com.google.common.collect.Lists
;
import
org.apache.flink.api.common.ExecutionConfig
;
import
org.apache.flink.api.common.JobID
;
...
...
@@ -52,6 +52,7 @@ import org.apache.flink.runtime.messages.JobManagerMessages;
import
org.apache.flink.runtime.messages.JobManagerMessages.RunningJobsStatus
;
import
org.apache.flink.storm.util.StormConfig
;
import
org.apache.flink.streaming.api.graph.StreamGraph
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
...
...
@@ -215,7 +216,7 @@ public class FlinkClient {
try
{
ClassLoader
classLoader
=
JobWithJars
.
buildUserCodeClassLoader
(
Lists
.
newArray
List
(
uploadedJarUrl
),
Collections
.<
URL
>
singleton
List
(
uploadedJarUrl
),
Collections
.<
URL
>
emptyList
(),
this
.
getClass
().
getClassLoader
());
client
.
runDetached
(
jobGraph
,
classLoader
);
...
...
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/BoltWrapper.java
浏览文件 @
0ea2596e
...
...
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.flink.storm.wrappers
;
import
backtype.storm.generated.GlobalStreamId
;
...
...
@@ -26,8 +27,6 @@ import backtype.storm.tuple.Fields;
import
backtype.storm.tuple.MessageId
;
import
backtype.storm.utils.Utils
;
import
com.google.common.collect.Sets
;
import
org.apache.flink.api.common.ExecutionConfig.GlobalJobParameters
;
import
org.apache.flink.api.java.tuple.Tuple
;
import
org.apache.flink.api.java.tuple.Tuple0
;
...
...
@@ -44,6 +43,8 @@ import java.util.Collection;
import
java.util.HashMap
;
import
java.util.Map
;
import
static
java
.
util
.
Arrays
.
asList
;
/**
* A {@link BoltWrapper} wraps an {@link IRichBolt} in order to execute the Storm bolt within a Flink Streaming program.
* It takes the Flink input tuples of type {@code IN} and transforms them into {@link StormTuple}s that the bolt can
...
...
@@ -135,9 +136,9 @@ public class BoltWrapper<IN, OUT> extends AbstractStreamOperator<OUT> implements
* {@code rawOuput} is {@code false} and the number of declared output attributes is not within range
* [1;25].
*/
public
BoltWrapper
(
final
IRichBolt
bolt
,
final
String
[]
rawOutputs
)
public
BoltWrapper
(
final
IRichBolt
bolt
,
final
String
[]
rawOutputs
)
throws
IllegalArgumentException
{
this
(
bolt
,
null
,
Sets
.
newHashSe
t
(
rawOutputs
));
this
(
bolt
,
null
,
asLis
t
(
rawOutputs
));
}
/**
...
...
@@ -157,8 +158,7 @@ public class BoltWrapper<IN, OUT> extends AbstractStreamOperator<OUT> implements
* {@code rawOuput} is {@code false} and the number of declared output attributes is not with range
* [1;25].
*/
public
BoltWrapper
(
final
IRichBolt
bolt
,
final
Collection
<
String
>
rawOutputs
)
throws
IllegalArgumentException
{
public
BoltWrapper
(
final
IRichBolt
bolt
,
final
Collection
<
String
>
rawOutputs
)
throws
IllegalArgumentException
{
this
(
bolt
,
null
,
rawOutputs
);
}
...
...
@@ -181,9 +181,12 @@ public class BoltWrapper<IN, OUT> extends AbstractStreamOperator<OUT> implements
* {@code rawOuput} is {@code false} and the number of declared output attributes is not with range
* [0;25].
*/
public
BoltWrapper
(
final
IRichBolt
bolt
,
final
Fields
inputSchema
,
final
String
[]
rawOutputs
)
public
BoltWrapper
(
final
IRichBolt
bolt
,
final
Fields
inputSchema
,
final
String
[]
rawOutputs
)
throws
IllegalArgumentException
{
this
(
bolt
,
inputSchema
,
Sets
.
newHashSe
t
(
rawOutputs
));
this
(
bolt
,
inputSchema
,
asLis
t
(
rawOutputs
));
}
/**
...
...
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/FlinkTopologyContext.java
浏览文件 @
0ea2596e
...
...
@@ -120,9 +120,8 @@ final class FlinkTopologyContext extends TopologyContext {
* @throws UnsupportedOperationException
* at every invocation
*/
@SuppressWarnings
(
"unchecked"
)
@Override
public
IMetric
registerMetric
(
final
String
name
,
final
IMetric
metric
,
final
int
timeBucketSizeInSecs
)
{
public
<
T
extends
IMetric
>
T
registerMetric
(
final
String
name
,
final
T
metric
,
final
int
timeBucketSizeInSecs
)
{
throw
new
UnsupportedOperationException
(
"Metrics are not supported by Flink"
);
}
...
...
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/MergedInputsBoltWrapper.java
浏览文件 @
0ea2596e
...
...
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.flink.storm.wrappers
;
import
backtype.storm.topology.IRichBolt
;
import
com.google.common.collect.Sets
;
import
org.apache.flink.api.java.tuple.Tuple0
;
import
org.apache.flink.api.java.tuple.Tuple1
;
...
...
@@ -26,6 +26,8 @@ import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import
java.util.Collection
;
import
static
java
.
util
.
Arrays
.
asList
;
/**
* A {@link MergedInputsBoltWrapper} is a {@link BoltWrapper} that expects input tuples of type {@link StormTuple}. It
* can be used to wrap a multi-input bolt and assumes that all input stream got merged into a {@link StormTuple} stream
...
...
@@ -67,7 +69,7 @@ public final class MergedInputsBoltWrapper<IN, OUT> extends BoltWrapper<StormTup
*/
public
MergedInputsBoltWrapper
(
final
IRichBolt
bolt
,
final
String
[]
rawOutputs
)
throws
IllegalArgumentException
{
super
(
bolt
,
Sets
.
newHashSe
t
(
rawOutputs
));
super
(
bolt
,
asLis
t
(
rawOutputs
));
}
/**
...
...
flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java
浏览文件 @
0ea2596e
...
...
@@ -22,8 +22,6 @@ import backtype.storm.spout.SpoutOutputCollector;
import
backtype.storm.task.TopologyContext
;
import
backtype.storm.topology.IRichSpout
;
import
com.google.common.collect.Sets
;
import
org.apache.flink.api.common.ExecutionConfig.GlobalJobParameters
;
import
org.apache.flink.api.common.functions.StoppableFunction
;
import
org.apache.flink.api.java.tuple.Tuple0
;
...
...
@@ -37,6 +35,8 @@ import org.apache.flink.streaming.api.operators.StreamingRuntimeContext;
import
java.util.Collection
;
import
java.util.HashMap
;
import
static
java
.
util
.
Arrays
.
asList
;
/**
* A {@link SpoutWrapper} wraps an {@link IRichSpout} in order to execute it within a Flink Streaming program. It
* takes the spout's output tuples and transforms them into Flink tuples of type {@code OUT} (see
...
...
@@ -121,7 +121,7 @@ public final class SpoutWrapper<OUT> extends RichParallelSourceFunction<OUT> imp
*/
public
SpoutWrapper
(
final
IRichSpout
spout
,
final
String
[]
rawOutputs
)
throws
IllegalArgumentException
{
this
(
spout
,
Sets
.
newHashSe
t
(
rawOutputs
),
null
);
this
(
spout
,
asLis
t
(
rawOutputs
),
null
);
}
/**
...
...
@@ -147,7 +147,7 @@ public final class SpoutWrapper<OUT> extends RichParallelSourceFunction<OUT> imp
*/
public
SpoutWrapper
(
final
IRichSpout
spout
,
final
String
[]
rawOutputs
,
final
Integer
numberOfInvocations
)
throws
IllegalArgumentException
{
this
(
spout
,
Sets
.
newHashSe
t
(
rawOutputs
),
numberOfInvocations
);
this
(
spout
,
asLis
t
(
rawOutputs
),
numberOfInvocations
);
}
/**
...
...
flink-contrib/flink-storm/src/test/java/org/apache/flink/storm/wrappers/WrapperSetupHelperTest.java
浏览文件 @
0ea2596e
...
...
@@ -14,6 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package
org.apache.flink.storm.wrappers
;
import
backtype.storm.Config
;
...
...
@@ -27,16 +28,18 @@ import backtype.storm.topology.IRichSpout;
import
backtype.storm.topology.TopologyBuilder
;
import
backtype.storm.tuple.Fields
;
import
backtype.storm.utils.Utils
;
import
com.google.common.collect.Sets
;
import
org.apache.flink.storm.api.FlinkTopology
;
import
org.apache.flink.storm.util.AbstractTest
;
import
org.apache.flink.storm.util.TestDummyBolt
;
import
org.apache.flink.storm.util.TestDummySpout
;
import
org.apache.flink.storm.util.TestSink
;
import
org.apache.flink.streaming.api.operators.StreamingRuntimeContext
;
import
org.junit.Assert
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
import
org.powermock.api.mockito.PowerMockito
;
import
org.powermock.core.classloader.annotations.PowerMockIgnore
;
import
org.powermock.core.classloader.annotations.PrepareForTest
;
...
...
@@ -48,6 +51,8 @@ import java.util.Iterator;
import
java.util.List
;
import
java.util.Set
;
import
static
java
.
util
.
Collections
.
singleton
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
...
...
@@ -85,7 +90,7 @@ public class WrapperSetupHelperTest extends AbstractTest {
PowerMockito
.
whenNew
(
SetupOutputFieldsDeclarer
.
class
).
withNoArguments
().
thenReturn
(
declarer
);
WrapperSetupHelper
.
getNumberOfAttributes
(
boltOrSpout
,
Sets
.
newHashSet
(
new
String
[]
{
Utils
.
DEFAULT_STREAM_ID
}
));
new
HashSet
<
String
>(
singleton
(
Utils
.
DEFAULT_STREAM_ID
)
));
}
@Test
(
expected
=
IllegalArgumentException
.
class
)
...
...
@@ -143,8 +148,7 @@ public class WrapperSetupHelperTest extends AbstractTest {
Assert
.
assertEquals
(
attributes
,
WrapperSetupHelper
.
getNumberOfAttributes
(
boltOrSpout
,
numberOfAttributes
==
-
1
?
Sets
.
newHashSet
(
new
String
[]
{
Utils
.
DEFAULT_STREAM_ID
})
:
null
));
numberOfAttributes
==
-
1
?
new
HashSet
<
String
>(
singleton
(
Utils
.
DEFAULT_STREAM_ID
))
:
null
));
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录