From a256bcb435f90f7957a7f4761699d221e6a4e8e2 Mon Sep 17 00:00:00 2001
From: Igor Kuznetsov <kuznetsovin@gmail.com>
Date: Mon, 19 Sep 2022 11:46:47 +0300
Subject: [PATCH] splitting modules preparation
---
sbroad-cartridge/Cargo.toml | 8 ++++++++
.../cartridge/roles/sbroad-router.lua | 0
.../cartridge/roles/sbroad-storage.lua | 0
{sbroad-core => sbroad-cartridge}/src/api.rs | 0
.../src/api/calculate_bucket_id.rs | 0
.../src/api/exec_query.rs | 0
.../src/api/helper.rs | 0
.../src/api/invalidate_cached_schema.rs | 0
.../engine => sbroad-cartridge/src}/cartridge.rs | 0
.../src}/cartridge/backend.rs | 0
.../src}/cartridge/config.rs | 0
.../src}/cartridge/config/tests.rs | 0
.../src}/cartridge/hash.rs | 0
.../src}/cartridge/hash/tests.rs | 0
.../src}/cartridge/router.rs | 0
.../src}/cartridge/storage.rs | 0
sbroad-cartridge/src/lib.rs | 14 ++++++++++++++
{sbroad-core => sbroad-cartridge}/src/router.lua | 0
{sbroad-core => sbroad-cartridge}/src/storage.lua | 0
.../stress-test/README.md | 0
.../stress-test/data_generator.lua | 0
.../stress-test/k6.js | 0
.../stress-test/target_data/generator.lua | 0
.../stress-test/target_data/scenario.js | 0
.../test_app/.cartridge.yml | 0
.../test_app/.editorconfig | 0
.../test_app/.gitignore | 0
.../test_app/.luacheckrc | 0
{sbroad-core => sbroad-cartridge}/test_app/.luacov | 0
.../test_app/Dockerfile.build.cartridge | 0
.../test_app/Dockerfile.cartridge | 0
.../test_app/README.md | 0
.../test_app/app/roles/api.lua | 0
.../test_app/app/roles/storage.lua | 0
.../test_app/cartridge.post-build | 0
.../test_app/cartridge.pre-build | 0
{sbroad-core => sbroad-cartridge}/test_app/deps.sh | 0
.../test_app/init.lua | 0
.../test_app/instances.yml | 0
.../test_app/package-deps.txt | 0
.../test_app/replicasets.yml | 0
.../test_app/stateboard.init.lua | 0
.../test_app/test/helper.lua | 0
.../test_app/test/integration/api_test.lua | 0
.../test_app/test/integration/ddl_test.lua | 0
.../test/integration/target_queries_test.lua | 0
.../test_app/test_app-scm-1.rockspec | 0
.../{executor/engine/cartridge => }/backend/sql.rs | 0
.../engine/cartridge => }/backend/sql/ir.rs | 0
.../engine/cartridge => }/backend/sql/ir/tests.rs | 0
.../engine/cartridge => }/backend/sql/tree.rs | 0
.../cartridge => }/backend/sql/tree/tests.rs | 0
52 files changed, 22 insertions(+)
create mode 100644 sbroad-cartridge/Cargo.toml
rename {sbroad-core => sbroad-cartridge}/cartridge/roles/sbroad-router.lua (100%)
rename {sbroad-core => sbroad-cartridge}/cartridge/roles/sbroad-storage.lua (100%)
rename {sbroad-core => sbroad-cartridge}/src/api.rs (100%)
rename {sbroad-core => sbroad-cartridge}/src/api/calculate_bucket_id.rs (100%)
rename {sbroad-core => sbroad-cartridge}/src/api/exec_query.rs (100%)
rename {sbroad-core => sbroad-cartridge}/src/api/helper.rs (100%)
rename {sbroad-core => sbroad-cartridge}/src/api/invalidate_cached_schema.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/backend.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/config.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/config/tests.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/hash.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/hash/tests.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/router.rs (100%)
rename {sbroad-core/src/executor/engine => sbroad-cartridge/src}/cartridge/storage.rs (100%)
create mode 100644 sbroad-cartridge/src/lib.rs
rename {sbroad-core => sbroad-cartridge}/src/router.lua (100%)
rename {sbroad-core => sbroad-cartridge}/src/storage.lua (100%)
rename {sbroad-core => sbroad-cartridge}/stress-test/README.md (100%)
rename {sbroad-core => sbroad-cartridge}/stress-test/data_generator.lua (100%)
rename {sbroad-core => sbroad-cartridge}/stress-test/k6.js (100%)
rename {sbroad-core => sbroad-cartridge}/stress-test/target_data/generator.lua (100%)
rename {sbroad-core => sbroad-cartridge}/stress-test/target_data/scenario.js (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/.cartridge.yml (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/.editorconfig (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/.gitignore (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/.luacheckrc (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/.luacov (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/Dockerfile.build.cartridge (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/Dockerfile.cartridge (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/README.md (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/app/roles/api.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/app/roles/storage.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/cartridge.post-build (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/cartridge.pre-build (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/deps.sh (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/init.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/instances.yml (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/package-deps.txt (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/replicasets.yml (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/stateboard.init.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/test/helper.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/test/integration/api_test.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/test/integration/ddl_test.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/test/integration/target_queries_test.lua (100%)
rename {sbroad-core => sbroad-cartridge}/test_app/test_app-scm-1.rockspec (100%)
rename sbroad-core/src/{executor/engine/cartridge => }/backend/sql.rs (100%)
rename sbroad-core/src/{executor/engine/cartridge => }/backend/sql/ir.rs (100%)
rename sbroad-core/src/{executor/engine/cartridge => }/backend/sql/ir/tests.rs (100%)
rename sbroad-core/src/{executor/engine/cartridge => }/backend/sql/tree.rs (100%)
rename sbroad-core/src/{executor/engine/cartridge => }/backend/sql/tree/tests.rs (100%)
diff --git a/sbroad-cartridge/Cargo.toml b/sbroad-cartridge/Cargo.toml
new file mode 100644
index 0000000000..7348002871
--- /dev/null
+++ b/sbroad-cartridge/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "sbroad-cartridge"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/sbroad-core/cartridge/roles/sbroad-router.lua b/sbroad-cartridge/cartridge/roles/sbroad-router.lua
similarity index 100%
rename from sbroad-core/cartridge/roles/sbroad-router.lua
rename to sbroad-cartridge/cartridge/roles/sbroad-router.lua
diff --git a/sbroad-core/cartridge/roles/sbroad-storage.lua b/sbroad-cartridge/cartridge/roles/sbroad-storage.lua
similarity index 100%
rename from sbroad-core/cartridge/roles/sbroad-storage.lua
rename to sbroad-cartridge/cartridge/roles/sbroad-storage.lua
diff --git a/sbroad-core/src/api.rs b/sbroad-cartridge/src/api.rs
similarity index 100%
rename from sbroad-core/src/api.rs
rename to sbroad-cartridge/src/api.rs
diff --git a/sbroad-core/src/api/calculate_bucket_id.rs b/sbroad-cartridge/src/api/calculate_bucket_id.rs
similarity index 100%
rename from sbroad-core/src/api/calculate_bucket_id.rs
rename to sbroad-cartridge/src/api/calculate_bucket_id.rs
diff --git a/sbroad-core/src/api/exec_query.rs b/sbroad-cartridge/src/api/exec_query.rs
similarity index 100%
rename from sbroad-core/src/api/exec_query.rs
rename to sbroad-cartridge/src/api/exec_query.rs
diff --git a/sbroad-core/src/api/helper.rs b/sbroad-cartridge/src/api/helper.rs
similarity index 100%
rename from sbroad-core/src/api/helper.rs
rename to sbroad-cartridge/src/api/helper.rs
diff --git a/sbroad-core/src/api/invalidate_cached_schema.rs b/sbroad-cartridge/src/api/invalidate_cached_schema.rs
similarity index 100%
rename from sbroad-core/src/api/invalidate_cached_schema.rs
rename to sbroad-cartridge/src/api/invalidate_cached_schema.rs
diff --git a/sbroad-core/src/executor/engine/cartridge.rs b/sbroad-cartridge/src/cartridge.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge.rs
rename to sbroad-cartridge/src/cartridge.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/backend.rs b/sbroad-cartridge/src/cartridge/backend.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/backend.rs
rename to sbroad-cartridge/src/cartridge/backend.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/config.rs b/sbroad-cartridge/src/cartridge/config.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/config.rs
rename to sbroad-cartridge/src/cartridge/config.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/config/tests.rs b/sbroad-cartridge/src/cartridge/config/tests.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/config/tests.rs
rename to sbroad-cartridge/src/cartridge/config/tests.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/hash.rs b/sbroad-cartridge/src/cartridge/hash.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/hash.rs
rename to sbroad-cartridge/src/cartridge/hash.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/hash/tests.rs b/sbroad-cartridge/src/cartridge/hash/tests.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/hash/tests.rs
rename to sbroad-cartridge/src/cartridge/hash/tests.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/router.rs b/sbroad-cartridge/src/cartridge/router.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/router.rs
rename to sbroad-cartridge/src/cartridge/router.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/storage.rs b/sbroad-cartridge/src/cartridge/storage.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/storage.rs
rename to sbroad-cartridge/src/cartridge/storage.rs
diff --git a/sbroad-cartridge/src/lib.rs b/sbroad-cartridge/src/lib.rs
new file mode 100644
index 0000000000..7d12d9af81
--- /dev/null
+++ b/sbroad-cartridge/src/lib.rs
@@ -0,0 +1,14 @@
+pub fn add(left: usize, right: usize) -> usize {
+ left + right
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn it_works() {
+ let result = add(2, 2);
+ assert_eq!(result, 4);
+ }
+}
diff --git a/sbroad-core/src/router.lua b/sbroad-cartridge/src/router.lua
similarity index 100%
rename from sbroad-core/src/router.lua
rename to sbroad-cartridge/src/router.lua
diff --git a/sbroad-core/src/storage.lua b/sbroad-cartridge/src/storage.lua
similarity index 100%
rename from sbroad-core/src/storage.lua
rename to sbroad-cartridge/src/storage.lua
diff --git a/sbroad-core/stress-test/README.md b/sbroad-cartridge/stress-test/README.md
similarity index 100%
rename from sbroad-core/stress-test/README.md
rename to sbroad-cartridge/stress-test/README.md
diff --git a/sbroad-core/stress-test/data_generator.lua b/sbroad-cartridge/stress-test/data_generator.lua
similarity index 100%
rename from sbroad-core/stress-test/data_generator.lua
rename to sbroad-cartridge/stress-test/data_generator.lua
diff --git a/sbroad-core/stress-test/k6.js b/sbroad-cartridge/stress-test/k6.js
similarity index 100%
rename from sbroad-core/stress-test/k6.js
rename to sbroad-cartridge/stress-test/k6.js
diff --git a/sbroad-core/stress-test/target_data/generator.lua b/sbroad-cartridge/stress-test/target_data/generator.lua
similarity index 100%
rename from sbroad-core/stress-test/target_data/generator.lua
rename to sbroad-cartridge/stress-test/target_data/generator.lua
diff --git a/sbroad-core/stress-test/target_data/scenario.js b/sbroad-cartridge/stress-test/target_data/scenario.js
similarity index 100%
rename from sbroad-core/stress-test/target_data/scenario.js
rename to sbroad-cartridge/stress-test/target_data/scenario.js
diff --git a/sbroad-core/test_app/.cartridge.yml b/sbroad-cartridge/test_app/.cartridge.yml
similarity index 100%
rename from sbroad-core/test_app/.cartridge.yml
rename to sbroad-cartridge/test_app/.cartridge.yml
diff --git a/sbroad-core/test_app/.editorconfig b/sbroad-cartridge/test_app/.editorconfig
similarity index 100%
rename from sbroad-core/test_app/.editorconfig
rename to sbroad-cartridge/test_app/.editorconfig
diff --git a/sbroad-core/test_app/.gitignore b/sbroad-cartridge/test_app/.gitignore
similarity index 100%
rename from sbroad-core/test_app/.gitignore
rename to sbroad-cartridge/test_app/.gitignore
diff --git a/sbroad-core/test_app/.luacheckrc b/sbroad-cartridge/test_app/.luacheckrc
similarity index 100%
rename from sbroad-core/test_app/.luacheckrc
rename to sbroad-cartridge/test_app/.luacheckrc
diff --git a/sbroad-core/test_app/.luacov b/sbroad-cartridge/test_app/.luacov
similarity index 100%
rename from sbroad-core/test_app/.luacov
rename to sbroad-cartridge/test_app/.luacov
diff --git a/sbroad-core/test_app/Dockerfile.build.cartridge b/sbroad-cartridge/test_app/Dockerfile.build.cartridge
similarity index 100%
rename from sbroad-core/test_app/Dockerfile.build.cartridge
rename to sbroad-cartridge/test_app/Dockerfile.build.cartridge
diff --git a/sbroad-core/test_app/Dockerfile.cartridge b/sbroad-cartridge/test_app/Dockerfile.cartridge
similarity index 100%
rename from sbroad-core/test_app/Dockerfile.cartridge
rename to sbroad-cartridge/test_app/Dockerfile.cartridge
diff --git a/sbroad-core/test_app/README.md b/sbroad-cartridge/test_app/README.md
similarity index 100%
rename from sbroad-core/test_app/README.md
rename to sbroad-cartridge/test_app/README.md
diff --git a/sbroad-core/test_app/app/roles/api.lua b/sbroad-cartridge/test_app/app/roles/api.lua
similarity index 100%
rename from sbroad-core/test_app/app/roles/api.lua
rename to sbroad-cartridge/test_app/app/roles/api.lua
diff --git a/sbroad-core/test_app/app/roles/storage.lua b/sbroad-cartridge/test_app/app/roles/storage.lua
similarity index 100%
rename from sbroad-core/test_app/app/roles/storage.lua
rename to sbroad-cartridge/test_app/app/roles/storage.lua
diff --git a/sbroad-core/test_app/cartridge.post-build b/sbroad-cartridge/test_app/cartridge.post-build
similarity index 100%
rename from sbroad-core/test_app/cartridge.post-build
rename to sbroad-cartridge/test_app/cartridge.post-build
diff --git a/sbroad-core/test_app/cartridge.pre-build b/sbroad-cartridge/test_app/cartridge.pre-build
similarity index 100%
rename from sbroad-core/test_app/cartridge.pre-build
rename to sbroad-cartridge/test_app/cartridge.pre-build
diff --git a/sbroad-core/test_app/deps.sh b/sbroad-cartridge/test_app/deps.sh
similarity index 100%
rename from sbroad-core/test_app/deps.sh
rename to sbroad-cartridge/test_app/deps.sh
diff --git a/sbroad-core/test_app/init.lua b/sbroad-cartridge/test_app/init.lua
similarity index 100%
rename from sbroad-core/test_app/init.lua
rename to sbroad-cartridge/test_app/init.lua
diff --git a/sbroad-core/test_app/instances.yml b/sbroad-cartridge/test_app/instances.yml
similarity index 100%
rename from sbroad-core/test_app/instances.yml
rename to sbroad-cartridge/test_app/instances.yml
diff --git a/sbroad-core/test_app/package-deps.txt b/sbroad-cartridge/test_app/package-deps.txt
similarity index 100%
rename from sbroad-core/test_app/package-deps.txt
rename to sbroad-cartridge/test_app/package-deps.txt
diff --git a/sbroad-core/test_app/replicasets.yml b/sbroad-cartridge/test_app/replicasets.yml
similarity index 100%
rename from sbroad-core/test_app/replicasets.yml
rename to sbroad-cartridge/test_app/replicasets.yml
diff --git a/sbroad-core/test_app/stateboard.init.lua b/sbroad-cartridge/test_app/stateboard.init.lua
similarity index 100%
rename from sbroad-core/test_app/stateboard.init.lua
rename to sbroad-cartridge/test_app/stateboard.init.lua
diff --git a/sbroad-core/test_app/test/helper.lua b/sbroad-cartridge/test_app/test/helper.lua
similarity index 100%
rename from sbroad-core/test_app/test/helper.lua
rename to sbroad-cartridge/test_app/test/helper.lua
diff --git a/sbroad-core/test_app/test/integration/api_test.lua b/sbroad-cartridge/test_app/test/integration/api_test.lua
similarity index 100%
rename from sbroad-core/test_app/test/integration/api_test.lua
rename to sbroad-cartridge/test_app/test/integration/api_test.lua
diff --git a/sbroad-core/test_app/test/integration/ddl_test.lua b/sbroad-cartridge/test_app/test/integration/ddl_test.lua
similarity index 100%
rename from sbroad-core/test_app/test/integration/ddl_test.lua
rename to sbroad-cartridge/test_app/test/integration/ddl_test.lua
diff --git a/sbroad-core/test_app/test/integration/target_queries_test.lua b/sbroad-cartridge/test_app/test/integration/target_queries_test.lua
similarity index 100%
rename from sbroad-core/test_app/test/integration/target_queries_test.lua
rename to sbroad-cartridge/test_app/test/integration/target_queries_test.lua
diff --git a/sbroad-core/test_app/test_app-scm-1.rockspec b/sbroad-cartridge/test_app/test_app-scm-1.rockspec
similarity index 100%
rename from sbroad-core/test_app/test_app-scm-1.rockspec
rename to sbroad-cartridge/test_app/test_app-scm-1.rockspec
diff --git a/sbroad-core/src/executor/engine/cartridge/backend/sql.rs b/sbroad-core/src/backend/sql.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/backend/sql.rs
rename to sbroad-core/src/backend/sql.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/backend/sql/ir.rs b/sbroad-core/src/backend/sql/ir.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/backend/sql/ir.rs
rename to sbroad-core/src/backend/sql/ir.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/backend/sql/ir/tests.rs b/sbroad-core/src/backend/sql/ir/tests.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/backend/sql/ir/tests.rs
rename to sbroad-core/src/backend/sql/ir/tests.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/backend/sql/tree.rs b/sbroad-core/src/backend/sql/tree.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/backend/sql/tree.rs
rename to sbroad-core/src/backend/sql/tree.rs
diff --git a/sbroad-core/src/executor/engine/cartridge/backend/sql/tree/tests.rs b/sbroad-core/src/backend/sql/tree/tests.rs
similarity index 100%
rename from sbroad-core/src/executor/engine/cartridge/backend/sql/tree/tests.rs
rename to sbroad-core/src/backend/sql/tree/tests.rs
--
GitLab