Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes after rebase
Browse files Browse the repository at this point in the history
sandreae committed Aug 31, 2023
1 parent 5b8c0e9 commit a664aa1
Showing 3 changed files with 9 additions and 4 deletions.
10 changes: 8 additions & 2 deletions aquadoggo/src/db/stores/blob.rs
Original file line number Diff line number Diff line change
@@ -131,9 +131,15 @@ impl SqlStore {
FROM
document_view_fields
LEFT JOIN
{OPERATION_FIELDS}
operation_fields_v1
ON
document_view_fields.operation_id = operation_fields_v1.operation_id
AND
document_view_fields.name = operation_fields_v1.name
LEFT JOIN
{DOCUMENT_VIEWS}
document_views
ON
document_view_fields.document_view_id = document_views.document_view_id
WHERE
operation_fields_v1.field_type IN ('pinned_relation', 'pinned_relation_list', 'relation_list', 'relation')
AND
1 change: 0 additions & 1 deletion aquadoggo/src/replication/manager.rs
Original file line number Diff line number Diff line change
@@ -695,7 +695,6 @@ mod tests {
test_runner(move |node: TestNode| async move {
let mode = Mode::LogHeight;
let (tx, _rx) = broadcast::channel(8);
let schema_provider = SchemaProvider::default();
let ingest = SyncIngest::new(SchemaProvider::default(), tx);

// Sanity check: Id of peer A is < id of peer B.
2 changes: 1 addition & 1 deletion aquadoggo/src/replication/strategies/log_height.rs
Original file line number Diff line number Diff line change
@@ -668,7 +668,7 @@ mod tests {
)
.await;

let target_set = TargetSet::new(&target_set_schema);
let target_set = SchemaIdSet::new(&target_set_schema);
let _ = node_a.context.schema_provider.update(schema).await;

let strategy_a =

0 comments on commit a664aa1

Please sign in to comment.