Integrate new query plan repr into core

Author: gefjon

crates/core/src/host/instance_env.rs

@@ -21,7 +21,7 @@ use spacetimedb_sats::buffer::BufWriter;
 use spacetimedb_sats::db::def::{IndexDef, IndexType};
 use spacetimedb_sats::relation::{FieldExpr, FieldName};
 use spacetimedb_sats::{ProductType, Typespace};
-use spacetimedb_vm::expr::{Code, ColumnOp};
+use spacetimedb_vm::expr::{Code, ColumnOp, SourceBuilder};
 
 #[derive(Clone)]
 pub struct InstanceEnv {
@@ -368,11 +368,16 @@ impl InstanceEnv {
             filter,
         )
         .map_err(NodesError::DecodeFilter)?;
-        let q = spacetimedb_vm::dsl::query(&*schema).with_select(filter_to_column_op(&schema.table_name, filter));
+
+        let mut sources = SourceBuilder::default();
+        let source_expr = sources.add_table_schema(&schema);
+        let mut sources = sources.into_source_set();
+
+        let q = spacetimedb_vm::dsl::query(source_expr).with_select(filter_to_column_op(&schema.table_name, filter));
         //TODO: How pass the `caller` here?
         let mut tx: TxMode = tx.into();
         let p = &mut DbProgram::new(ctx, stdb, &mut tx, AuthCtx::for_current(self.dbic.identity));
-        let results = match spacetimedb_vm::eval::run_ast(p, q.into()) {
+        let results = match spacetimedb_vm::eval::run_ast(p, q.into(), &mut sources) {
             Code::Table(table) => table,
             _ => unreachable!("query should always return a table"),
         };

crates/core/src/host/wasm_common/module_host_actor.rs

@@ -6,7 +6,7 @@ use std::time::Duration;
 use spacetimedb_lib::buffer::DecodeError;
 use spacetimedb_lib::identity::AuthCtx;
 use spacetimedb_lib::{bsatn, Address, ModuleDef, TableDesc};
-use spacetimedb_vm::expr::CrudExpr;
+use spacetimedb_vm::expr::{CrudExpr, SourceSet};
 
 use super::instrumentation::CallTimes;
 use crate::database_instance_context::DatabaseInstanceContext;
@@ -268,8 +268,9 @@ impl<T: WasmModule> Module for WasmModuleHostActor<T> {
         let auth = AuthCtx::new(self.database_instance_context.identity, caller_identity);
         log::debug!("One-off query: {query}");
         let ctx = &ExecutionContext::sql(db.address());
-        let compiled = db.with_read_only(ctx, |tx| {
-            sql::compiler::compile_sql(db, tx, &query)?
+        let (compiled, mut sources): (Vec<_>, Box<SourceSet>) = db.with_read_only(ctx, |tx| {
+            let (ast, sources) = sql::compiler::compile_sql_merge_sources(db, tx, &query)?;
+            let compiled = ast
                 .into_iter()
                 .map(|expr| {
                     if matches!(expr, CrudExpr::Query { .. }) {
@@ -278,10 +279,11 @@ impl<T: WasmModule> Module for WasmModuleHostActor<T> {
                         Err(anyhow!("One-off queries are not allowed to modify the database"))
                     }
                 })
-                .collect::<Result<_, _>>()
+                .collect::<Result<_, _>>()?;
+            Ok::<_, DBError>((compiled, sources))
         })?;
 
-        sql::execute::execute_sql(db, compiled, auth)
+        sql::execute::execute_sql(db, compiled, auth, &mut sources)
     }
 
     fn clear_table(&self, table_name: String) -> Result<(), anyhow::Error> {