diff --git a/integration-tests/src/bindings_tests/replica.c b/integration-tests/src/bindings_tests/replica.c index 88651fc45..639cf5f48 100644 --- a/integration-tests/src/bindings_tests/replica.c +++ b/integration-tests/src/bindings_tests/replica.c @@ -109,6 +109,8 @@ static void test_replica_working_set(void) { tc_working_set_free(ws); + TEST_ASSERT_EQUAL(19, tc_replica_num_local_operations(rep)); + tc_replica_free(rep); } diff --git a/lib/src/replica.rs b/lib/src/replica.rs index 6d9683959..9ad5f29db 100644 --- a/lib/src/replica.rs +++ b/lib/src/replica.rs @@ -360,6 +360,19 @@ pub unsafe extern "C" fn tc_replica_undo(rep: *mut TCReplica, undone_out: *mut i ) } +/// Get the number of local, un-synchronized operations, or -1 on error +#[no_mangle] +pub unsafe extern "C" fn tc_replica_num_local_operations(rep: *mut TCReplica) -> i64 { + wrap( + rep, + |rep| { + let count = rep.num_local_operations()? as i64; + Ok(count) + }, + -1, + ) +} + /// Add an UndoPoint, if one has not already been added by this Replica. This occurs automatically /// when a change is made. The `force` flag allows forcing a new UndoPoint even if one has already /// been created by this Replica, and may be useful when a Replica instance is held for a long time diff --git a/lib/taskchampion.h b/lib/taskchampion.h index a4ec0061e..c5a1eddf2 100644 --- a/lib/taskchampion.h +++ b/lib/taskchampion.h @@ -557,6 +557,11 @@ TCResult tc_replica_sync(struct TCReplica *rep, struct TCServer *server, bool av */ TCResult tc_replica_undo(struct TCReplica *rep, int32_t *undone_out); +/** + * Get the number of local, un-synchronized operations, or -1 on error + */ +int64_t tc_replica_num_local_operations(struct TCReplica *rep); + /** * Add an UndoPoint, if one has not already been added by this Replica. This occurs automatically * when a change is made. The `force` flag allows forcing a new UndoPoint even if one has already diff --git a/taskchampion/src/replica.rs b/taskchampion/src/replica.rs index 3787f3b25..4bbbc9c32 100644 --- a/taskchampion/src/replica.rs +++ b/taskchampion/src/replica.rs @@ -254,6 +254,11 @@ impl Replica { } Ok(()) } + + /// Get the number of operations local to this replica and not yet synchronized to the server. + pub fn num_local_operations(&mut self) -> anyhow::Result { + self.taskdb.num_operations() + } } #[cfg(test)] @@ -399,6 +404,8 @@ mod tests { }, ] ); + + assert_eq!(rep.num_local_operations().unwrap(), 10); } #[test] diff --git a/taskchampion/src/storage/inmemory.rs b/taskchampion/src/storage/inmemory.rs index 4a4463c19..bde13637b 100644 --- a/taskchampion/src/storage/inmemory.rs +++ b/taskchampion/src/storage/inmemory.rs @@ -91,6 +91,10 @@ impl<'t> StorageTxn for Txn<'t> { Ok(self.data_ref().operations.clone()) } + fn num_operations(&mut self) -> anyhow::Result { + Ok(self.data_ref().operations.len()) + } + fn add_operation(&mut self, op: ReplicaOp) -> anyhow::Result<()> { self.mut_data_ref().operations.push(op); Ok(()) diff --git a/taskchampion/src/storage/mod.rs b/taskchampion/src/storage/mod.rs index dd3c9786a..d577103e5 100644 --- a/taskchampion/src/storage/mod.rs +++ b/taskchampion/src/storage/mod.rs @@ -82,6 +82,10 @@ pub trait StorageTxn { /// server yet) fn operations(&mut self) -> Result>; + /// Get the current set of outstanding operations (operations that have not been sync'd to the + /// server yet) + fn num_operations(&mut self) -> Result; + /// Add an operation to the end of the list of operations in the storage. Note that this /// merely *stores* the operation; it is up to the TaskDb to apply it. fn add_operation(&mut self, op: ReplicaOp) -> Result<()>; diff --git a/taskchampion/src/storage/sqlite.rs b/taskchampion/src/storage/sqlite.rs index 1f1fe239a..7e30931a4 100644 --- a/taskchampion/src/storage/sqlite.rs +++ b/taskchampion/src/storage/sqlite.rs @@ -257,6 +257,12 @@ impl<'t> StorageTxn for Txn<'t> { Ok(ret) } + fn num_operations(&mut self) -> anyhow::Result { + let t = self.get_txn()?; + let count: usize = t.query_row("SELECT count(*) FROM operations", [], |x| x.get(0))?; + Ok(count) + } + fn add_operation(&mut self, op: ReplicaOp) -> anyhow::Result<()> { let t = self.get_txn()?; @@ -627,6 +633,8 @@ mod test { ReplicaOp::Create { uuid: uuid2 }, ] ); + + assert_eq!(txn.num_operations()?, 2); } // set them to a different bunch @@ -678,6 +686,7 @@ mod test { }, ] ); + assert_eq!(txn.num_operations()?, 4); } Ok(()) } diff --git a/taskchampion/src/taskdb/mod.rs b/taskchampion/src/taskdb/mod.rs index 7e802313f..71404d968 100644 --- a/taskchampion/src/taskdb/mod.rs +++ b/taskchampion/src/taskdb/mod.rs @@ -128,6 +128,12 @@ impl TaskDb { undo::undo(txn.as_mut()) } + /// Get the number of un-synchronized operations in storage. + pub fn num_operations(&mut self) -> anyhow::Result { + let mut txn = self.storage.txn().unwrap(); + txn.num_operations() + } + // functions for supporting tests #[cfg(test)]