Skip to content

feat: dont allow custom and time partition together #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2025
Merged

feat: dont allow custom and time partition together #1205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 14 additions & 17 deletions src/parseable/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,21 +468,10 @@ impl Parseable {
}

if !time_partition.is_empty() && custom_partition.is_some() {
let custom_partition_list = custom_partition
.as_ref()
.unwrap()
.split(',')
.collect::<Vec<&str>>();
if custom_partition_list.contains(&time_partition.as_str()) {
return Err(CreateStreamError::Custom {
msg: format!(
"time partition {} cannot be set as custom partition",
time_partition
),
status: StatusCode::BAD_REQUEST,
}
.into());
}
return Err(StreamError::Custom {
msg: "Cannot set both time partition and custom partition".to_string(),
status: StatusCode::BAD_REQUEST,
});
}

let schema = validate_static_schema(
Expand Down Expand Up @@ -630,9 +619,17 @@ impl Parseable {
stream_name: &str,
custom_partition: Option<&String>,
) -> Result<(), StreamError> {
let stream = self.get_stream(stream_name).expect(STREAM_EXISTS);
if stream.get_time_partition().is_some() {
return Err(StreamError::Custom {
msg: "Cannot set both time partition and custom partition".to_string(),
status: StatusCode::BAD_REQUEST,
});
}
if let Some(custom_partition) = custom_partition {
validate_custom_partition(custom_partition)?;
}

self.update_custom_partition_in_stream(stream_name.to_string(), custom_partition)
.await?;

Expand Down Expand Up @@ -829,9 +826,9 @@ pub fn validate_time_partition_limit(

pub fn validate_custom_partition(custom_partition: &str) -> Result<(), CreateStreamError> {
let custom_partition_list = custom_partition.split(',').collect::<Vec<&str>>();
if custom_partition_list.len() > 3 {
if custom_partition_list.len() > 1 {
return Err(CreateStreamError::Custom {
msg: "Maximum 3 custom partition keys are supported".to_string(),
msg: "Maximum 1 custom partition key is supported".to_string(),
status: StatusCode::BAD_REQUEST,
});
}
Expand Down
Loading