Skip to content

Commit f0c92ca

Browse files
MarinPostmaMarinPostma
committed
add more tests for schema migration with replication
1 parent 4b0fb7e commit f0c92ca

File tree

9 files changed

+324
-76
lines changed

9 files changed

+324
-76
lines changed

‎libsql-server/src/connection/connection_core.rs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,15 @@ mod test {
659659
let ctx = RequestContext::new(
660660
Authenticated::FullAccess,
661661
NamespaceName::default(),
662-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
663-
.await
664-
.unwrap(),
662+
MetaStore::new(
663+
Default::default(),
664+
tmp.path(),
665+
maker().unwrap(),
666+
manager,
667+
crate::database::DatabaseKind::Primary,
668+
)
669+
.await
670+
.unwrap(),
665671
);
666672
conn.execute_program(
667673
Program::seq(&["CREATE TABLE test (x)"]),

‎libsql-server/src/namespace/configurator/replica.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ impl ConfigureNamespace for ReplicaConfigurator {
6666
let channel = self.channel.clone();
6767
let uri = self.uri.clone();
6868

69-
dbg!(&name);
7069
let rpc_client = ReplicationLogClient::with_origin(channel.clone(), uri.clone());
7170
let client = crate::replication::replicator_client::Client::new(
7271
name.clone(),
@@ -88,7 +87,7 @@ impl ConfigureNamespace for ReplicaConfigurator {
8887

8988
tracing::debug!("try perform handshake");
9089
// force a handshake now, to retrieve the primary's current replication index
91-
match replicator.try_perform_handshake().await.map_err(|e| dbg!(e)) {
90+
match replicator.try_perform_handshake().await {
9291
Err(libsql_replication::replicator::Error::Meta(
9392
libsql_replication::meta::Error::LogIncompatible,
9493
)) => {
@@ -112,7 +111,6 @@ impl ConfigureNamespace for ReplicaConfigurator {
112111
Ok(_) => (),
113112
}
114113

115-
dbg!(&name);
116114
tracing::debug!("done performing handshake");
117115

118116
let primary_current_replicatio_index =
@@ -170,7 +168,6 @@ impl ConfigureNamespace for ReplicaConfigurator {
170168
}
171169
});
172170

173-
dbg!(&name);
174171
let stats = make_stats(
175172
&db_path,
176173
&mut join_set,
@@ -181,7 +178,6 @@ impl ConfigureNamespace for ReplicaConfigurator {
181178
)
182179
.await?;
183180

184-
dbg!(&name);
185181
let connection_maker = MakeLegacyConnection::new(
186182
db_path.clone(),
187183
PassthroughWalWrapper,
@@ -200,7 +196,6 @@ impl ConfigureNamespace for ReplicaConfigurator {
200196
)
201197
.await?;
202198

203-
dbg!(&name);
204199
let connection_maker = Arc::new(
205200
MakeWriteProxyConn::new(
206201
channel.clone(),
@@ -221,13 +216,11 @@ impl ConfigureNamespace for ReplicaConfigurator {
221216
),
222217
);
223218

224-
dbg!(&name);
225219
join_set.spawn(run_storage_monitor(
226220
Arc::downgrade(&stats),
227221
connection_maker.clone(),
228222
));
229223

230-
dbg!(&name);
231224
Ok(Namespace {
232225
tasks: join_set,
233226
db: Database::Replica(ReplicaDatabase { connection_maker }),

‎libsql-server/src/namespace/store.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ impl NamespaceStore {
398398
let init = async {
399399
let ns = self
400400
.make_namespace(namespace, db_config, restore_option)
401-
.await.map_err(|e| dbg!(e))?;
401+
.await?;
402402
Ok(Some(ns))
403403
};
404404

@@ -516,7 +516,6 @@ impl NamespaceStore {
516516
}
517517

518518
fn get_configurator(&self, db_config: &DatabaseConfig) -> &DynConfigurator {
519-
dbg!(self.inner.db_kind);
520519
match self.inner.db_kind {
521520
DatabaseKind::Primary if db_config.is_shared_schema => {
522521
self.inner.configurators.configure_schema().unwrap()

‎libsql-server/src/replication/replicator_client.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ impl ReplicatorClient for Client {
108108
self.primary_replication_index = hello.current_replication_index;
109109
self.session_token.replace(hello.session_token.clone());
110110

111-
dbg!();
112111
if let Some(config) = &hello.config {
113112
// HACK: if we load a shared schema db before the main schema is replicated,
114113
// inserting the new database in the meta store will cause a foreign constraint Error
@@ -117,7 +116,6 @@ impl ReplicatorClient for Client {
117116
if let Some(ref name) = config.shared_schema_name {
118117
let name = NamespaceName::from_string(name.clone())
119118
.map_err(|_| Status::new(Code::InvalidArgument, "invalid namespace name"))?;
120-
dbg!(&name);
121119
self.store
122120
.with(name, |_| ())
123121
.await
@@ -127,7 +125,7 @@ impl ReplicatorClient for Client {
127125
self.meta_store_handle
128126
.store(DatabaseConfig::from(config))
129127
.await
130-
.map_err(|e| dbg!(Error::Internal(e.into())))?;
128+
.map_err(|e| Error::Internal(e.into()))?;
131129

132130
tracing::debug!("replica config has been updated");
133131
} else {

‎libsql-server/src/rpc/streaming_exec.rs‎

Lines changed: 72 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -396,9 +396,15 @@ pub mod test {
396396
let ctx = RequestContext::new(
397397
Authenticated::Anonymous,
398398
NamespaceName::default(),
399-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
400-
.await
401-
.unwrap(),
399+
MetaStore::new(
400+
Default::default(),
401+
tmp.path(),
402+
maker().unwrap(),
403+
manager,
404+
crate::database::DatabaseKind::Primary,
405+
)
406+
.await
407+
.unwrap(),
402408
);
403409
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
404410
pin!(stream);
@@ -422,9 +428,15 @@ pub mod test {
422428
let ctx = RequestContext::new(
423429
Authenticated::FullAccess,
424430
NamespaceName::default(),
425-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
426-
.await
427-
.unwrap(),
431+
MetaStore::new(
432+
Default::default(),
433+
tmp.path(),
434+
maker().unwrap(),
435+
manager,
436+
crate::database::DatabaseKind::Primary,
437+
)
438+
.await
439+
.unwrap(),
428440
);
429441
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
430442

@@ -444,9 +456,15 @@ pub mod test {
444456
let ctx = RequestContext::new(
445457
Authenticated::FullAccess,
446458
NamespaceName::default(),
447-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
448-
.await
449-
.unwrap(),
459+
MetaStore::new(
460+
Default::default(),
461+
tmp.path(),
462+
maker().unwrap(),
463+
manager,
464+
crate::database::DatabaseKind::Primary,
465+
)
466+
.await
467+
.unwrap(),
450468
);
451469
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
452470

@@ -468,9 +486,15 @@ pub mod test {
468486
let ctx = RequestContext::new(
469487
Authenticated::FullAccess,
470488
NamespaceName::default(),
471-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
472-
.await
473-
.unwrap(),
489+
MetaStore::new(
490+
Default::default(),
491+
tmp.path(),
492+
maker().unwrap(),
493+
manager,
494+
crate::database::DatabaseKind::Primary,
495+
)
496+
.await
497+
.unwrap(),
474498
);
475499
// limit the size of the response to force a split
476500
let stream = make_proxy_stream_inner(conn, ctx, ReceiverStream::new(rcv), 500);
@@ -525,9 +549,15 @@ pub mod test {
525549
let ctx = RequestContext::new(
526550
Authenticated::FullAccess,
527551
NamespaceName::default(),
528-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
529-
.await
530-
.unwrap(),
552+
MetaStore::new(
553+
Default::default(),
554+
tmp.path(),
555+
maker().unwrap(),
556+
manager,
557+
crate::database::DatabaseKind::Primary,
558+
)
559+
.await
560+
.unwrap(),
531561
);
532562
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
533563

@@ -552,9 +582,15 @@ pub mod test {
552582
let ctx = RequestContext::new(
553583
Authenticated::FullAccess,
554584
NamespaceName::default(),
555-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
556-
.await
557-
.unwrap(),
585+
MetaStore::new(
586+
Default::default(),
587+
tmp.path(),
588+
maker().unwrap(),
589+
manager,
590+
crate::database::DatabaseKind::Primary,
591+
)
592+
.await
593+
.unwrap(),
558594
);
559595
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
560596

@@ -579,9 +615,15 @@ pub mod test {
579615
let ctx = RequestContext::new(
580616
Authenticated::FullAccess,
581617
NamespaceName::default(),
582-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
583-
.await
584-
.unwrap(),
618+
MetaStore::new(
619+
Default::default(),
620+
tmp.path(),
621+
maker().unwrap(),
622+
manager,
623+
crate::database::DatabaseKind::Primary,
624+
)
625+
.await
626+
.unwrap(),
585627
);
586628
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
587629

@@ -608,9 +650,15 @@ pub mod test {
608650
let ctx = RequestContext::new(
609651
Authenticated::FullAccess,
610652
NamespaceName::default(),
611-
MetaStore::new(Default::default(), tmp.path(), maker().unwrap(), manager, crate::database::DatabaseKind::Primary)
612-
.await
613-
.unwrap(),
653+
MetaStore::new(
654+
Default::default(),
655+
tmp.path(),
656+
maker().unwrap(),
657+
manager,
658+
crate::database::DatabaseKind::Primary,
659+
)
660+
.await
661+
.unwrap(),
614662
);
615663
let stream = make_proxy_stream(conn, ctx, ReceiverStream::new(rcv));
616664

0 commit comments

Comments
 (0)