Skip to content

Commit c6a0497

Browse files
committed
conflict
1 parent 218f1d2 commit c6a0497

File tree

2 files changed

+1
-624
lines changed

2 files changed

+1
-624
lines changed

crates/core/src/db/relational_db.rs

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use spacetimedb_datastore::locking_tx_datastore::state_view::{
1717
IterByColEqMutTx, IterByColRangeMutTx, IterMutTx, IterTx, StateView,
1818
};
1919
use spacetimedb_datastore::locking_tx_datastore::{MutTxId, TxId};
20-
use spacetimedb_datastore::system_tables::{system_tables, StClientFields, StClientRow, StModuleRow, ST_CLIENT_ID};
20+
use spacetimedb_datastore::system_tables::{system_tables, StModuleRow};
2121
use spacetimedb_datastore::system_tables::{StFields, StVarFields, StVarName, StVarRow, ST_MODULE_ID, ST_VAR_ID};
2222
use spacetimedb_datastore::traits::{
2323
InsertFlags, IsolationLevel, Metadata, MutTx as _, MutTxDatastore, Program, RowTypeForTable, Tx as _, TxDatastore,
@@ -412,32 +412,6 @@ impl RelationalDB {
412412
.map_err(DBError::from)
413413
}
414414

415-
/// Look up a client row by identity and connection ID in the `st_clients` system table.
416-
///
417-
/// `Ok(None)` if no such row exists.
418-
pub fn st_client_row(
419-
&self,
420-
identity: Identity,
421-
connection_id: ConnectionId,
422-
) -> Result<Option<RowPointer>, DBError> {
423-
let row = StClientRow {
424-
identity: identity.into(),
425-
connection_id: connection_id.into(),
426-
};
427-
428-
self.with_read_only(Workload::Internal, |tx| {
429-
self.inner
430-
.iter_by_col_range_tx(
431-
tx,
432-
ST_CLIENT_ID,
433-
col_list![StClientFields::Identity, StClientFields::ConnectionId],
434-
&AlgebraicValue::product(row),
435-
)
436-
.map(|mut it| it.next().map(|row_ref| row_ref.pointer()))
437-
})
438-
.map_err(DBError::from)
439-
}
440-
441415
/// Update the module associated with this database.
442416
///
443417
/// The caller must ensure that:

0 commit comments

Comments
 (0)