move flatbuffer schema/code to separate crate

KSDaemon · KSDaemon · commit 292491d489c7 · 2024-11-20T19:09:38.000+02:00
diff --git a/rust/cubeshared/.gitignore b/rust/cubeshared/.gitignore
@@ -0,0 +1,3 @@
+/target
+/.idea
+.vscode
diff --git a/rust/cubeshared/CHANGELOG.md b/rust/cubeshared/CHANGELOG.md
@@ -0,0 +1,2 @@
+# ChangeLog
+
diff --git a/rust/cubeshared/Cargo.lock b/rust/cubeshared/Cargo.lock
diff --git a/rust/cubeshared/Cargo.toml b/rust/cubeshared/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "cubeshared"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+flatbuffers = "23.1.21"
diff --git a/rust/cubeshared/flatbuffers-codegen.sh b/rust/cubeshared/flatbuffers-codegen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd ./src/codegen || exit 1
+flatc --rust http_message.fbs
diff --git a/rust/cubeshared/rust-toolchain.toml b/rust/cubeshared/rust-toolchain.toml
@@ -0,0 +1,5 @@
+[toolchain]
+#channel = "stable"
+channel = "nightly-2024-07-15"
+components = ["rustfmt", "clippy"]
+profile = "minimal"
diff --git a/rust/cubeshared/rustfmt.toml b/rust/cubeshared/rustfmt.toml
@@ -0,0 +1 @@
+imports_granularity = "Crate"
diff --git a/rust/cubeshared/src/codegen/http_message.fbs b/rust/cubeshared/src/codegen/http_message.fbs
diff --git a/rust/cubeshared/src/codegen/http_message_generated.rs b/rust/cubeshared/src/codegen/http_message_generated.rs
diff --git a/rust/cubeshared/src/codegen/mod.rs b/rust/cubeshared/src/codegen/mod.rs
@@ -1,3 +1,4 @@
+#[allow(unused_imports)]
 mod http_message_generated;
 
 pub use http_message_generated::*;
diff --git a/rust/cubeshared/src/lib.rs b/rust/cubeshared/src/lib.rs
@@ -0,0 +1 @@
+pub mod codegen;
diff --git a/rust/cubestore/Cargo.lock b/rust/cubestore/Cargo.lock
diff --git a/rust/cubestore/cubestore/Cargo.toml b/rust/cubestore/cubestore/Cargo.toml
@@ -27,6 +27,7 @@ cuberockstore = { path = "../cuberockstore" }
 cubehll = { path = "../cubehll" }
 cubezetasketch = { path = "../cubezetasketch" }
 cubedatasketches = { path = "../cubedatasketches" }
+cubeshared = { path = "../../cubeshared" }
 cuberpc = { path = "../cuberpc" }
 datafusion = { git = "https://github.com/cube-js/arrow-datafusion", branch = "cube", features = ["default_nulls_last"] }
 csv = "1.1.3"
diff --git a/rust/cubestore/cubestore/src/http/mod.rs b/rust/cubestore/cubestore/src/http/mod.rs
@@ -4,7 +4,7 @@ use std::sync::Arc;
 
 use warp::{Filter, Rejection, Reply};
 
-use crate::codegen::{
+use cubeshared::codegen::{
     root_as_http_message, HttpColumnValue, HttpColumnValueArgs, HttpError, HttpErrorArgs,
     HttpMessageArgs, HttpQuery, HttpQueryArgs, HttpResultSet, HttpResultSetArgs, HttpRow,
     HttpRowArgs,
@@ -603,10 +603,10 @@ impl HttpMessage {
         let args = HttpMessageArgs {
             message_id: self.message_id,
             command_type: match self.command {
-                HttpCommand::Query { .. } => crate::codegen::HttpCommand::HttpQuery,
-                HttpCommand::ResultSet { .. } => crate::codegen::HttpCommand::HttpResultSet,
+                HttpCommand::Query { .. } => cubeshared::codegen::HttpCommand::HttpQuery,
+                HttpCommand::ResultSet { .. } => cubeshared::codegen::HttpCommand::HttpResultSet,
                 HttpCommand::CloseConnection { .. } | HttpCommand::Error { .. } => {
-                    crate::codegen::HttpCommand::HttpError
+                    cubeshared::codegen::HttpCommand::HttpError
                 }
             },
             command: match &self.command {
@@ -666,7 +666,7 @@ impl HttpMessage {
                 .as_ref()
                 .map(|c| builder.create_string(c)),
         };
-        let message = crate::codegen::HttpMessage::create(&mut builder, &args);
+        let message = cubeshared::codegen::HttpMessage::create(&mut builder, &args);
         builder.finish(message, None);
         builder.finished_data().to_vec() // TODO copy
     }
@@ -762,7 +762,7 @@ impl HttpMessage {
             message_id: http_message.message_id(),
             connection_id: http_message.connection_id().map(|s| s.to_string()),
             command: match http_message.command_type() {
-                crate::codegen::HttpCommand::HttpQuery => {
+                cubeshared::codegen::HttpCommand::HttpQuery => {
                     let query = http_message.command_as_http_query().unwrap();
                     let mut inline_tables = Vec::new();
                     if let Some(query_inline_tables) = query.inline_tables() {
@@ -809,7 +809,7 @@ impl HttpMessage {
                         trace_obj: query.trace_obj().map(|q| q.to_string()),
                     }
                 }
-                crate::codegen::HttpCommand::HttpResultSet => {
+                cubeshared::codegen::HttpCommand::HttpResultSet => {
                     let result_set = http_message.command_as_http_result_set().unwrap();
                     let mut result_rows = Vec::new();
                     if let Some(rows) = result_set.rows() {
@@ -857,7 +857,7 @@ impl HttpMessage {
 
 #[cfg(test)]
 mod tests {
-    use crate::codegen::{HttpMessageArgs, HttpQuery, HttpQueryArgs, HttpTable, HttpTableArgs};
+    use cubeshared::codegen::{HttpMessageArgs, HttpQuery, HttpQueryArgs, HttpTable, HttpTableArgs};
     use crate::config::{init_test_logger, Config};
     use crate::http::{HttpCommand, HttpMessage, HttpServer};
     use crate::metastore::{Column, ColumnType};
@@ -973,11 +973,11 @@ mod tests {
         );
         let args = HttpMessageArgs {
             message_id: 1234,
-            command_type: crate::codegen::HttpCommand::HttpQuery,
+            command_type: cubeshared::codegen::HttpCommand::HttpQuery,
             command: Some(query_value.as_union_value()),
             connection_id: Some(connection_id_offset),
         };
-        let message = crate::codegen::HttpMessage::create(&mut builder, &args);
+        let message = cubeshared::codegen::HttpMessage::create(&mut builder, &args);
         builder.finish(message, None);
         let bytes = builder.finished_data().to_vec();
         let message = HttpMessage::read(bytes).await.unwrap();
diff --git a/rust/cubestore/cubestore/src/lib.rs b/rust/cubestore/cubestore/src/lib.rs
@@ -38,7 +38,6 @@ use tokio::time::error::Elapsed;
 pub mod app_metrics;
 pub mod cachestore;
 pub mod cluster;
-pub mod codegen;
 pub mod config;
 pub mod http;
 pub mod import;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#[allow(unused_imports)]`
`1`	`2`	`mod http_message_generated;`
`2`	`3`
`3`	`4`	`pub use http_message_generated::*;`