Skip to content

Commit 577c159

Browse files
[flink] Use versioned action jars
1 parent 26bb178 commit 577c159

9 files changed

Lines changed: 47 additions & 109 deletions

File tree

fluss-flink/fluss-flink-1.18/pom.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,19 @@
219219
<include>org.apache.fluss:fluss-client</include>
220220
</includes>
221221
</artifactSet>
222+
<filters combine.children="append">
223+
<filter>
224+
<artifact>org.apache.fluss:fluss-flink-common</artifact>
225+
<excludes>
226+
<exclude>org/apache/fluss/flink/action/**</exclude>
227+
</excludes>
228+
</filter>
229+
</filters>
222230
</configuration>
223231
</execution>
224232
</executions>
225233
</plugin>
226234
</plugins>
227235
</build>
228236

229-
</project>
237+
</project>

fluss-flink/fluss-flink-1.18/src/main/resources/META-INF/services/org.apache.fluss.flink.action.ActionFactory

Lines changed: 0 additions & 19 deletions
This file was deleted.

fluss-flink/fluss-flink-1.19/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,16 @@
213213
<include>org.apache.fluss:fluss-client</include>
214214
</includes>
215215
</artifactSet>
216+
<transformers combine.children="append">
217+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
218+
<mainClass>org.apache.fluss.flink.action.FlussActionEntrypoint</mainClass>
219+
</transformer>
220+
</transformers>
216221
</configuration>
217222
</execution>
218223
</executions>
219224
</plugin>
220225
</plugins>
221226
</build>
222227

223-
</project>
228+
</project>

fluss-flink/fluss-flink-1.20/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,16 @@
234234
<include>org.apache.fluss:fluss-client</include>
235235
</includes>
236236
</artifactSet>
237+
<transformers combine.children="append">
238+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
239+
<mainClass>org.apache.fluss.flink.action.FlussActionEntrypoint</mainClass>
240+
</transformer>
241+
</transformers>
237242
</configuration>
238243
</execution>
239244
</executions>
240245
</plugin>
241246
</plugins>
242247
</build>
243248

244-
</project>
249+
</project>

fluss-flink/fluss-flink-2.2/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,11 @@
258258
<include>org.apache.fluss:fluss-client</include>
259259
</includes>
260260
</artifactSet>
261+
<transformers combine.children="append">
262+
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
263+
<mainClass>org.apache.fluss.flink.action.FlussActionEntrypoint</mainClass>
264+
</transformer>
265+
</transformers>
261266
</configuration>
262267
</execution>
263268
</executions>

fluss-flink/fluss-flink-action/pom.xml

Lines changed: 0 additions & 82 deletions
This file was deleted.

fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/action/ActionLoader.java

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ public static Optional<Action> createAction(String[] args) {
4545
printDefaultHelp();
4646
return Optional.empty();
4747
}
48+
if (isHelp(args[0])) {
49+
printDefaultHelp();
50+
return Optional.empty();
51+
}
4852
String name = args[0].toLowerCase().replace('-', '_');
4953
ActionFactory factory =
5054
findFactory(name)
@@ -55,14 +59,27 @@ public static Optional<Action> createAction(String[] args) {
5559
+ args[0]
5660
+ ". Run with --help for available actions."));
5761
String[] remaining = Arrays.copyOfRange(args, 1, args.length);
58-
MultipleParameterToolAdapter params = MultipleParameterToolAdapter.fromArgs(remaining);
59-
if (params.has("help")) {
62+
if (hasHelp(remaining)) {
6063
System.out.println(factory.help());
6164
return Optional.empty();
6265
}
66+
MultipleParameterToolAdapter params = MultipleParameterToolAdapter.fromArgs(remaining);
6367
return factory.create(params);
6468
}
6569

70+
private static boolean isHelp(String arg) {
71+
return "--help".equals(arg) || "-h".equals(arg);
72+
}
73+
74+
private static boolean hasHelp(String[] args) {
75+
for (String arg : args) {
76+
if (isHelp(arg)) {
77+
return true;
78+
}
79+
}
80+
return false;
81+
}
82+
6683
private static Optional<ActionFactory> findFactory(String identifier) {
6784
for (ActionFactory f : ServiceLoader.load(ActionFactory.class)) {
6885
if (f.identifier().equals(identifier)) {

fluss-flink/fluss-flink-action/src/main/java/org/apache/fluss/flink/action/FlussActionEntrypoint.java renamed to fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/action/FlussActionEntrypoint.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import java.util.Optional;
2121

22-
/** Main entrypoint for the Fluss Flink action jar. Delegates to {@link ActionLoader}. */
22+
/** Main entrypoint for Fluss Flink action jars. Delegates to {@link ActionLoader}. */
2323
public class FlussActionEntrypoint {
2424

2525
public static void main(String[] args) throws Exception {

fluss-flink/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<module>fluss-flink-1.18</module>
3939
<module>fluss-flink-2.2</module>
4040
<module>fluss-flink-tiering</module>
41-
<module>fluss-flink-action</module>
4241
</modules>
4342

4443
<!-- override these root dependencies as 'provided', so they don't end up
@@ -77,4 +76,4 @@
7776
</plugins>
7877
</build>
7978

80-
</project>
79+
</project>

0 commit comments

Comments
 (0)