Exctract proto from socket-layer feature.

Signed-off-by: Yury-Fridlyand <[email protected]>
valkey-io · Dec 24, 2024 · a89fbfd · a89fbfd
1 parent fe9f9ed
commit a89fbfd
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,3 +52,6 @@ utils/TestUtils.js
 
 # java compiled files.
 *.class
+
+# generaged files (e.g. protobuf)
+generated/
diff --git a/glide-core/Cargo.toml b/glide-core/Cargo.toml
@@ -43,11 +43,12 @@ serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 
 [features]
+proto = ["protobuf"]
 socket-layer = [
+    "proto",
     "directories",
     "integer-encoding",
     "num_cpus",
-    "protobuf",
     "tokio-util",
 ]
 standalone_heartbeat = []

diff --git a/glide-core/build.rs b/glide-core/build.rs
@@ -1,6 +1,6 @@
 // Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 fn build_protobuf() {
     let customization_options = protobuf_codegen::Customize::default()
         .lite_runtime(false)
@@ -13,10 +13,11 @@ fn build_protobuf() {
         .input("src/protobuf/response.proto")
         .input("src/protobuf/connection_request.proto")
         .customize(customization_options)
+        .out_dir("src/generated")
         .run_from_script();
 }
 
 fn main() {
-    #[cfg(feature = "socket-layer")]
+    #[cfg(feature = "proto")]
     build_protobuf();
 }
diff --git a/glide-core/src/client/types.rs b/glide-core/src/client/types.rs
@@ -6,7 +6,7 @@ use logger_core::log_warn;
 use std::collections::HashSet;
 use std::time::Duration;
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 use crate::connection_request as protobuf;
 
 #[derive(Default)]
@@ -73,7 +73,7 @@ pub struct ConnectionRetryStrategy {
     pub number_of_retries: u32,
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 fn chars_to_string_option(chars: &::protobuf::Chars) -> Option<String> {
     if chars.is_empty() {
         None
@@ -82,7 +82,7 @@ fn chars_to_string_option(chars: &::protobuf::Chars) -> Option<String> {
     }
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 fn none_if_zero(value: u32) -> Option<u32> {
     if value == 0 {
         None
@@ -91,7 +91,7 @@ fn none_if_zero(value: u32) -> Option<u32> {
     }
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 impl From<protobuf::ConnectionRequest> for ConnectionRequest {
     fn from(value: protobuf::ConnectionRequest) -> Self {
         let read_from = value.read_from.enum_value().ok().map(|val| match val {

diff --git a/glide-core/src/lib.rs b/glide-core/src/lib.rs
@@ -1,7 +1,7 @@
 // Copyright Valkey GLIDE Project Contributors - SPDX Identifier: Apache-2.0
 
-#[cfg(feature = "socket-layer")]
-include!(concat!(env!("OUT_DIR"), "/protobuf/mod.rs"));
+#[cfg(feature = "proto")]
+include!("generated/mod.rs");
 pub mod client;
 mod retry_strategies;
 #[cfg(feature = "socket-layer")]

diff --git a/glide-core/src/request_type.rs b/glide-core/src/request_type.rs
@@ -2,7 +2,7 @@
 
 use redis::{cmd, Cmd};
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 use crate::command_request::RequestType as ProtobufRequestType;
 
 #[repr(C)]
@@ -431,7 +431,7 @@ fn get_two_word_command(first: &str, second: &str) -> Cmd {
     cmd
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 impl From<::protobuf::EnumOrUnknown<ProtobufRequestType>> for RequestType {
     fn from(value: ::protobuf::EnumOrUnknown<ProtobufRequestType>) -> Self {
         match value.enum_value_or(ProtobufRequestType::InvalidRequest) {

diff --git a/glide-core/src/retry_strategies.rs b/glide-core/src/retry_strategies.rs
@@ -54,7 +54,7 @@ pub(crate) fn get_exponential_backoff(
     }
 }
 
-#[cfg(feature = "socket-layer")]
+#[cfg(feature = "proto")]
 #[allow(dead_code)]
 pub(crate) fn get_fixed_interval_backoff(
     fixed_interval: u32,

diff --git a/go/Cargo.toml b/go/Cargo.toml
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 redis = { path = "../glide-core/redis-rs/redis", features = ["aio", "tokio-comp", "connection-manager", "tokio-rustls-comp"] }
-glide-core = { path = "../glide-core", features = ["socket-layer"] }
+glide-core = { path = "../glide-core", features = ["proto"] }
 tokio = { version = "^1", features = ["rt", "macros", "rt-multi-thread", "time"] }
 protobuf = { version = "3.3.0", features = [] }
 

diff --git a/go/src/lib.rs b/go/src/lib.rs
@@ -28,7 +28,7 @@ use tokio::runtime::Runtime;
 #[derive(Debug)]
 pub struct CommandResponse {
     response_type: ResponseType,
-    int_value: c_long,
+    int_value: i64,
     float_value: c_double,
     bool_value: bool,