Define TableName and ReducerName backed by EcoString

Cargo.toml

@@ -179,6 +179,7 @@ derive_more = "0.99"
 dialoguer = { version = "0.11", default-features = false }
 dirs = "5.0.1"
 duct = "0.13.5"
+ecow = "0.2.6"
 either = "1.9"
 email_address = "0.2.4"
 enum-as-inner = "0.6"

crates/bench/benches/special.rs

@@ -8,6 +8,7 @@ use spacetimedb_bench::{
 use spacetimedb_lib::sats::{self, bsatn};
 use spacetimedb_lib::{bsatn::ToBsatn as _, ProductValue};
 use spacetimedb_schema::schema::TableSchema;
+use spacetimedb_schema::table_name::TableName;
 use spacetimedb_table::page_pool::PagePool;
 use spacetimedb_testing::modules::{Csharp, ModuleLanguage, Rust};
 use std::sync::Arc;
@@ -136,7 +137,7 @@ fn serialize_benchmarks<
     });
 
     let mut table_schema = TableSchema::from_product_type(T::product_type());
-    table_schema.table_name = name.into();
+    table_schema.table_name = TableName::new_from_str(name);
     let mut table = spacetimedb_table::table::Table::new(
         Arc::new(table_schema),
         spacetimedb_table::indexes::SquashedOffset::COMMITTED_STATE,

crates/bench/benches/subscription.rs

@@ -19,6 +19,7 @@ use spacetimedb_primitives::{col_list, TableId};
 use spacetimedb_query::compile_subscription;
 use spacetimedb_sats::{bsatn, product, AlgebraicType, AlgebraicValue, ProductValue};
 
+use spacetimedb_schema::table_name::TableName;
 #[cfg(not(target_env = "msvc"))]
 use tikv_jemallocator::Jemalloc;
 
@@ -54,7 +55,7 @@ fn create_table_footprint(db: &RelationalDB) -> Result<TableId, DBError> {
 fn insert_op(table_id: TableId, table_name: &str, row: ProductValue) -> DatabaseTableUpdate {
     DatabaseTableUpdate {
         table_id,
-        table_name: table_name.into(),
+        table_name: TableName::new_from_str(table_name),
         inserts: [row].into(),
         deletes: [].into(),
     }

crates/bench/src/schemas.rs

@@ -3,6 +3,7 @@
 use serde::Deserialize;
 use spacetimedb_lib::de::Deserialize as SatsDeserializer;
 use spacetimedb_lib::sats;
+use spacetimedb_schema::table_name::TableName;
 use std::fmt::Debug;
 use std::hash::Hash;
 
@@ -159,11 +160,11 @@ impl IndexStrategy {
     }
 }
 
-pub fn table_name<T: BenchTable>(style: IndexStrategy) -> String {
+pub fn table_name<T: BenchTable>(style: IndexStrategy) -> TableName {
     let prefix = style.name();
     let name = T::name();
 
-    format!("{prefix}_{name}")
+    TableName::new_from_str(&format!("{prefix}_{name}"))
 }
 
 // ---------- data synthesis ----------

crates/bench/src/spacetime_module.rs

@@ -7,6 +7,7 @@ use spacetimedb_lib::{
 };
 use spacetimedb_paths::RootDir;
 use spacetimedb_primitives::ColId;
+use spacetimedb_schema::table_name::TableName;
 use spacetimedb_testing::modules::{start_runtime, LoggerRecord, ModuleHandle, ModuleLanguage};
 use tokio::runtime::Runtime;
 
@@ -192,6 +193,6 @@ impl<L: ModuleLanguage> BenchDatabase for SpacetimeModule<L> {
 
 #[derive(Debug, Clone)]
 pub struct TableId {
-    pascal_case: String,
-    snake_case: String,
+    pascal_case: TableName,
+    snake_case: TableName,
 }

crates/bench/src/spacetime_raw.rs

@@ -42,7 +42,7 @@ impl BenchDatabase for SpacetimeRaw {
         let name = table_name::<T>(index_strategy);
         self.db.with_auto_commit(Workload::Internal, |tx| {
             let mut table_schema = TableSchema::from_product_type(T::product_type());
-            table_schema.table_name = name.clone().into();
+            table_schema.table_name = name.clone();
             let table_id = self.db.create_table(tx, table_schema)?;
             self.db.rename_table(tx, table_id, &name)?;
             match index_strategy {

crates/bench/src/sqlite.rs

@@ -8,6 +8,7 @@ use rusqlite::Connection;
 use spacetimedb_data_structures::map::HashMap;
 use spacetimedb_lib::sats::{AlgebraicType, AlgebraicValue, ProductType};
 use spacetimedb_primitives::ColId;
+use spacetimedb_schema::table_name::TableName;
 use std::{
     fmt::Write,
     hint::black_box,
@@ -47,7 +48,7 @@ impl BenchDatabase for SQLite {
         })
     }
 
-    type TableId = String;
+    type TableId = TableName;
 
     /// We derive the SQLite schema from the AlgebraicType of the table.
     fn create_table<T: BenchTable>(

crates/codegen/src/rust.rs

@@ -11,6 +11,7 @@ use spacetimedb_lib::sats::layout::PrimitiveType;
 use spacetimedb_lib::sats::AlgebraicTypeRef;
 use spacetimedb_schema::def::{ModuleDef, ProcedureDef, ReducerDef, ScopedTypeName, TableDef, TypeDef};
 use spacetimedb_schema::identifier::Identifier;
+use spacetimedb_schema::reducer_name::ReducerName;
 use spacetimedb_schema::schema::TableSchema;
 use spacetimedb_schema::type_for_generate::{AlgebraicTypeDef, AlgebraicTypeUse};
 use std::collections::BTreeSet;
@@ -1089,19 +1090,19 @@ fn table_access_trait_name(table_name: &Identifier) -> String {
     table_name.deref().to_case(Case::Pascal) + "TableAccess"
 }
 
-fn function_args_type_name(function_name: &Identifier) -> String {
-    function_name.deref().to_case(Case::Pascal) + "Args"
+fn function_args_type_name(function_name: &str) -> String {
+    function_name.to_case(Case::Pascal) + "Args"
 }
 
-fn reducer_variant_name(reducer_name: &Identifier) -> String {
+fn reducer_variant_name(reducer_name: &ReducerName) -> String {
     reducer_name.deref().to_case(Case::Pascal)
 }
 
-fn reducer_callback_id_name(reducer_name: &Identifier) -> String {
+fn reducer_callback_id_name(reducer_name: &ReducerName) -> String {
     reducer_name.deref().to_case(Case::Pascal) + "CallbackId"
 }
 
-fn reducer_module_name(reducer_name: &Identifier) -> String {
+fn reducer_module_name(reducer_name: &ReducerName) -> String {
     reducer_name.deref().to_case(Case::Snake) + "_reducer"
 }
 

crates/codegen/src/typescript.rs

@@ -17,6 +17,7 @@ use spacetimedb_lib::sats::AlgebraicTypeRef;
 use spacetimedb_primitives::ColId;
 use spacetimedb_schema::def::{ConstraintDef, IndexDef, ModuleDef, ReducerDef, ScopedTypeName, TableDef, TypeDef};
 use spacetimedb_schema::identifier::Identifier;
+use spacetimedb_schema::reducer_name::ReducerName;
 use spacetimedb_schema::schema::TableSchema;
 use spacetimedb_schema::type_for_generate::{AlgebraicTypeDef, AlgebraicTypeUse, ProductTypeDef};
 
@@ -213,7 +214,7 @@ impl Lang for TypeScript {
         for reducer in iter_reducers(module) {
             let reducer_name = &reducer.name;
             let reducer_module_name = reducer_module_name(reducer_name);
-            let args_type = reducer_args_type_name(&reducer.name);
+            let args_type = reducer_args_type_name(reducer_name);
             writeln!(out, "import {args_type} from \"./{reducer_module_name}\";");
             writeln!(out, "export {{ {args_type} }};");
         }
@@ -818,15 +819,15 @@ fn table_module_name(table_name: &Identifier) -> String {
     table_name.deref().to_case(Case::Snake) + "_table"
 }
 
-fn reducer_args_type_name(reducer_name: &Identifier) -> String {
+fn reducer_args_type_name(reducer_name: &ReducerName) -> String {
     reducer_name.deref().to_case(Case::Pascal) + "Reducer"
 }
 
 fn procedure_args_type_name(reducer_name: &Identifier) -> String {
     reducer_name.deref().to_case(Case::Pascal) + "Procedure"
 }
 
-fn reducer_module_name(reducer_name: &Identifier) -> String {
+fn reducer_module_name(reducer_name: &ReducerName) -> String {
     reducer_name.deref().to_case(Case::Snake) + "_reducer"
 }
 

crates/core/src/client/message_handlers.rs

@@ -11,6 +11,7 @@ use spacetimedb_datastore::execution_context::WorkloadType;
 use spacetimedb_lib::de::serde::DeserializeWrapper;
 use spacetimedb_lib::identity::RequestId;
 use spacetimedb_lib::{bsatn, ConnectionId, Timestamp};
+use spacetimedb_schema::reducer_name::ReducerName;
 use std::borrow::Cow;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
@@ -178,7 +179,7 @@ impl MessageExecutionError {
             caller_identity: self.caller_identity,
             caller_connection_id: self.caller_connection_id,
             function_call: ModuleFunctionCall {
-                reducer: self.reducer.unwrap_or_else(|| "<none>".into()).into(),
+                reducer: ReducerName::new_from_str(&self.reducer.unwrap_or_else(|| "<none>".into())),
                 reducer_id: self.reducer_id.unwrap_or(u32::MAX.into()),
                 args: Default::default(),
             },

crates/core/src/client/messages.rs

@@ -7,6 +7,7 @@ use crate::subscription::row_list_builder_pool::BsatnRowListBuilderPool;
 use crate::subscription::websocket_building::{brotli_compress, decide_compression, gzip_compress};
 use bytes::{BufMut, Bytes, BytesMut};
 use bytestring::ByteString;
+use core::ops::Deref;
 use derive_more::From;
 use spacetimedb_client_api_messages::websocket::{
     BsatnFormat, Compression, FormatSwitch, JsonFormat, OneOffTable, RowListLen, WebsocketFormat,
@@ -18,6 +19,7 @@ use spacetimedb_lib::ser::serde::SerializeWrapper;
 use spacetimedb_lib::{AlgebraicValue, ConnectionId, TimeDuration, Timestamp};
 use spacetimedb_primitives::TableId;
 use spacetimedb_sats::bsatn;
+use spacetimedb_schema::table_name::TableName;
 use std::sync::Arc;
 use std::time::Instant;
 
@@ -281,7 +283,7 @@ impl ToProtocol for TransactionUpdateMessage {
                 status,
                 caller_identity: event.caller_identity,
                 reducer_call: ws::ReducerCallInfo {
-                    reducer_name: event.function_call.reducer.to_owned().into(),
+                    reducer_name: event.function_call.reducer.deref().into(),
                     reducer_id: event.function_call.reducer_id.into(),
                     args,
                     request_id,
@@ -378,7 +380,7 @@ pub struct SubscriptionData {
 #[derive(Debug, Clone)]
 pub struct SubscriptionRows {
     pub table_id: TableId,
-    pub table_name: Box<str>,
+    pub table_name: TableName,
     pub table_rows: FormatSwitch<ws::TableUpdate<BsatnFormat>, ws::TableUpdate<JsonFormat>>,
 }
 
@@ -449,7 +451,7 @@ impl ToProtocol for SubscriptionMessage {
                             query_id,
                             rows: ws::SubscribeRows {
                                 table_id: result.table_id,
-                                table_name: result.table_name,
+                                table_name: result.table_name.to_boxed_str(),
                                 table_rows,
                             },
                         }
@@ -462,7 +464,7 @@ impl ToProtocol for SubscriptionMessage {
                             query_id,
                             rows: ws::SubscribeRows {
                                 table_id: result.table_id,
-                                table_name: result.table_name,
+                                table_name: result.table_name.to_boxed_str(),
                                 table_rows,
                             },
                         }
@@ -480,7 +482,7 @@ impl ToProtocol for SubscriptionMessage {
                             query_id,
                             rows: ws::SubscribeRows {
                                 table_id: result.table_id,
-                                table_name: result.table_name,
+                                table_name: result.table_name.to_boxed_str(),
                                 table_rows,
                             },
                         }
@@ -493,7 +495,7 @@ impl ToProtocol for SubscriptionMessage {
                             query_id,
                             rows: ws::SubscribeRows {
                                 table_id: result.table_id,
-                                table_name: result.table_name,
+                                table_name: result.table_name.to_boxed_str(),
                                 table_rows,
                             },
                         }

crates/core/src/db/durability.rs

@@ -254,6 +254,7 @@ mod tests {
     use futures::FutureExt as _;
     use pretty_assertions::assert_matches;
     use spacetimedb_sats::product;
+    use spacetimedb_schema::table_name::TableName;
     use tokio::sync::watch;
 
     use super::*;
@@ -317,7 +318,7 @@ mod tests {
             let mut txdata = TxData::default();
             txdata.set_tx_offset(i);
             // Ensure the transaction is non-empty.
-            txdata.set_inserts_for_table(4000.into(), "foo", [product![42u8]].into());
+            txdata.set_inserts_for_table(4000.into(), &TableName::new_from_str("foo"), [product![42u8]].into());
 
             worker.request_durability(None, &Arc::new(txdata));
         }

crates/core/src/db/mod.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use enum_map::EnumMap;
+use spacetimedb_schema::reducer_name::ReducerName;
 use tokio::sync::mpsc;
 
 use crate::subscription::ExecutionCounters;
@@ -37,7 +38,7 @@ pub struct Config {
 /// We use a separate task to record metrics to avoid blocking transactions.
 pub struct MetricsMessage {
     /// The reducer the produced these metrics.
-    reducer: String,
+    reducer: ReducerName,
     /// Metrics from a mutable transaction.
     metrics_for_writer: Option<TxMetrics>,
     /// Metrics from a read-only transaction.
@@ -60,7 +61,7 @@ pub struct MetricsRecorderQueue {
 impl MetricsRecorderQueue {
     pub fn send_metrics(
         &self,
-        reducer: String,
+        reducer: ReducerName,
         metrics_for_writer: Option<TxMetrics>,
         metrics_for_reader: Option<TxMetrics>,
         tx_data: Option<Arc<TxData>>,