Switch to one crate

Cargo.toml

@@ -1,15 +1,15 @@
-[workspace]
-resolver = "2"
+[package]
+name = "df_extras"
+version = "0.1.0"
+edition = "2021"
 
-members = [
-    "common",
-    "df_extras_postgres",
-    "df_extras_sqlite",
-]
-
-[workspace.dependencies]
+[dependencies]
 datafusion = "32.0.0"
 ipnet = "2.7.2"
 serde = "1.0.192"
 serde_json = { version = "1.0.108", features = ["preserve_order"] }
 tokio = { version = "1.25.0", features = ["macros", "rt", "parking_lot"] }
+
+[features]
+sqlite = []
+postgres = []

README.md

@@ -2,6 +2,14 @@
 
 A collection of user defined functions, from your favourite databases, in DataFusion.
 
-## Crates
+## Road to 0.0.1
 
-[df_extras_postgres](./df_postgres/README.md)
+| **Postgres**    | **[Details](supports/postgres.md)** | 
+|-----------------|-------------------------------------|
+| Networking      | ✅︎ Done                             |
+| Maths           | 🚧︎ Ongoing                         |
+| JSON            | ⭘  Not Started                      |
+| **Sqlite**      | **[Details](supports/sqlite.md)**   |
+| JSON            | 🚧︎ Ongoing                         |
+| Built-In Scalar | ⭘  Not Started                      |
+| Maths           | ⭘  Not Started                      |

src/lib.rs

@@ -0,0 +1,3 @@
+pub mod common;
+pub mod postgres;
+pub mod sqlite;

df_extras_postgres/src/math_udfs.rs → src/postgres/math_udfs.rs

@@ -39,12 +39,11 @@ pub fn div(args: &[ArrayRef]) -> Result<ArrayRef> {
 #[cfg(feature = "postgres")]
 #[cfg(test)]
 mod tests {
-    use common::test_utils::set_up_network_data_test;
+    use crate::common::test_utils::set_up_network_data_test;
+    use crate::postgres::register_postgres_udfs;
     use datafusion::assert_batches_sorted_eq;
     use datafusion::prelude::SessionContext;
 
-    use crate::register_udfs;
-
     use super::*;
 
     #[tokio::test]
@@ -101,7 +100,7 @@ mod tests {
 
     fn register_udfs_for_test() -> Result<SessionContext> {
         let ctx = set_up_network_data_test()?;
-        register_udfs(&ctx)?;
+        register_postgres_udfs(&ctx)?;
         Ok(ctx)
     }
 }

df_extras_postgres/src/lib.rs → src/postgres/mod.rs

@@ -2,22 +2,21 @@
 
 use std::sync::Arc;
 
+use crate::postgres::math_udfs::{ceiling, div};
+use crate::postgres::network_udfs::{
+    broadcast, family, host, hostmask, inet_merge, inet_same_family, masklen, netmask, network,
+    set_masklen,
+};
 use datafusion::arrow::datatypes::DataType::{Boolean, Float64, Int64, UInt8, Utf8};
 use datafusion::error::Result;
 use datafusion::logical_expr::{ReturnTypeFunction, ScalarUDF, Signature, Volatility};
 use datafusion::physical_expr::functions::make_scalar_function;
 use datafusion::prelude::SessionContext;
 
-use crate::math_udfs::{ceiling, div};
-use crate::network_udfs::{
-    broadcast, family, host, hostmask, inet_merge, inet_same_family, masklen, netmask, network,
-    set_masklen,
-};
-
 mod math_udfs;
 mod network_udfs;
 
-pub fn register_udfs(ctx: &SessionContext) -> Result<()> {
+pub fn register_postgres_udfs(ctx: &SessionContext) -> Result<()> {
     register_network_udfs(ctx)?;
     register_math_udfs(ctx)?;
     Ok(())

df_extras_postgres/src/network_udfs.rs → src/postgres/network_udfs.rs

@@ -420,13 +420,11 @@ fn bit_in_common(l: &[u8], r: &[u8], n: usize) -> usize {
 #[cfg(feature = "postgres")]
 #[cfg(test)]
 mod tests {
+    use crate::common::test_utils::set_up_network_data_test;
+    use crate::postgres::register_postgres_udfs;
     use datafusion::assert_batches_sorted_eq;
     use datafusion::prelude::SessionContext;
 
-    use common::test_utils::set_up_network_data_test;
-
-    use crate::register_udfs;
-
     use super::*;
 
     #[tokio::test]
@@ -923,7 +921,7 @@ mod tests {
 
     fn register_udfs_for_test() -> Result<SessionContext> {
         let ctx = set_up_network_data_test()?;
-        register_udfs(&ctx)?;
+        register_postgres_udfs(&ctx)?;
         Ok(ctx)
     }
 }

df_extras_sqlite/src/json_udfs.rs → src/sqlite/json_udfs.rs

@@ -59,13 +59,11 @@ pub fn json_valid(args: &[ArrayRef]) -> Result<ArrayRef> {
 #[cfg(feature = "sqlite")]
 #[cfg(test)]
 mod tests {
+    use crate::common::test_utils::set_up_json_data_test;
+    use crate::sqlite::register_sqlite_udfs;
     use datafusion::assert_batches_sorted_eq;
     use datafusion::prelude::SessionContext;
 
-    use common::test_utils::set_up_json_data_test;
-
-    use crate::register_udfs;
-
     use super::*;
 
     #[tokio::test]
@@ -150,7 +148,7 @@ mod tests {
 
     fn register_udfs_for_test() -> Result<SessionContext> {
         let ctx = set_up_json_data_test()?;
-        register_udfs(&ctx)?;
+        register_sqlite_udfs(&ctx)?;
         Ok(ctx)
     }
 }

df_extras_sqlite/src/lib.rs → src/sqlite/mod.rs

@@ -2,15 +2,15 @@
 
 mod json_udfs;
 
-use crate::json_udfs::{json, json_valid};
+use crate::sqlite::json_udfs::{json, json_valid};
 use datafusion::arrow::datatypes::DataType::{UInt8, Utf8};
 use datafusion::error::Result;
 use datafusion::logical_expr::{ReturnTypeFunction, ScalarUDF, Signature, Volatility};
 use datafusion::physical_expr::functions::make_scalar_function;
 use datafusion::prelude::SessionContext;
 use std::sync::Arc;
 
-pub fn register_udfs(ctx: &SessionContext) -> Result<()> {
+pub fn register_sqlite_udfs(ctx: &SessionContext) -> Result<()> {
     register_json(ctx);
     register_json_valid(ctx);
     Ok(())