Skip to content

Commit

Permalink
Rebase
Browse files Browse the repository at this point in the history 
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
  • Loading branch information
@Yury-Fridlyand
Yury-Fridlyand committed Mar 7, 2024
1 parent d89b733 commit 70cc9d9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 44 deletions.
17 changes: 11 additions & 6 deletions csharp/lib/AsyncClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,12 @@ private void FailureCallback(ulong index, ErrorType error_type, IntPtr ptr)
#region FFI function declarations

private delegate void StringAction(ulong index, IntPtr str);
/// <summary>
/// Glide request failure callback.
/// </summary>
/// <param name="index">Request ID</param>
/// <param name="error_type">Error type</param>
/// <param name="error">Error message</param>
private delegate void FailureAction(ulong index, ErrorType error_type, IntPtr error);
[DllImport("libglide_rs", CallingConvention = CallingConvention.Cdecl, EntryPoint = "get")]
private static extern void GetFfi(IntPtr client, ulong index, IntPtr key);
Expand All @@ -111,13 +117,12 @@ private void FailureCallback(ulong index, ErrorType error_type, IntPtr ptr)
[DllImport("libglide_rs", CallingConvention = CallingConvention.Cdecl, EntryPoint = "close_client")]
private static extern void CloseClientFfi(IntPtr client);

enum ErrorType : uint
internal enum ErrorType : uint
{
ClosingError = 0,
TimeoutError = 1,
ExecAbortError = 2,
ConnectionError = 3,
Unspecified = 4 // TODO rename
Unspecified = 0,
ExecAbort = 1,
Timeout = 2,
Disconnect = 3,
}

#endregion
Expand Down
52 changes: 14 additions & 38 deletions csharp/lib/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
* Copyright GLIDE-for-Redis Project Contributors - SPDX Identifier: Apache-2.0
*/
use glide_core::connection_request;
use glide_core::errors::{error_message, error_type, RequestErrorType};
use glide_core::{client::Client as GlideClient, connection_request::NodeAddress};
use redis::{Cmd, FromRedisValue, RedisError, RedisResult};
use redis::{Cmd, FromRedisValue, RedisResult};
use std::{
ffi::{c_void, CStr, CString},
os::raw::c_char,
Expand All @@ -19,19 +20,10 @@ pub enum Level {
Trace = 4,
}

#[repr(u32)]
pub enum ErrorType {
ClosingError = 0,
TimeoutError = 1,
ExecAbortError = 2,
ConnectionError = 3,
Unspecified = 4 // TODO rename
}

pub struct Client {
client: GlideClient,
success_callback: unsafe extern "C" fn(usize, *const c_char) -> (),
failure_callback: unsafe extern "C" fn(usize, ErrorType, *const c_char) -> (),
failure_callback: unsafe extern "C" fn(usize, RequestErrorType, *const c_char) -> (),
runtime: Runtime,
}

Expand Down Expand Up @@ -61,7 +53,7 @@ fn create_client_internal(
port: u32,
use_tls: bool,
success_callback: unsafe extern "C" fn(usize, *const c_char) -> (),
failure_callback: unsafe extern "C" fn(usize, ErrorType, *const c_char) -> (),
failure_callback: unsafe extern "C" fn(usize, RequestErrorType, *const c_char) -> (),
) -> RedisResult<Client> {
let host_cstring = unsafe { CStr::from_ptr(host as *mut c_char) };
let host_string = host_cstring.to_str()?.to_string();
Expand All @@ -87,7 +79,7 @@ pub extern "C" fn create_client(
port: u32,
use_tls: bool,
success_callback: unsafe extern "C" fn(usize, *const c_char) -> (),
failure_callback: unsafe extern "C" fn(usize, ErrorType, *const c_char) -> (),
failure_callback: unsafe extern "C" fn(usize, RequestErrorType, *const c_char) -> (),
) -> *const c_void {
match create_client_internal(host, port, use_tls, success_callback, failure_callback) {
Err(_) => std::ptr::null(), // TODO - log errors
Expand Down Expand Up @@ -128,8 +120,9 @@ pub extern "C" fn set(
match result {
Ok(_) => (client.success_callback)(callback_index, std::ptr::null()), // TODO - should return "OK" string.
Err(err) => {
let c_err_str = CString::new(err.to_string()).expect("CString::new failed");
(client.failure_callback)(callback_index, redis_error_to_ffi_error(err), c_err_str.as_ptr())
logger_core::log_debug("command error", format!("callback {}, error {}, kind {:?}, code {:?}, category {:?}, detail {:?}", callback_index, err, err.kind(), err.code(), err.category(), err.detail()));
let c_err_str = CString::new(error_message(&err)).expect("CString::new failed");
(client.failure_callback)(callback_index, error_type(&err), c_err_str.as_ptr())
}
};
}
Expand All @@ -156,8 +149,9 @@ pub extern "C" fn get(client_ptr: *const c_void, callback_index: usize, key: *co
Ok(value) => value,
Err(err) => {
unsafe {
let c_err_str = CString::new(err.to_string()).expect("CString::new failed");
(client.failure_callback)(callback_index, redis_error_to_ffi_error(err), c_err_str.as_ptr())
logger_core::log_debug("command error", format!("callback {}, error {}, kind {:?}, code {:?}, category {:?}, detail {:?}", callback_index, err, err.kind(), err.code(), err.category(), err.detail()));
let c_err_str = CString::new(error_message(&err)).expect("CString::new failed");
(client.failure_callback)(callback_index, error_type(&err), c_err_str.as_ptr())
};
return;
}
Expand All @@ -169,33 +163,15 @@ pub extern "C" fn get(client_ptr: *const c_void, callback_index: usize, key: *co
Ok(None) => (client.success_callback)(callback_index, std::ptr::null()),
Ok(Some(c_str)) => (client.success_callback)(callback_index, c_str.as_ptr()),
Err(err) => {
let c_err_str = CString::new(err.to_string()).expect("CString::new failed");
(client.failure_callback)(callback_index, redis_error_to_ffi_error(err), c_err_str.as_ptr())
logger_core::log_debug("command error", format!("callback {}, error {}, kind {:?}, code {:?}, category {:?}, detail {:?}", callback_index, err, err.kind(), err.code(), err.category(), err.detail()));
let c_err_str = CString::new(error_message(&err)).expect("CString::new failed");
(client.failure_callback)(callback_index, error_type(&err), c_err_str.as_ptr())
}
};
}
});
}

fn redis_error_to_ffi_error(err : RedisError) -> ErrorType {
logger_core::log_error("=== err", format!("{}, kind {:?}, code {:?}, category {:?}, detail {:?}", err, err.kind(), err.code(), err.category(), err.detail()));

if err.is_connection_dropped() {
ErrorType::ConnectionError
} else if err.is_timeout() {
ErrorType::TimeoutError
} else if err.kind() == redis::ErrorKind::ExecAbortError {
ErrorType::ExecAbortError
} else {
ErrorType::Unspecified
}
// TODO Closing error when
// - unknown request type
// - failed to parse args
// - failed to parse route
// - empty request
}

impl From<logger_core::Level> for Level {
fn from(level: logger_core::Level) -> Self {
match level {
Expand Down

0 comments on commit 70cc9d9

Please sign in to comment.