[SQL/SLT] SLT tests were broken when the error view was introduced

mihaibudiu · gz · commit 4f877ddd8d22 · 2024-11-24T23:01:23.000Z
Signed-off-by: Mihai Budiu &lt;mbudiu@feldera.com&gt;
diff --git a/sql-to-dbsp-compiler/SQL-compiler/src/test/java/org/dbsp/sqlCompiler/compiler/sql/tools/BaseSQLTests.java b/sql-to-dbsp-compiler/SQL-compiler/src/test/java/org/dbsp/sqlCompiler/compiler/sql/tools/BaseSQLTests.java
@@ -211,9 +211,7 @@ protected void starting(final Description description) {
 
     public static int testsExecuted = 0;
 
-    /**
-     * Collect here all the tests to run and execute them using a single Rust compilation.
-     */
+    /** Collect here all the tests to run and execute them using a single Rust compilation. */
     static final List<TestCase> testsToRun = new ArrayList<>();
 
     @BeforeClass
diff --git a/sql-to-dbsp-compiler/SQL-compiler/src/test/java/org/dbsp/sqlCompiler/compiler/sql/tools/TestCase.java b/sql-to-dbsp-compiler/SQL-compiler/src/test/java/org/dbsp/sqlCompiler/compiler/sql/tools/TestCase.java
@@ -3,7 +3,6 @@
 import org.dbsp.sqlCompiler.circuit.DBSPCircuit;
 import org.dbsp.sqlCompiler.circuit.operator.DBSPSinkOperator;
 import org.dbsp.sqlCompiler.compiler.errors.UnimplementedException;
-import org.dbsp.sqlCompiler.compiler.frontend.calciteCompiler.ProgramIdentifier;
 import org.dbsp.sqlCompiler.compiler.frontend.calciteObject.CalciteObject;
 import org.dbsp.sqlCompiler.ir.DBSPFunction;
 import org.dbsp.sqlCompiler.ir.expression.DBSPApplyExpression;
diff --git a/sql-to-dbsp-compiler/slt/src/main/java/org/dbsp/sqllogictest/executors/DBSPExecutor.java b/sql-to-dbsp-compiler/slt/src/main/java/org/dbsp/sqllogictest/executors/DBSPExecutor.java
@@ -32,6 +32,7 @@
 import net.hydromatic.sqllogictest.TestStatistics;
 import net.hydromatic.sqllogictest.executors.SqlSltTestExecutor;
 import org.dbsp.sqlCompiler.circuit.DBSPCircuit;
+import org.dbsp.sqlCompiler.circuit.operator.DBSPSinkOperator;
 import org.dbsp.sqlCompiler.compiler.CompilerOptions;
 import org.dbsp.sqlCompiler.compiler.DBSPCompiler;
 import org.dbsp.sqlCompiler.compiler.backend.rust.RustFileWriter;
@@ -288,20 +289,28 @@ ProgramAndTester generateTestCase(
         }
         compiler.compileStatement(dbspQuery);
         compiler.throwIfErrorsOccurred();
-        DBSPCircuit dbsp = compiler.getFinalCircuit(false);
+        DBSPCircuit circuit = compiler.getFinalCircuit(false);
+        circuit.setName("circuit" + suffix);
         DBSPNode.done();
 
-        if (dbsp.getOutputCount() != 1)
-            throw new RuntimeException(
-                    "Didn't expect a query to have " + dbsp.getOutputCount() + " outputs");
-        DBSPTypeZSet outputType = dbsp.getSingleOutputType().to(DBSPTypeZSet.class);
+        List<DBSPSinkOperator> sinks = Linq.list(circuit.sinkOperators.values());
+        int outputNumber = 0;
+        DBSPSinkOperator sink = null;
+        for (; outputNumber < circuit.getOutputCount(); outputNumber++) {
+            sink = sinks.get(outputNumber);
+            // Skip over system views if we are not checking these
+            if (!sink.metadata.system)
+                break;
+        }
+        assert sink != null;
+        DBSPTypeZSet outputType = sink.outputType.to(DBSPTypeZSet.class);
         DBSPZSetLiteral expectedOutput = null;
         if (testQuery.outputDescription.hash == null) {
             expectedOutput = DBSPExecutor.convert(testQuery.outputDescription.getQueryResults(), outputType);
         }
 
         return createTesterCode(
-                    "tester" + suffix, dbsp,
+                    "tester" + suffix, circuit, outputNumber,
                     gen.getInputFunction(),
                     compiler.getTableContents(),
                     expectedOutput, testQuery.outputDescription);
@@ -410,12 +419,14 @@ public TestStatistics execute(SltTestFile file, OptionsParser.SuppliedOptions op
      * @param circuit     DBSP circuit that will be tested.
      * @param output      Expected data from the circuit.
      * @param description Description of the expected outputs.
+     * @param outputNumber  Position of data output in output vector.
      * @return The code for a function that runs the circuit with the specified
      * input and tests the produced output.
      */
     static ProgramAndTester createTesterCode(
             String name,
             DBSPCircuit circuit,
+            int outputNumber,
             DBSPFunction inputGeneratingFunction,
             TableContents contents,
             @Nullable DBSPZSetLiteral output,
@@ -430,7 +441,9 @@ static ProgramAndTester createTesterCode(
         DBSPLetStatement streams = new DBSPLetStatement("streams", cas.getVarReference().field(1));
         list.add(streams);
 
-        DBSPType circuitOutputType = circuit.getSingleOutputType();
+        List<DBSPSinkOperator> sinks = Linq.list(circuit.sinkOperators.values());
+        DBSPSinkOperator sink = sinks.get(outputNumber);
+        DBSPType circuitOutputType = sink.outputType;
         // True if the output is a zset of vectors (generated for order by queries)
         boolean isVector = circuitOutputType.to(DBSPTypeZSet.class).elementType.is(DBSPTypeVec.class);
 
@@ -455,7 +468,7 @@ static ProgramAndTester createTesterCode(
         DBSPLetStatement outputStatement =
                 new DBSPLetStatement("out",
                         new DBSPApplyExpression("read_output_handle", DBSPTypeAny.getDefault(),
-                                streams.getVarReference().field(circuit.getInputTables().size()).borrow()));
+                                streams.getVarReference().field(circuit.getInputTables().size() + outputNumber).borrow()));
         list.add(outputStatement);
         DBSPExpression sort = new DBSPEnumValue("SortOrder", description.getOrder().toString());
 
