Skip to content

Commit e696cd7

Browse files
committed
fix changes after rebase
1 parent cffe2a3 commit e696cd7

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

rust/worker/src/execution/operators/apply_log_to_segment_writer.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use std::sync::Arc;
2-
1+
use super::materialize_logs::MaterializeLogOutput;
32
use crate::execution::operator::Operator;
43
use crate::segment::metadata_segment::MetadataSegmentError;
54
use crate::segment::record_segment::ApplyMaterializedLogError;
@@ -9,11 +8,10 @@ use crate::segment::SegmentWriter;
98
use async_trait::async_trait;
109
use chroma_error::ChromaError;
1110
use chroma_error::ErrorCodes;
11+
use std::sync::Arc;
1212
use thiserror::Error;
1313
use tracing::Instrument;
1414

15-
use super::materialize_logs::MaterializeLogOutput;
16-
1715
#[derive(Error, Debug)]
1816
pub enum ApplyLogToSegmentWriterOperatorError {
1917
#[error("Preparation for log materialization failed {0}")]
@@ -88,7 +86,8 @@ impl<Writer: SegmentWriter + Send + Sync + Clone>
8886
.segment_writer
8987
.apply_materialized_log_chunk(materialized_chunk.clone())
9088
.instrument(tracing::trace_span!(
91-
"Apply materialized logs to record segment"
89+
"Apply materialized logs",
90+
segment = input.segment_writer.get_name()
9291
))
9392
.await
9493
{

rust/worker/src/execution/orchestration/compact.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ use crate::system::ComponentHandle;
4141
use crate::system::Handler;
4242
use crate::system::ReceiverForMessage;
4343
use crate::system::System;
44+
use arrow::ipc::writer;
4445
use async_trait::async_trait;
4546
use chroma_blockstore::provider::BlockfileProvider;
4647
use chroma_error::ChromaError;
@@ -671,7 +672,14 @@ impl Handler<TaskResult<MaterializeLogOutput, MaterializeLogOperatorError>>
671672
let materialized_result = Arc::new(materialized_result);
672673

673674
let (record_segment_writer, hnsw_segment_writer, metadata_segment_writer) =
674-
self.get_segment_writers().await.unwrap(); // todo
675+
match self.get_segment_writers().await {
676+
Ok(writers) => writers,
677+
Err(e) => {
678+
tracing::error!("Error getting segment writers: {:?}", e);
679+
terminate_with_error(self.result_channel.take(), e, ctx);
680+
return;
681+
}
682+
};
675683

676684
self.dispatch_apply_log_to_segment_writer_task(
677685
record_segment_writer,

0 commit comments

Comments
 (0)