Skip to content

Commit 98ad842

Browse files
committed
Fix leftovers flink-jar-runner references
Signed-off-by: Marvin Froeder <marvin@datasqrl.com>
1 parent 60c9755 commit 98ad842

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

flink-sql-runner/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
</goals>
216216
<phase>package</phase>
217217
<configuration>
218-
<finalName>flink-jar-runner.uber</finalName>
218+
<finalName>flink-sql-runner.uber</finalName>
219219
<shadedArtifactAttached>true</shadedArtifactAttached>
220220
<shadedClassifierName>flink${flink.version}</shadedClassifierName>
221221
<artifactSet>
@@ -433,7 +433,7 @@
433433
<skip>${skipTests}</skip>
434434
<arguments>
435435
<argument>logs</argument>
436-
<argument>flink-jar-runner-jobmanager-1</argument>
436+
<argument>flink-sql-runner-jobmanager-1</argument>
437437
</arguments>
438438
</configuration>
439439
</execution>

flink-sql-runner/src/main/docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
FROM flink:${flink-base-image}
1818

19-
RUN mkdir -p /opt/flink/plugins/flink-jar-runner
20-
COPY flink-jar-runner.uber.jar /opt/flink/plugins/flink-jar-runner
19+
RUN mkdir -p /opt/flink/plugins/flink-sql-runner
20+
COPY flink-sql-runner.uber.jar /opt/flink/plugins/flink-sql-runner
2121
COPY system-functions-discovery-${project.version}.jar /opt/flink/lib/system-functions-discovery.jar

flink-sql-runner/src/main/docker/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#
1616

17-
name: flink-jar-runner
17+
name: flink-sql-runner
1818

1919
networks:
2020
datasqrl_network:
@@ -50,7 +50,7 @@ services:
5050
taskmanager.slot.timeout: 30000ms
5151
jobmanager.rpc.address: jobmanager
5252
state.savepoints-storage: filesystem
53-
state.savepoints.dir: file:///tmp/flink-jar-runner
53+
state.savepoints.dir: file:///tmp/flink-sql-runner
5454
command: jobmanager
5555
ports:
5656
- "8081:8081" # Flink JobManager REST port
@@ -89,7 +89,7 @@ services:
8989
taskmanager.slot.timeout: 30000ms
9090
jobmanager.rpc.address: jobmanager
9191
state.savepoints-storage: filesystem
92-
state.savepoints.dir: file:///tmp/flink-jar-runner
92+
state.savepoints.dir: file:///tmp/flink-sql-runner
9393
command: taskmanager
9494
depends_on:
9595
jobmanager:

flink-sql-runner/src/main/java/com/datasqrl/FlinkMain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public Void call() throws Exception {
7676
private final String udfPath;
7777

7878
public static void main(String[] args) throws Exception {
79-
System.out.printf("\n\nExecuting flink-jar-runner: %s\n\n", Arrays.toString(args));
79+
System.out.printf("\n\nExecuting flink-sql-runner: %s\n\n", Arrays.toString(args));
8080

8181
CommandLine cl = new CommandLine(new SqlRunner());
8282
cl.execute(args);
@@ -88,7 +88,7 @@ public static void main(String[] args) throws Exception {
8888
}
8989

9090
new FlinkMain(runner.sqlFile, runner.planFile, runner.configDir, runner.udfPath).run();
91-
System.out.println("Finished flink-jar-runner");
91+
System.out.println("Finished flink-sql-runner");
9292
}
9393

9494
public int run() throws Exception {

flink-sql-runner/src/test/java/com/datasqrl/FlinkMainIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,12 +154,12 @@ void givenPlanScript_whenCheckPoint_thenResumeSuccessfulySuccess() throws Except
154154
// test if initial change to compilation plan took effect
155155
assertThat(transactionDao.getDoubleTA()).isEqualTo(3);
156156

157-
Path savePoint = Path.of("/tmp/flink-jar-runner/" + System.currentTimeMillis());
157+
Path savePoint = Path.of("/tmp/flink-sql-runner/" + System.currentTimeMillis());
158158

159159
// take a savepoint
160160
CommandLineUtil.execute(
161161
Path.of("."),
162-
"docker exec -t flink-jar-runner-jobmanager-1 bin/flink stop "
162+
"docker exec -t flink-sql-runner-jobmanager-1 bin/flink stop "
163163
+ jobResponse.getJobid()
164164
+ " --savepointPath "
165165
+ savePoint);
@@ -245,7 +245,7 @@ JarRunResponseBody execute(String... arguments) {
245245

246246
@SneakyThrows
247247
JarRunResponseBody restoreAndExecute(String savepointPath, String... arguments) {
248-
var jarFile = new File("target/flink-jar-runner.uber.jar");
248+
var jarFile = new File("target/flink-sql-runner.uber.jar");
249249

250250
var uploadResponse = client.uploadJar(jarFile);
251251

0 commit comments

Comments
 (0)