Page MenuHomePhabricator
Differential D9955

[web] refactor processing store ops to separate function
ClosedPublic
Actions

Authored by kamil on Nov 22 2023, 8:28 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 11:34 AM
Unknown Object (File)
Mon, Mar 17, 8:06 PM
Unknown Object (File)
Mon, Mar 17, 8:06 PM
Unknown Object (File)
Mon, Mar 17, 8:06 PM
Unknown Object (File)
Mon, Mar 17, 8:06 PM
Unknown Object (File)
Mon, Mar 17, 8:00 PM
Unknown Object (File)
Sat, Mar 1, 9:00 PM
Unknown Object (File)
Fri, Feb 28, 1:33 AM
View All Files
Subscribers
ashoat

Details

Reviewers
tomek
michal
Commits
rCOMMe0fc738fb7ca: [web] refactor processing store ops to separate function
Summary

Refactor to make code cleaner

Depends on D9954

Test Plan

Make sure processing ops still works

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
web/
database/
utils/
36 lines
redux/
46 lines

Diff 33708

View Options

web/database/utils/store.js

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::put_request; use proto::put_request;
use proto::put_request::Data::*; use proto::put_request::Data::*;
use proto::PutRequest; use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, c_char_pointer_to_string_new, check_error, c_char_pointer_to_string, c_char_pointer_to_string_new, report_error, string_to_c_char_pointer_new,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail; use anyhow::bail;
use crate::RUNTIME; use crate::RUNTIME;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Lines if let Ok(mut grpc_client) =
} }
return Err(format!("could not access client for holder {}", holder)); return Err(format!("could not access client for holder {}", holder));
} }
Err("could not successfully connect to the blob server".to_string()) Err("could not successfully connect to the blob server".to_string())
} }
pub fn put_client_blocking_read_cxx( pub fn put_client_blocking_read_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<String, String> { ) -> anyhow::Result<String, anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; Ok(RUNTIME.block_on(async {
let response: Option<String> = RUNTIME.block_on(async {
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.get_mut(&holder); let maybe_client = clients.get_mut(&holder);
if let Some(client) = maybe_client { if let Some(client) = maybe_client {
if let Some(data) = client.rx.recv().await { if let Some(data) = client.rx.recv().await {
return Some(data); return Ok(data);
} else { } else {
report_error( bail!("couldn't receive data via client's receiver");
&ERROR_MESSAGES,
"couldn't receive data via client's receiver",
Some("put"),
);
} }
} else { } else {
report_error( bail!(format!("no client detected for {} in blocking read", holder));
&ERROR_MESSAGES,
"no client detected in blocking read",
Some("put"),
);
} }
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("put")); bail!("couldn't access clients");
} }
None })?)
});
check_error(&ERROR_MESSAGES)?;
response.ok_or("response not received properly".to_string())
} }
/** /**
* field index: * field index:
* 1 - holder (utf8 string) * 1 - holder (utf8 string)
* 2 - blob hash (utf8 string) * 2 - blob hash (utf8 string)
* 3 - data chunk (bytes) * 3 - data chunk (bytes)
*/ */
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines
View Options

web/redux/redux-setup.js

mod proto { mod proto {
tonic::include_proto!("blob"); tonic::include_proto!("blob");
} }
use proto::blob_service_client::BlobServiceClient; use proto::blob_service_client::BlobServiceClient;
use proto::put_request; use proto::put_request;
use proto::put_request::Data::*; use proto::put_request::Data::*;
use proto::PutRequest; use proto::PutRequest;
use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY}; use crate::constants::{BLOB_ADDRESS, MPSC_CHANNEL_BUFFER_CAPACITY};
use crate::tools::{ use crate::tools::{
c_char_pointer_to_string, c_char_pointer_to_string_new, check_error, c_char_pointer_to_string, c_char_pointer_to_string_new, report_error, string_to_c_char_pointer_new,
report_error, string_to_c_char_pointer, string_to_c_char_pointer_new,
}; };
use anyhow::bail; use anyhow::bail;
use crate::RUNTIME; use crate::RUNTIME;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use libc; use libc;
use libc::c_char; use libc::c_char;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::CStr; use std::ffi::CStr;
▲ Show 20 Lines • Show All 168 Lines • ▼ Show 20 Lines if let Ok(mut grpc_client) =
} }
return Err(format!("could not access client for holder {}", holder)); return Err(format!("could not access client for holder {}", holder));
} }
Err("could not successfully connect to the blob server".to_string()) Err("could not successfully connect to the blob server".to_string())
} }
pub fn put_client_blocking_read_cxx( pub fn put_client_blocking_read_cxx(
holder_char: *const c_char, holder_char: *const c_char,
) -> Result<String, String> { ) -> anyhow::Result<String, anyhow::Error> {
let holder = c_char_pointer_to_string(holder_char)?; let holder = c_char_pointer_to_string_new(holder_char)?;
check_error(&ERROR_MESSAGES)?; Ok(RUNTIME.block_on(async {
let response: Option<String> = RUNTIME.block_on(async {
if let Ok(mut clients) = CLIENTS.lock() { if let Ok(mut clients) = CLIENTS.lock() {
let maybe_client = clients.get_mut(&holder); let maybe_client = clients.get_mut(&holder);
if let Some(client) = maybe_client { if let Some(client) = maybe_client {
if let Some(data) = client.rx.recv().await { if let Some(data) = client.rx.recv().await {
return Some(data); return Ok(data);
} else { } else {
report_error( bail!("couldn't receive data via client's receiver");
&ERROR_MESSAGES,
"couldn't receive data via client's receiver",
Some("put"),
);
} }
} else { } else {
report_error( bail!(format!("no client detected for {} in blocking read", holder));
&ERROR_MESSAGES,
"no client detected in blocking read",
Some("put"),
);
} }
} else { } else {
report_error(&ERROR_MESSAGES, "couldn't access client", Some("put")); bail!("couldn't access clients");
} }
None })?)
});
check_error(&ERROR_MESSAGES)?;
response.ok_or("response not received properly".to_string())
} }
/** /**
* field index: * field index:
* 1 - holder (utf8 string) * 1 - holder (utf8 string)
* 2 - blob hash (utf8 string) * 2 - blob hash (utf8 string)
* 3 - data chunk (bytes) * 3 - data chunk (bytes)
*/ */
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines