Clustering #145
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| host = "127.0.0.1" | ||
| port = 8081 | ||
| path = "data/" | ||
| writer_memory = 200000000 | ||
| log_level = "debug" | ||
| json_parsing_threads = 4 | ||
| bulk_buffer_size = 10000 | ||
| auto_commit_duration = 10 | ||
| enable_clustering = true | ||
| master = false | ||
| nodes = [ | ||
| "127.0.0.1:8081" | ||
| ] | ||
|
|
||
| [merge_policy] | ||
| kind = "log" | ||
| min_merge_size = 8 | ||
| min_layer_size = 10_000 | ||
| level_log_size = 0.75 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ use std::sync::{Arc, RwLock}; | |
|
|
||
| use futures::{future, future::Future, stream::Stream}; | ||
| use log::{error, info}; | ||
| use tantivy::schema::Schema; | ||
| use tokio::net::{TcpListener, TcpStream}; | ||
| use tokio_executor::DefaultExecutor; | ||
| use tower_buffer::Buffer; | ||
|
|
@@ -15,8 +16,7 @@ use tower_util::MakeService; | |
|
|
||
| use crate::cluster::cluster_rpc::server; | ||
| use crate::cluster::cluster_rpc::*; | ||
| use crate::cluster::{GrpcConn, RPCError}; | ||
| use crate::handle::IndexHandle; | ||
| use crate::index::IndexCatalog; | ||
| use crate::query; | ||
|
|
@@ -68,7 +68,7 @@ impl RpcServer { | |
| .map(|c| { | ||
| let uri = uri; | ||
| let connection = Builder::new().uri(uri).build(c).unwrap(); | ||
| let buffer = match Buffer::new(connection, 128) { | ||
| Ok(b) => b, | ||
| _ => panic!("asdf"), | ||
| }; | ||
|
|
@@ -84,73 +84,99 @@ impl RpcServer { | |
| pub fn create_search_reply(result: Option<ResultReply>, doc: Vec<u8>) -> SearchReply { | ||
| SearchReply { result, doc } | ||
| } | ||
|
|
||
| pub fn error_response<T>(code: Code, msg: String) -> future::FutureResult<Response<T>, Error> { | ||
| let status = Status::with_code_and_message(code, msg); | ||
| future::failed(Error::Grpc(status)) | ||
| } | ||
| } | ||
|
|
||
| impl server::IndexService for RpcServer { | ||
| type ListIndexesFuture = future::FutureResult<Response<ListReply>, Error>; | ||
| type PlaceIndexFuture = future::FutureResult<Response<ResultReply>, Error>; | ||
| type PlaceDocumentFuture = future::FutureResult<Response<ResultReply>, Error>; | ||
| type PlaceReplicaFuture = future::FutureResult<Response<ResultReply>, Error>; | ||
| type SearchIndexFuture = future::FutureResult<Response<SearchReply>, Error>; | ||
|
|
||
| fn list_indexes(&mut self, _: Request<ListRequest>) -> Self::ListIndexesFuture { | ||
| if let Ok(ref cat) = self.catalog.read() { | ||
|
There was a problem hiding this comment. does this call block? if so we should probably wrap this call in a |
||
| let indexes = cat.get_collection(); | ||
| let lists: Vec<String> = indexes.into_iter().map(|(t, _)| t.to_string()).collect(); | ||
| let resp = Response::new(ListReply { indexes: lists }); | ||
| future::finished(resp) | ||
| } else { | ||
| Self::error_response(Code::NotFound, "Could not get lock on index catalog".into()) | ||
| } | ||
| } | ||
|
|
||
| fn search_index(&mut self, request: Request<SearchRequest>) -> Self::SearchIndexFuture { | ||
| let inner = request.into_inner(); | ||
| if let Ok(ref cat) = self.catalog.read() { | ||
|
|
||
| if let Ok(index) = cat.get_index(&inner.index) { | ||
| let query: query::Request = serde_json::from_slice(&inner.query).unwrap(); | ||
| info!("QUERY = {:?}", query); | ||
| match index.search_index(query) { | ||
| Ok(query_results) => { | ||
| let query_bytes: Vec<u8> = serde_json::to_vec(&query_results).unwrap(); | ||
| let result = Some(RpcServer::create_result(0, "".into())); | ||
| future::finished(Response::new(RpcServer::create_search_reply(result, query_bytes))) | ||
| } | ||
| Err(e) => { | ||
| let result = Some(RpcServer::create_result(1, e.to_string())); | ||
| future::finished(Response::new(RpcServer::create_search_reply(result, vec![]))) | ||
| } | ||
| } | ||
| } else { | ||
| Self::error_response(Code::NotFound, format!("Index: {} not found", inner.index)) | ||
| } | ||
| } else { | ||
| Self::error_response( | ||
| Code::NotFound, | ||
| format!("Could not obtain lock on catalog for index: {}", inner.index), | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| fn place_index(&mut self, request: Request<PlaceRequest>) -> Self::PlaceIndexFuture { | ||
| let PlaceRequest { index, schema } = request.into_inner(); | ||
| if let Ok(ref mut cat) = self.catalog.write() { | ||
|
|
||
| if let Ok(schema) = serde_json::from_slice::<Schema>(&schema) { | ||
| let ip = cat.base_path().clone(); | ||
| if let Ok(new_index) = IndexCatalog::create_from_managed(ip, &index.clone(), schema) { | ||
| if let Ok(_) = cat.add_index(index.clone(), new_index) { | ||
| let result = RpcServer::create_result(0, "".into()); | ||
| future::finished(Response::new(result)) | ||
| } else { | ||
| Self::error_response(Code::Internal, format!("Insert: {} failed", index.clone())) | ||
| } | ||
| } else { | ||
| Self::error_response(Code::Internal, format!("Could not create index: {}", index.clone())) | ||
| } | ||
| } else { | ||
| Self::error_response(Code::NotFound, "Invalid schema in request".into()) | ||
| } | ||
| } else { | ||
| Self::error_response(Code::NotFound, format!("Cannot obtain lock on catalog for index: {}", index)) | ||
| } | ||
| } | ||
|
|
||
| fn place_document(&mut self, _request: Request<DocumentRequest>) -> Self::PlaceDocumentFuture { | ||
| unimplemented!() | ||
| } | ||
|
|
||
| fn place_replica(&mut self, _request: Request<ReplicaRequest>) -> Self::PlaceReplicaFuture { | ||
| unimplemented!() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod tests { | ||
| use futures::future::Future; | ||
| use http::Uri; | ||
|
|
||
| use crate::index::tests::create_test_catalog; | ||
| use crate::query::Query; | ||
|
|
||
| use super::*; | ||
|
|
||
| #[test] | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
prob want this to be an
error!😄