Skip to content

Commit b755b43

Browse files
committed
libsql: fix sync macro feature flags
1 parent 64d6127 commit b755b43

File tree

5 files changed

+14
-5
lines changed

5 files changed

+14
-5
lines changed

libsql/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ sync = [
109109
"dep:futures",
110110
"dep:serde_json",
111111
"dep:crc32fast",
112-
"dep:chrono"
112+
"dep:chrono",
113+
"dep:uuid",
114+
"tokio/fs"
113115
]
114116
hrana = [
115117
"parser",

libsql/src/database.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,12 @@ cfg_core! {
3434
}
3535

3636
cfg_replication_or_sync! {
37+
3738
pub type FrameNo = u64;
3839

3940
#[derive(Debug)]
41+
// TODO(lucio): remove this once we use these fields in our sync code
42+
#[allow(dead_code)]
4043
pub struct Replicated {
4144
pub(crate) frame_no: Option<FrameNo>,
4245
pub(crate) frames_synced: usize,
@@ -47,12 +50,16 @@ cfg_replication_or_sync! {
4750
/// where in the log you might be. Beware that this value can be reset to a lower value by the
4851
/// server in certain situations. Please use `frames_synced` if you want to track the amount of
4952
/// work a sync has done.
53+
// TODO(lucio): remove this once we use these fields in our sync code
54+
#[allow(dead_code)]
5055
pub fn frame_no(&self) -> Option<FrameNo> {
5156
self.frame_no
5257
}
5358

5459
/// The count of frames synced during this call of `sync`. A frame is a 4kB frame from the
5560
/// libsql write ahead log.
61+
// TODO(lucio): remove this once we use these fields in our sync code
62+
#[allow(dead_code)]
5663
pub fn frames_synced(&self) -> usize {
5764
self.frames_synced
5865
}

libsql/src/database/builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ impl Builder<()> {
119119
}
120120
}
121121

122-
cfg_replication_or_remote! {
122+
cfg_replication_or_remote_or_sync! {
123123
/// Remote configuration type used in [`Builder`].
124124
pub struct Remote {
125125
url: String,
@@ -505,7 +505,7 @@ cfg_remote! {
505505
}
506506
}
507507

508-
cfg_replication_or_remote! {
508+
cfg_replication_or_remote_or_sync! {
509509
impl Remote {
510510
fn connector<C>(mut self, connector: C) -> Remote
511511
where

libsql/src/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ macro_rules! cfg_core {
1010
}
1111
}
1212

13-
macro_rules! cfg_replication_or_remote {
13+
macro_rules! cfg_replication_or_remote_or_sync {
1414
($($item:item)*) => {
1515
$(
1616
#[cfg(any(feature = "replication", feature = "sync", feature = "remote"))]

libsql/src/util/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cfg_replication_or_remote! {
1+
cfg_replication_or_remote_or_sync! {
22
pub mod box_clone_service;
33
mod http;
44
pub(crate) use self::http::{ConnectorService, Socket};

0 commit comments

Comments
 (0)