Skip to content

Commit

Permalink
fix: alert path and query (#791)
Browse files Browse the repository at this point in the history
Fixes -
1. alert path changed
2. check for all stream.json for query
3. cargo clippy changes
  • Loading branch information
nikhilsinhaparseable authored May 4, 2024
1 parent d4dcd0e commit 62aea42
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
3 changes: 3 additions & 0 deletions server/src/catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ pub trait Snapshot {
}

pub trait ManifestFile {
#[allow(unused)]
fn file_name(&self) -> &str;
#[allow(unused)]
fn ingestion_size(&self) -> u64;
#[allow(unused)]
fn file_size(&self) -> u64;
fn num_rows(&self) -> u64;
fn columns(&self) -> &[Column];
Expand Down
8 changes: 4 additions & 4 deletions server/src/option.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

use clap::error::ErrorKind;
use clap::{command, Args, Command, FromArgMatches};

use core::fmt;
use once_cell::sync::Lazy;
use parquet::basic::{BrotliLevel, GzipLevel, ZstdLevel};
use std::env;
Expand Down Expand Up @@ -234,9 +234,9 @@ impl Mode {
}
}

impl ToString for Mode {
fn to_string(&self) -> String {
self.to_str().to_string()
impl fmt::Display for Mode {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.to_str())
}
}

Expand Down
2 changes: 1 addition & 1 deletion server/src/query/stream_schema_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ impl TableProvider for StandardTableProvider {
let obs = glob_storage
.get_objects(
Some(&path),
Box::new(|file_name| file_name.ends_with("manifest.json")),
Box::new(|file_name| file_name.ends_with("stream.json")),
)
.await;
if let Ok(obs) = obs {
Expand Down
3 changes: 2 additions & 1 deletion server/src/storage/object_storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ pub trait ObjectStorage: Sync + 'static {
}

/// for future use
#[allow(dead_code)]
async fn get_stats_for_first_time(
&self,
stream_name: &str,
Expand Down Expand Up @@ -581,7 +582,7 @@ pub fn parseable_json_path() -> RelativePathBuf {
/// TODO: Needs to be updated for distributed mode
#[inline(always)]
fn alert_json_path(stream_name: &str) -> RelativePathBuf {
RelativePathBuf::from_iter([stream_name, ALERT_FILE_NAME])
RelativePathBuf::from_iter([stream_name, STREAM_ROOT_DIRECTORY, ALERT_FILE_NAME])
}

#[inline(always)]
Expand Down

0 comments on commit 62aea42

Please sign in to comment.