From 2e1632cba9cd9301e748103f3ff6809b9a3d05e4 Mon Sep 17 00:00:00 2001 From: Mihai Budiu Date: Fri, 29 May 2026 10:44:50 -0700 Subject: [PATCH] [SLT] Fix SLT code generation broken by the introduction of compiler-produced regions Signed-off-by: Mihai Budiu --- .../compiler/backend/rust/RustFileWriter.java | 1 + .../src/main/java/org/dbsp/util/Utilities.java | 9 ++++++--- .../slt/out3147113901903481972.tmp | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 sql-to-dbsp-compiler/slt/out3147113901903481972.tmp diff --git a/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/backend/rust/RustFileWriter.java b/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/backend/rust/RustFileWriter.java index bb0ddaf7b00..a55c472f643 100644 --- a/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/backend/rust/RustFileWriter.java +++ b/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/backend/rust/RustFileWriter.java @@ -133,6 +133,7 @@ public void write(DBSPCompiler compiler) { // If it's a struct item, it is part of the list above inner.accept(innerVisitor); } else { + this.materializations.clearRegions(); DBSPCircuit outer = node.to(DBSPCircuit.class); ToRustVisitor visitor = new ToRustVisitor( compiler, this.builder(), outer.metadata, declarationsDone, this.materializations); diff --git a/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/util/Utilities.java b/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/util/Utilities.java index f568138ec3e..08f04681713 100644 --- a/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/util/Utilities.java +++ b/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/util/Utilities.java @@ -448,6 +448,9 @@ public static void runProcess(String directory, String... commands) throws IOExc runProcess(directory, new HashMap<>(), commands); } + /** Number of cargo jobs to use when testing locally */ + static final int LOCAL_CARGO_JOBS = 6; + static final HashMap STACK = new HashMap<>() {{ put("RUST_MIN_STACK", "8388608"); }}; static void compileAndTest(String directory, boolean quiet, String... extraArgs) throws IOException, InterruptedException { @@ -456,7 +459,7 @@ static void compileAndTest(String directory, boolean quiet, String... extraArgs) args.add("test"); if (!Utilities.inCI()) { args.add("--jobs"); - args.add("20"); + args.add(Integer.toString(LOCAL_CARGO_JOBS)); } args.addAll(Arrays.asList(extraArgs)); if (quiet) { @@ -498,9 +501,9 @@ public static void compileAndCheckRust(String directory, boolean quiet, String.. List args = new ArrayList<>(); args.add("cargo"); args.add("check"); - if (Utilities.inCI()) { + if (!Utilities.inCI()) { args.add("--jobs"); - args.add("6"); + args.add(Integer.toString(LOCAL_CARGO_JOBS)); } if (quiet) args.add("--quiet"); diff --git a/sql-to-dbsp-compiler/slt/out3147113901903481972.tmp b/sql-to-dbsp-compiler/slt/out3147113901903481972.tmp new file mode 100644 index 00000000000..d636dd81fc1 --- /dev/null +++ b/sql-to-dbsp-compiler/slt/out3147113901903481972.tmp @@ -0,0 +1,14 @@ +warning: unused variable: `pipeline_config` + --> /home/mbudiu/git/feldera/crates/adapters/src/integrated.rs:97:5 + | +97 | pipeline_config: &PipelineConfig, + | ^^^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_pipeline_config` + | + = note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default + +warning: unused variable: `runtime_env` + --> /home/mbudiu/git/feldera/crates/adapters/src/integrated.rs:98:5 + | +98 | runtime_env: Arc, + | ^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_runtime_env` +