WIP: Rust refactor

geldata · Nov 22, 2024 · f737ca0 · f737ca0
1 parent d7f1f4c
commit f737ca0
Show file tree

Hide file tree

Showing 69 changed files with 456 additions and 65 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,17 +4,23 @@ members = [
     "edb/edgeql-parser/edgeql-parser-derive",
     "edb/edgeql-parser/edgeql-parser-python",
     "edb/graphql-rewrite",
-    "edb/server/conn_pool",
-    "edb/server/pgrust",
-    "edb/server/http",
+    "edb/native/conn_pool",
+    "edb/native/pgrust",
+    "edb/native/http",
+    "edb/native/pyo3_util",
+    "edb/server/_rust_native"
 ]
 resolver = "2"
 
 [workspace.dependencies]
-pyo3 = { version = "0.23.1", features = ["extension-module", "serde"] }
+pyo3 = { version = "0.23.1", features = ["extension-module", "serde", "macros"] }
 tokio = { version = "1", features = ["rt", "rt-multi-thread", "macros", "time", "sync", "net", "io-util"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
+conn_pool = { path = "edb/native/conn_pool" }
+pgrust = { path = "edb/native/pgrust" }
+http = { path = "edb/native/http" }
+pyo3_util = { path = "edb/native/pyo3_util" }
 
 [profile.release]
 debug = true

diff --git a/edb/server/conn_pool/Cargo.toml → edb/native/conn_pool/Cargo.toml b/edb/server/conn_pool/Cargo.toml → edb/native/conn_pool/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "conn-pool"
+name = "conn_pool"
 version = "0.1.0"
 license = "MIT/Apache-2.0"
 authors = ["MagicStack Inc. <[email protected]>"]

diff --git a/edb/server/conn_pool/README.md → edb/native/conn_pool/README.md b/edb/server/conn_pool/README.md → edb/native/conn_pool/README.md
diff --git a/edb/server/conn_pool/src/algo.rs → edb/native/conn_pool/src/algo.rs b/edb/server/conn_pool/src/algo.rs → edb/native/conn_pool/src/algo.rs
diff --git a/edb/server/conn_pool/src/bin/optimizer.rs → edb/native/conn_pool/src/bin/optimizer.rs b/edb/server/conn_pool/src/bin/optimizer.rs → edb/native/conn_pool/src/bin/optimizer.rs
diff --git a/edb/server/conn_pool/src/block.rs → edb/native/conn_pool/src/block.rs b/edb/server/conn_pool/src/block.rs → edb/native/conn_pool/src/block.rs
diff --git a/edb/server/conn_pool/src/conn.rs → edb/native/conn_pool/src/conn.rs b/edb/server/conn_pool/src/conn.rs → edb/native/conn_pool/src/conn.rs
diff --git a/edb/server/conn_pool/src/drain.rs → edb/native/conn_pool/src/drain.rs b/edb/server/conn_pool/src/drain.rs → edb/native/conn_pool/src/drain.rs
diff --git a/edb/server/conn_pool/src/lib.rs → edb/native/conn_pool/src/lib.rs b/edb/server/conn_pool/src/lib.rs → edb/native/conn_pool/src/lib.rs
@@ -25,4 +25,4 @@ pub use pool::{Pool, PoolConfig, PoolHandle};
 pub mod test;
 
 #[cfg(feature = "python_extension")]
-mod python;
+pub mod python;
diff --git a/edb/server/conn_pool/src/metrics.rs → edb/native/conn_pool/src/metrics.rs b/edb/server/conn_pool/src/metrics.rs → edb/native/conn_pool/src/metrics.rs
diff --git a/edb/server/conn_pool/src/pool.rs → edb/native/conn_pool/src/pool.rs b/edb/server/conn_pool/src/pool.rs → edb/native/conn_pool/src/pool.rs
diff --git a/edb/server/conn_pool/src/python.rs → edb/native/conn_pool/src/python.rs b/edb/server/conn_pool/src/python.rs → edb/native/conn_pool/src/python.rs
@@ -500,7 +500,7 @@ impl LoggingGuard {
 }
 
 #[pymodule]
-fn _conn_pool(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
+pub fn _conn_pool(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     m.add_class::<ConnPool>()?;
     m.add_class::<LoggingGuard>()?;
     m.add("InternalError", py.get_type::<InternalError>())?;

diff --git a/edb/server/conn_pool/src/test/mod.rs → edb/native/conn_pool/src/test/mod.rs b/edb/server/conn_pool/src/test/mod.rs → edb/native/conn_pool/src/test/mod.rs
diff --git a/edb/server/conn_pool/src/test/spec.rs → edb/native/conn_pool/src/test/spec.rs b/edb/server/conn_pool/src/test/spec.rs → edb/native/conn_pool/src/test/spec.rs
diff --git a/edb/server/conn_pool/src/waitqueue.rs → edb/native/conn_pool/src/waitqueue.rs b/edb/server/conn_pool/src/waitqueue.rs → edb/native/conn_pool/src/waitqueue.rs
diff --git a/edb/server/http/Cargo.toml → edb/native/http/Cargo.toml b/edb/server/http/Cargo.toml → edb/native/http/Cargo.toml
diff --git a/edb/server/http/src/lib.rs → edb/native/http/src/lib.rs b/edb/server/http/src/lib.rs → edb/native/http/src/lib.rs
@@ -1,2 +1,2 @@
 #[cfg(feature = "python_extension")]
-mod python;
+pub mod python;
diff --git a/edb/server/http/src/python.rs → edb/native/http/src/python.rs b/edb/server/http/src/python.rs → edb/native/http/src/python.rs
@@ -664,7 +664,7 @@ impl Http {
 }
 
 #[pymodule]
-fn _http(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
+pub fn _http(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
     m.add_class::<Http>()?;
     m.add("InternalError", py.get_type::<InternalError>())?;
 

diff --git a/edb/server/pgrust/Cargo.toml → edb/native/pgrust/Cargo.toml b/edb/server/pgrust/Cargo.toml → edb/native/pgrust/Cargo.toml
diff --git a/edb/server/pgrust/examples/connect.rs → edb/native/pgrust/examples/connect.rs b/edb/server/pgrust/examples/connect.rs → edb/native/pgrust/examples/connect.rs
diff --git a/edb/server/pgrust/examples/dsn.rs → edb/native/pgrust/examples/dsn.rs b/edb/server/pgrust/examples/dsn.rs → edb/native/pgrust/examples/dsn.rs
diff --git a/edb/server/pgrust/src/auth/md5.rs → edb/native/pgrust/src/auth/md5.rs b/edb/server/pgrust/src/auth/md5.rs → edb/native/pgrust/src/auth/md5.rs
diff --git a/edb/server/pgrust/src/auth/mod.rs → edb/native/pgrust/src/auth/mod.rs b/edb/server/pgrust/src/auth/mod.rs → edb/native/pgrust/src/auth/mod.rs
diff --git a/edb/server/pgrust/src/auth/scram.rs → edb/native/pgrust/src/auth/scram.rs b/edb/server/pgrust/src/auth/scram.rs → edb/native/pgrust/src/auth/scram.rs
diff --git a/edb/server/pgrust/src/auth/stringprep.rs → edb/native/pgrust/src/auth/stringprep.rs b/edb/server/pgrust/src/auth/stringprep.rs → edb/native/pgrust/src/auth/stringprep.rs
diff --git a/...erver/pgrust/src/auth/stringprep_table.rs → ...ative/pgrust/src/auth/stringprep_table.rs b/...erver/pgrust/src/auth/stringprep_table.rs → ...ative/pgrust/src/auth/stringprep_table.rs
diff --git a/.../pgrust/src/auth/stringprep_table_prep.py → .../pgrust/src/auth/stringprep_table_prep.py b/.../pgrust/src/auth/stringprep_table_prep.py → .../pgrust/src/auth/stringprep_table_prep.py
diff --git a/edb/server/pgrust/src/connection/conn.rs → edb/native/pgrust/src/connection/conn.rs b/edb/server/pgrust/src/connection/conn.rs → edb/native/pgrust/src/connection/conn.rs
diff --git a/edb/server/pgrust/src/connection/dsn/host.rs → edb/native/pgrust/src/connection/dsn/host.rs b/edb/server/pgrust/src/connection/dsn/host.rs → edb/native/pgrust/src/connection/dsn/host.rs
diff --git a/edb/server/pgrust/src/connection/dsn/mod.rs → edb/native/pgrust/src/connection/dsn/mod.rs b/edb/server/pgrust/src/connection/dsn/mod.rs → edb/native/pgrust/src/connection/dsn/mod.rs
diff --git a/...erver/pgrust/src/connection/dsn/params.rs → ...ative/pgrust/src/connection/dsn/params.rs b/...erver/pgrust/src/connection/dsn/params.rs → ...ative/pgrust/src/connection/dsn/params.rs
diff --git a/...ver/pgrust/src/connection/dsn/passfile.rs → ...ive/pgrust/src/connection/dsn/passfile.rs b/...ver/pgrust/src/connection/dsn/passfile.rs → ...ive/pgrust/src/connection/dsn/passfile.rs
diff --git a/...r/pgrust/src/connection/dsn/raw_params.rs → ...e/pgrust/src/connection/dsn/raw_params.rs b/...r/pgrust/src/connection/dsn/raw_params.rs → ...e/pgrust/src/connection/dsn/raw_params.rs
diff --git a/edb/server/pgrust/src/connection/dsn/url.rs → edb/native/pgrust/src/connection/dsn/url.rs b/edb/server/pgrust/src/connection/dsn/url.rs → edb/native/pgrust/src/connection/dsn/url.rs
diff --git a/edb/server/pgrust/src/connection/mod.rs → edb/native/pgrust/src/connection/mod.rs b/edb/server/pgrust/src/connection/mod.rs → edb/native/pgrust/src/connection/mod.rs
diff --git a/edb/server/pgrust/src/connection/openssl.rs → edb/native/pgrust/src/connection/openssl.rs b/edb/server/pgrust/src/connection/openssl.rs → edb/native/pgrust/src/connection/openssl.rs
diff --git a/edb/server/pgrust/src/connection/raw_conn.rs → edb/native/pgrust/src/connection/raw_conn.rs b/edb/server/pgrust/src/connection/raw_conn.rs → edb/native/pgrust/src/connection/raw_conn.rs
diff --git a/edb/server/pgrust/src/connection/stream.rs → edb/native/pgrust/src/connection/stream.rs b/edb/server/pgrust/src/connection/stream.rs → edb/native/pgrust/src/connection/stream.rs
diff --git a/edb/server/pgrust/src/connection/tokio.rs → edb/native/pgrust/src/connection/tokio.rs b/edb/server/pgrust/src/connection/tokio.rs → edb/native/pgrust/src/connection/tokio.rs
diff --git a/edb/server/pgrust/src/errors/mod.rs → edb/native/pgrust/src/errors/mod.rs b/edb/server/pgrust/src/errors/mod.rs → edb/native/pgrust/src/errors/mod.rs
diff --git a/...ust/src/handshake/client_state_machine.rs → ...ust/src/handshake/client_state_machine.rs b/...ust/src/handshake/client_state_machine.rs → ...ust/src/handshake/client_state_machine.rs
diff --git a/edb/server/pgrust/src/handshake/mod.rs → edb/native/pgrust/src/handshake/mod.rs b/edb/server/pgrust/src/handshake/mod.rs → edb/native/pgrust/src/handshake/mod.rs
diff --git a/...ust/src/handshake/server_state_machine.rs → ...ust/src/handshake/server_state_machine.rs b/...ust/src/handshake/server_state_machine.rs → ...ust/src/handshake/server_state_machine.rs
diff --git a/edb/server/pgrust/src/lib.rs → edb/native/pgrust/src/lib.rs b/edb/server/pgrust/src/lib.rs → edb/native/pgrust/src/lib.rs
diff --git a/edb/server/pgrust/src/protocol/arrays.rs → edb/native/pgrust/src/protocol/arrays.rs b/edb/server/pgrust/src/protocol/arrays.rs → edb/native/pgrust/src/protocol/arrays.rs
diff --git a/edb/server/pgrust/src/protocol/buffer.rs → edb/native/pgrust/src/protocol/buffer.rs b/edb/server/pgrust/src/protocol/buffer.rs → edb/native/pgrust/src/protocol/buffer.rs
diff --git a/edb/server/pgrust/src/protocol/datatypes.rs → edb/native/pgrust/src/protocol/datatypes.rs b/edb/server/pgrust/src/protocol/datatypes.rs → edb/native/pgrust/src/protocol/datatypes.rs
diff --git a/edb/server/pgrust/src/protocol/definition.rs → edb/native/pgrust/src/protocol/definition.rs b/edb/server/pgrust/src/protocol/definition.rs → edb/native/pgrust/src/protocol/definition.rs
diff --git a/edb/server/pgrust/src/protocol/gen.rs → edb/native/pgrust/src/protocol/gen.rs b/edb/server/pgrust/src/protocol/gen.rs → edb/native/pgrust/src/protocol/gen.rs
diff --git a/...rver/pgrust/src/protocol/message_group.rs → ...tive/pgrust/src/protocol/message_group.rs b/...rver/pgrust/src/protocol/message_group.rs → ...tive/pgrust/src/protocol/message_group.rs
diff --git a/edb/server/pgrust/src/protocol/mod.rs → edb/native/pgrust/src/protocol/mod.rs b/edb/server/pgrust/src/protocol/mod.rs → edb/native/pgrust/src/protocol/mod.rs
diff --git a/edb/server/pgrust/src/protocol/writer.rs → edb/native/pgrust/src/protocol/writer.rs b/edb/server/pgrust/src/protocol/writer.rs → edb/native/pgrust/src/protocol/writer.rs
diff --git a/edb/server/pgrust/src/python.rs → edb/native/pgrust/src/python.rs b/edb/server/pgrust/src/python.rs → edb/native/pgrust/src/python.rs
diff --git a/edb/server/pgrust/tests/edgedb_test_cases.rs → edb/native/pgrust/tests/edgedb_test_cases.rs b/edb/server/pgrust/tests/edgedb_test_cases.rs → edb/native/pgrust/tests/edgedb_test_cases.rs
diff --git a/...pgrust/tests/hardcore_host_tests_cases.rs → ...pgrust/tests/hardcore_host_tests_cases.rs b/...pgrust/tests/hardcore_host_tests_cases.rs → ...pgrust/tests/hardcore_host_tests_cases.rs
diff --git a/edb/server/pgrust/tests/libpq_test_cases.rs → edb/native/pgrust/tests/libpq_test_cases.rs b/edb/server/pgrust/tests/libpq_test_cases.rs → edb/native/pgrust/tests/libpq_test_cases.rs
diff --git a/edb/server/pgrust/tests/real_postgres.rs → edb/native/pgrust/tests/real_postgres.rs b/edb/server/pgrust/tests/real_postgres.rs → edb/native/pgrust/tests/real_postgres.rs
diff --git a/...erver/pgrust/tests/test_util/dsn_libpq.rs → ...ative/pgrust/tests/test_util/dsn_libpq.rs b/...erver/pgrust/tests/test_util/dsn_libpq.rs → ...ative/pgrust/tests/test_util/dsn_libpq.rs
diff --git a/edb/server/pgrust/tests/test_util/mod.rs → edb/native/pgrust/tests/test_util/mod.rs b/edb/server/pgrust/tests/test_util/mod.rs → edb/native/pgrust/tests/test_util/mod.rs
diff --git a/edb/native/pyo3_util/Cargo.toml b/edb/native/pyo3_util/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "pyo3_util"
+version = "0.1.0"
+license = "MIT/Apache-2.0"
+authors = ["MagicStack Inc. <[email protected]>"]
+edition = "2021"
+
+[lint]
+workspace = true
+
+[dependencies]
+pyo3 = { workspace = true }
+tokio.workspace = true
+tracing.workspace = true
+tracing-subscriber.workspace = true
+nix = { version = "0.29", features = ["fs"] }
+
+scopeguard = "1"
+thiserror = "1"
+
+[lib]
+crate-type = ["lib", "cdylib"]
+path = "src/lib.rs"
diff --git a/edb/native/pyo3_util/src/lib.rs b/edb/native/pyo3_util/src/lib.rs
@@ -0,0 +1 @@
+pub mod logging;