Skip to content

Commit

Permalink
Merge branch 'main' into profile_quickwit
Browse files Browse the repository at this point in the history
  • Loading branch information
PSeitz authored Oct 29, 2023
2 parents b5520f9 + 02b480a commit 383777a
Show file tree
Hide file tree
Showing 96 changed files with 2,187 additions and 1,040 deletions.
142 changes: 94 additions & 48 deletions quickwit/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion quickwit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ base64 = "0.21"
byte-unit = { version = "4", default-features = false, features = ["serde", "std"] }
bytes = { version = "1", features = ["serde"] }
bytestring = "1.3.0"
chitchat = { git = "https://github.com/quickwit-oss/chitchat", rev = "bc29598" }
chitchat = "0.6"
chrono = { version = "0.4.23", default-features = false, features = ["clock", "std"] }
clap = { version = "4.4.1", features = ["env", "string"] }
colored = "2.0.0"
Expand Down Expand Up @@ -142,6 +142,8 @@ reqwest = { version = "0.11", default-features = false, features = [
"rustls-tls",
] }
rust-embed = "6.8.1"
sea-query = { version = "0" }
sea-query-binder = { version = "0", features = ["sqlx-postgres", "runtime-tokio-rustls",] }
serde = { version = "= 1.0.171", features = ["derive", "rc"] }
serde_json = "1.0"
serde_qs = { version = "0.12", features = ["warp"] }
Expand Down
3 changes: 2 additions & 1 deletion quickwit/quickwit-actors/src/actor_context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ impl<A: Actor> ActorContext<A> {
self.observe_enqueued.swap(true, Ordering::Relaxed)
}

pub(crate) fn observe(&self, actor: &mut A) -> A::ObservableState {
/// Updates the observable state of the actor.
pub fn observe(&self, actor: &mut A) -> A::ObservableState {
let obs_state = actor.observable_state();
self.inner.observe_enqueued.store(false, Ordering::Relaxed);
let _ = self.observable_state_tx.send(obs_state.clone());
Expand Down
Loading

0 comments on commit 383777a

Please sign in to comment.