move over to common

findepi · Sep 30, 2024 · 4ac82cb · 4ac82cb
1 parent 3298405
commit 4ac82cb
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 44 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,7 +44,6 @@ members = [
     "datafusion/sql",
     "datafusion/sqllogictest",
     "datafusion/substrait",
-    "datafusion/types",
     "datafusion/wasmtest",
     "datafusion-examples",
     "test-utils",
@@ -116,7 +115,6 @@ datafusion-proto-common = { path = "datafusion/proto-common", version = "42.0.0"
 datafusion-sql = { path = "datafusion/sql", version = "42.0.0" }
 datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "42.0.0" }
 datafusion-substrait = { path = "datafusion/substrait", version = "42.0.0" }
-datafusion-types = { path = "datafusion/types", version = "42.0.0" }
 doc-comment = "0.3"
 env_logger = "0.11"
 futures = "0.3"

diff --git a/datafusion/common/src/lib.rs b/datafusion/common/src/lib.rs
@@ -43,6 +43,7 @@ pub mod scalar;
 pub mod stats;
 pub mod test_util;
 pub mod tree_node;
+pub mod types;
 pub mod utils;
 
 /// Reexport arrow crate

diff --git a/datafusion/types/src/array.rs → datafusion/common/src/types/array.rs b/datafusion/types/src/array.rs → datafusion/common/src/types/array.rs
diff --git a/datafusion/types/src/map.rs → datafusion/common/src/types/map.rs b/datafusion/types/src/map.rs → datafusion/common/src/types/map.rs
diff --git a/datafusion/types/src/lib.rs → datafusion/common/src/types/mod.rs b/datafusion/types/src/lib.rs → datafusion/common/src/types/mod.rs
diff --git a/datafusion/types/src/primitive.rs → datafusion/common/src/types/primitive.rs b/datafusion/types/src/primitive.rs → datafusion/common/src/types/primitive.rs
diff --git a/datafusion/types/src/type.rs → datafusion/common/src/types/type.rs b/datafusion/types/src/type.rs → datafusion/common/src/types/type.rs
diff --git a/datafusion/types/src/type_manager.rs → datafusion/common/src/types/type_manager.rs b/datafusion/types/src/type_manager.rs → datafusion/common/src/types/type_manager.rs
diff --git a/datafusion/types/src/type_name.rs → datafusion/common/src/types/type_name.rs b/datafusion/types/src/type_name.rs → datafusion/common/src/types/type_name.rs
diff --git a/datafusion/types/Cargo.toml b/datafusion/types/Cargo.toml