Paths

Table of Contentst

-
keyserver/src/
-
src/
-
database/
1/2
search-utils.js
-
fetchers/
1/2
message-fetchers.js

[kayserver] Fix search endpoint failing when called with a stopword
ClosedPublic
Actions

Authored by inka on Jun 7 2023, 6:45 AM.

Details

Reviewers

kamil
bartek

Commits

rCOMM35b7721bd5aa: [kayserver] Fix search endpoint failing when called with a stopword

Summary

issue: https://linear.app/comm/issue/ENG-4055/search-endpoint-failing-when-called-with-only-a-stopword
When searchMessagesInSingleChat was passed a string with only stopwords, they were stripped away by processQueryForSearch and the pattern variable was '+', which is not a valid patter for MATCH AGAINST query

Test Plan

call the endpoint with a string that had only stopwords, checked that there are no errors. Called the endpoint with a string containing both a stopword and a non stopword, checked that it returns correct values. Checked he endpoint with a string containing only a non stopword.

Diff Detail

Repository

rCOMM Comm

Branch

inka/validate_endpoint

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

inka created this revision.Jun 7 2023, 6:45 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptJun 7 2023, 6:45 AM

I could also just check if pattern === '+' and not change the processQueryForSearch function, but I like this approach better

Harbormaster completed remote builds in B20089: Diff 27524.Jun 7 2023, 7:02 AM

inka requested review of this revision.Jun 7 2023, 7:02 AM

kamil accepted this revision.Jun 12 2023, 1:27 AM

kamil added inline comments.

keyserver/src/database/search-utils.js
139	maybe worth adding a test case with something like: `expect(processQueryForSearch(stopWord)).toBe('');`

This revision is now accepted and ready to land.Jun 12 2023, 1:27 AM

bartek accepted this revision.Jun 12 2023, 1:48 AM

Add a test

Harbormaster completed remote builds in B20186: Diff 27652.Jun 12 2023, 7:47 AM

Closed by commit rCOMM35b7721bd5aa: [kayserver] Fix search endpoint failing when called with a stopword (authored by • InkaSokolowska). · Explain WhyJun 12 2023, 10:58 PM

This revision was automatically updated to reflect the committed changes.

• InkaSokolowska added a commit: rCOMM35b7721bd5aa: [kayserver] Fix search endpoint failing when called with a stopword.

Revision Contents
Changeset List

Path

Size

keyserver/

src/

database/

search-utils.js

4 lines

fetchers/

message-fetchers.js

7 lines

Diff 27524

View Options

keyserver/src/database/search-utils.js

use derive_more::{Display, Error, From};		use derive_more::{Display, Error, From};
use futures_core::Stream;		use futures_core::Stream;
use futures_util::StreamExt;		use futures_util::{StreamExt, TryStreamExt};
use reqwest::Url;		use reqwest::{
		multipart::{Form, Part},
		Body, Url,
		};
use tracing::{debug, trace, warn};		use tracing::{debug, trace, warn};

// publicly re-export some reqwest types		// publicly re-export some reqwest types
pub use reqwest::Error as ReqwestError;		pub use reqwest::Error as ReqwestError;
pub use reqwest::StatusCode;		pub use reqwest::StatusCode;

#[derive(From, Error, Debug, Display)]		#[derive(From, Error, Debug, Display)]
pub enum BlobServiceError {		pub enum BlobServiceError {
▲ Show 20 Lines • Show All 91 Lines • ▼ Show 20 Lines	) -> BlobResult<impl Stream<Item = BlobResult<Vec<u8>>>> {
}		}

let error = handle_http_error(response.status());		let error = handle_http_error(response.status());
if let Ok(message) = response.text().await {		if let Ok(message) = response.text().await {
trace!("Error response message: {}", message);		trace!("Error response message: {}", message);
}		}
Err(error)		Err(error)
}		}

		/// Uploads a blob. Returns `BlobServiceError::AlreadyExists` if blob with given hash
		/// already exists.
		///
		/// # Example
		/// ```rust
		/// use std::io::{Error, ErrorKind};
		///
		/// let client =
		/// BlobServiceClient::new("http://localhost:50053".parse()?);
		///
		/// let stream = async_stream::stream! {
		/// yield Ok(vec![1, 2, 3]);
		/// yield Ok(vec![4, 5, 6]);
		/// yield Err(Error::new(ErrorKind::Other, "Oops"));
		/// };
		/// client.upload_blob(&blob_hash, stream).await?;
		/// ```
		pub async fn upload_blob<H, S>(
		&self,
		blob_hash: H,
		data_stream: S,
		) -> BlobResult<()>
		where
		H: Into<String>,
		S: futures_core::stream::TryStream + Send + Sync + 'static,
		S::Error: Into<Box<dyn std::error::Error + Send + Sync>>,
		Vec<u8>: From<S::Ok>,
		bartekAuthorUnsubmitted Done Inline Actions Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl Into<Box<dyn Error>>>` bartek: Requirements of the reqwest body stream: A stream of `Result<impl Into<Vec<u8>>, impl…
		{
		debug!("Revoke holder request");
		michalUnsubmitted Not Done Inline Actions Wrong message? michal: Wrong message?
		let url = self.get_blob_url(None)?;

		let stream = data_stream.map_ok(Vec::from);
		let streaming_body = Body::wrap_stream(stream);
		let form = Form::new()
		.text("blob_hash", blob_hash.into())
		.part("blob_data", Part::stream(streaming_body));

		let response = self.http_client.put(url).multipart(form).send().await?;
		debug!("Response status: {}", response.status());

		if response.status().is_success() {
		trace!("Blob upload successful");
		return Ok(());
		}

		let error = handle_http_error(response.status());
		if let Ok(message) = response.text().await {
		trace!("Error response message: {}", message);
		}
		Err(error)
		}
}		}

// private helper methods		// private helper methods
impl BlobServiceClient {		impl BlobServiceClient {
fn get_blob_url(		fn get_blob_url(
&self,		&self,
blob_hash: Option<&str>,		blob_hash: Option<&str>,
) -> Result<Url, BlobServiceError> {		) -> Result<Url, BlobServiceError> {
Show All 24 Lines