Skip to content

Commit

Permalink
update servers
Browse files Browse the repository at this point in the history
  • Loading branch information
HammadB committed Sep 24, 2024
1 parent 7b95c87 commit bd105c6
Showing 1 changed file with 48 additions and 3 deletions.
51 changes: 48 additions & 3 deletions rust/worker/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,16 @@ impl WorkerServer {
}
};

let (collection_version, log_position) = match request.version_context {
Some(version_context) => (
version_context.collection_version,
version_context.log_position,
),
None => {
return Err(Status::invalid_argument("No version context provided"));
}
};

let mut proto_results_for_all = Vec::new();

let mut query_vectors = Vec::new();
Expand Down Expand Up @@ -182,8 +192,8 @@ impl WorkerServer {
self.hnsw_index_provider.clone(),
self.blockfile_provider.clone(),
dispatcher,
request.version_context,
request.version_context.log_position,
collection_version,
log_position,
);
orchestrator.run().await
}
Expand Down Expand Up @@ -258,6 +268,16 @@ impl WorkerServer {
}
};

let (collection_version, log_position) = match request.version_context {
Some(version_context) => (
version_context.collection_version,
version_context.log_position,
),
None => {
return Err(Status::invalid_argument("No version context provided"));
}
};

let dispatcher = match self.dispatcher {
Some(ref dispatcher) => dispatcher.clone(),
None => {
Expand All @@ -281,6 +301,8 @@ impl WorkerServer {
self.sysdb.clone(),
dispatcher,
self.blockfile_provider.clone(),
collection_version,
log_position,
);
let result = orchestrator.run().await;
let mut result = match result {
Expand Down Expand Up @@ -337,6 +359,16 @@ impl WorkerServer {
}
};

let (collection_version, log_position) = match request.version_context {
Some(version_context) => (
version_context.collection_version,
version_context.log_position,
),
None => {
return Err(Status::invalid_argument("No version context provided"));
}
};

let dispatcher = match self.dispatcher {
Some(ref dispatcher) => dispatcher,
None => {
Expand Down Expand Up @@ -394,6 +426,8 @@ impl WorkerServer {
request.offset,
request.limit,
request.include_metadata,
collection_version,
log_position,
);

let result = orchestrator.run().await;
Expand Down Expand Up @@ -508,7 +542,16 @@ impl chroma_proto::metadata_reader_server::MetadataReader for WorkerServer {
}
};

println!("Querying count for segment {}", segment_uuid);
let (collection_version, log_position) = match request.version_context {
Some(version_context) => (
version_context.collection_version,
version_context.log_position,
),
None => {
return Err(Status::invalid_argument("No version context provided"));
}
};

let dispatcher = match self.dispatcher {
Some(ref dispatcher) => dispatcher,
None => {
Expand All @@ -531,6 +574,8 @@ impl chroma_proto::metadata_reader_server::MetadataReader for WorkerServer {
self.sysdb.clone(),
dispatcher.clone(),
self.blockfile_provider.clone(),
collection_version,
log_position,
);

let result = orchestrator.run().await;
Expand Down

0 comments on commit bd105c6

Please sign in to comment.