Remove --block

Signed-off-by: Marvin Froeder <velo.br@gmail.com>

Author: velo

src/main/java/com/datasqrl/FlinkMain.java

@@ -49,12 +49,6 @@ public static class SqlRunner implements Callable<Void> {
         description = "SQL file to execute.")
     private String sqlFile;
 
-    @Option(
-        names = {"--block"},
-        description = "Wait for the flink job manager to exit.",
-        defaultValue = "false")
-    private boolean block;
-
     @Option(
         names = {"--planfile"},
         description = "Compiled plan JSON file.")
@@ -80,7 +74,6 @@ public Void call() throws Exception {
   private final String planFile;
   private final String configDir;
   private final String udfPath;
-  private final boolean block;
 
   public static void main(String[] args) throws Exception {
     System.out.printf("\n\nExecuting flink-jar-runner: %s\n\n", Arrays.toString(args));
@@ -94,8 +87,7 @@ public static void main(String[] args) throws Exception {
       runner.udfPath = System.getenv("UDF_PATH");
     }
 
-    new FlinkMain(runner.sqlFile, runner.planFile, runner.configDir, runner.udfPath, runner.block)
-        .run();
+    new FlinkMain(runner.sqlFile, runner.planFile, runner.configDir, runner.udfPath).run();
     System.out.println("Finished flink-jar-runner");
   }
 
@@ -148,10 +140,6 @@ public int run() throws Exception {
       return 1;
     }
 
-    if (block) {
-      tableResult.await();
-    }
-
     return 0;
   }
 

src/test/java/com/datasqrl/FlinkMainIT.java

@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
-import static org.assertj.core.api.Assumptions.assumeThat;
 
 import com.nextbreakpoint.flinkclient.model.JarRunResponseBody;
 import com.nextbreakpoint.flinkclient.model.JarUploadResponseBody;
@@ -40,16 +39,13 @@ class FlinkMainIT extends AbstractITSupport {
   static Stream<Arguments> sqlScripts() {
     var scripts = List.of("flink.sql", "test_sql.sql");
     var config = List.of(true, false);
-    var block = List.of(true, false);
-    return Lists.cartesianProduct(scripts, config, block).stream()
+    return Lists.cartesianProduct(scripts, config).stream()
         .map(pair -> Arguments.of(pair.toArray()));
   }
 
-  @ParameterizedTest(name = "{0} {1} {2}")
+  @ParameterizedTest(name = "{0} {1}")
   @MethodSource("sqlScripts")
-  void givenSqlScript_whenExecuting_thenSuccess(String filename, boolean config, boolean block) {
-    assumeThat(block).as("`--block` doesn't seem to work").isFalse();
-
+  void givenSqlScript_whenExecuting_thenSuccess(String filename, boolean config) {
     String sqlFile = "/opt/flink/usrlib/sql/" + filename;
     var args = new ArrayList<String>();
     args.add("--sqlfile");
@@ -58,17 +54,28 @@ void givenSqlScript_whenExecuting_thenSuccess(String filename, boolean config, b
       args.add("--config-dir");
       args.add("/opt/flink/usrlib/config/");
     }
-    if (block) {
-      args.add("--block");
-    }
     execute(args.toArray(String[]::new));
   }
 
+  static Stream<Arguments> planScripts() {
+    var scripts = List.of("compiled-plan.json", "test_plan.json");
+    var config = List.of(true, false);
+    return Lists.cartesianProduct(scripts, config).stream()
+        .map(pair -> Arguments.of(pair.toArray()));
+  }
+
   @ParameterizedTest(name = "{0}")
-  @CsvSource({"compiled-plan.json", "test_plan.json"})
-  void givenPlansScript_whenExecuting_thenSuccess(String filename) {
+  @MethodSource("planScripts")
+  void givenPlansScript_whenExecuting_thenSuccess(String filename, boolean config) {
     String planFile = "/opt/flink/usrlib/plans/" + filename;
-    execute("--planfile", planFile);
+    var args = new ArrayList<String>();
+    args.add("--planfile");
+    args.add(planFile);
+    if (config) {
+      args.add("--config-dir");
+      args.add("/opt/flink/usrlib/config/");
+    }
+    execute(args.toArray(String[]::new));
   }
 
   @SneakyThrows

src/test/java/com/datasqrl/SqlRunnerTest.java

@@ -49,7 +49,7 @@ void setUp() throws URISyntaxException {
   @Test
   void testCommandLineInvocationWithSqlFile() {
     // Simulating passing command-line arguments using picocli
-    String[] args = {"-s", sqlFile.getAbsolutePath(), "--block"};
+    String[] args = {"-s", sqlFile.getAbsolutePath()};
 
     // Use CommandLine to parse and execute
     CommandLine cmd = new CommandLine(new FlinkMain.SqlRunner());