Skip to content

Commit b8762be

Browse files
committed
move ast
1 parent 04b7ea8 commit b8762be

10 files changed

Lines changed: 9 additions & 88 deletions

File tree

crates/core/src/estimation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ mod tests {
132132
use crate::db::relational_db::tests_utils::{begin_tx, insert, with_auto_commit};
133133
use crate::db::relational_db::{tests_utils::TestDB, RelationalDB};
134134
use crate::error::DBError;
135-
use crate::sql::ast::SchemaViewer;
135+
use spacetimedb_engine::ast::SchemaViewer;
136136
use spacetimedb_lib::{identity::AuthCtx, AlgebraicType};
137137
use spacetimedb_query::compile_subscription;
138138
use spacetimedb_sats::product;

crates/core/src/host/module_host.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::host::{InvalidFunctionArguments, InvalidViewArguments};
1818
use crate::identity::Identity;
1919
use crate::messages::control_db::{Database, HostType};
2020
use crate::replica_context::ReplicaContext;
21-
use crate::sql::ast::SchemaViewer;
21+
use spacetimedb_engine::ast::SchemaViewer;
2222
use crate::sql::execute::SqlResult;
2323
use crate::subscription::module_subscription_actor::ModuleSubscriptions;
2424
use crate::subscription::module_subscription_manager::BroadcastError;
@@ -67,7 +67,6 @@ use spacetimedb_schema::auto_migrate::{AutoMigrateError, MigrationPolicy};
6767
use spacetimedb_schema::def::{ModuleDef, ProcedureDef, ReducerDef, ViewDef};
6868
use spacetimedb_schema::identifier::Identifier;
6969
use spacetimedb_schema::reducer_name::ReducerName;
70-
7170
use spacetimedb_schema::table_name::TableName;
7271
use std::collections::VecDeque;
7372
use std::fmt;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::identity::Identity;
2222
use crate::messages::control_db::HostType;
2323
use crate::module_host_context::ModuleCreationContext;
2424
use crate::replica_context::ReplicaContext;
25-
use crate::sql::ast::SchemaViewer;
25+
use spacetimedb_engine::ast::SchemaViewer;
2626
use crate::sql::execute::run_with_instance;
2727
use crate::subscription::module_subscription_actor::{commit_and_broadcast_event, CommitAndBroadcastEventSuccess};
2828
use crate::subscription::module_subscription_manager::TransactionOffset;

crates/core/src/sql/ast.rs

Lines changed: 0 additions & 77 deletions
This file was deleted.

crates/core/src/sql/execute.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::sync::Arc;
22
use std::time::Duration;
33

4-
use super::ast::SchemaViewer;
5-
use crate::db::relational_db::RelationalDB;
64
use crate::energy::FunctionBudget;
75
use crate::error::DBError;
86
use crate::estimation::{check_row_limit, estimate_rows_scanned};
@@ -17,6 +15,8 @@ use crate::subscription::tx::DeltaTx;
1715
use anyhow::anyhow;
1816
use spacetimedb_datastore::execution_context::Workload;
1917
use spacetimedb_datastore::traits::IsolationLevel;
18+
use spacetimedb_engine::ast::SchemaViewer;
19+
use spacetimedb_engine::relational_db::RelationalDB;
2020
use spacetimedb_expr::statement::Statement;
2121
use spacetimedb_lib::identity::AuthCtx;
2222
use spacetimedb_lib::metrics::ExecutionMetrics;

crates/core/src/sql/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
pub mod ast;
21
pub mod execute;

crates/core/src/subscription/module_subscription_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2204,7 +2204,7 @@ mod tests {
22042204
use super::{Plan, SubscriptionManager};
22052205
use crate::db::relational_db::tests_utils::with_read_only;
22062206
use crate::host::module_host::DatabaseTableUpdate;
2207-
use crate::sql::ast::SchemaViewer;
2207+
use spacetimedb_engine::ast::SchemaViewer;
22082208
use crate::subscription::module_subscription_manager::ClientQueryId;
22092209
use crate::subscription::row_list_builder_pool::BsatnRowListBuilderPool;
22102210
use crate::subscription::tx::DeltaTx;

crates/core/src/subscription/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::execution_unit::QueryHash;
22
use super::module_subscription_manager::Plan;
33
use crate::db::relational_db::Tx;
44
use crate::error::{DBError, SubscriptionError};
5-
use crate::sql::ast::SchemaViewer;
5+
use spacetimedb_engine::ast::SchemaViewer;
66
use once_cell::sync::Lazy;
77
use regex::Regex;
88
use spacetimedb_datastore::locking_tx_datastore::state_view::StateView;

crates/core/src/subscription/subscription.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::execution_unit::QueryHash;
22
use super::module_subscription_manager::Plan;
33
use crate::db::relational_db::RelationalDB;
44
use crate::error::DBError;
5-
use crate::sql::ast::SchemaViewer;
5+
use spacetimedb_engine::ast::SchemaViewer;
66
use spacetimedb_datastore::locking_tx_datastore::state_view::StateView;
77
use spacetimedb_lib::db::auth::StTableType;
88
use spacetimedb_lib::identity::AuthCtx;

crates/engine/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mod ast;
1+
pub mod ast;
22
pub(crate) mod durability;
33
pub mod error;
44
pub mod metrics;

0 commit comments

Comments
 (0)