diff --git a/Cargo.toml b/Cargo.toml index 3901b5d2bf51..629992177913 100644 --- 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 index 10541e01914a..b8ba1ed4e8cb 100644 --- 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 b/datafusion/common/src/types/array.rs similarity index 100% rename from datafusion/types/src/array.rs rename to datafusion/common/src/types/array.rs diff --git a/datafusion/types/src/map.rs b/datafusion/common/src/types/map.rs similarity index 100% rename from datafusion/types/src/map.rs rename to datafusion/common/src/types/map.rs diff --git a/datafusion/types/src/lib.rs b/datafusion/common/src/types/mod.rs similarity index 100% rename from datafusion/types/src/lib.rs rename to datafusion/common/src/types/mod.rs diff --git a/datafusion/types/src/primitive.rs b/datafusion/common/src/types/primitive.rs similarity index 100% rename from datafusion/types/src/primitive.rs rename to datafusion/common/src/types/primitive.rs diff --git a/datafusion/types/src/type.rs b/datafusion/common/src/types/type.rs similarity index 100% rename from datafusion/types/src/type.rs rename to datafusion/common/src/types/type.rs diff --git a/datafusion/types/src/type_manager.rs b/datafusion/common/src/types/type_manager.rs similarity index 100% rename from datafusion/types/src/type_manager.rs rename to datafusion/common/src/types/type_manager.rs diff --git a/datafusion/types/src/type_name.rs b/datafusion/common/src/types/type_name.rs similarity index 100% rename from datafusion/types/src/type_name.rs rename to datafusion/common/src/types/type_name.rs diff --git a/datafusion/types/Cargo.toml b/datafusion/types/Cargo.toml deleted file mode 100644 index ab02b8c3684c..000000000000 --- a/datafusion/types/Cargo.toml +++ /dev/null @@ -1,42 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -[package] -name = "datafusion-types" -description = "DataFusion types" -version = { workspace = true } -edition = { workspace = true } -homepage = { workspace = true } -repository = { workspace = true } -license = { workspace = true } -authors = { workspace = true } -rust-version = { workspace = true } - -[lints] -workspace = true - -[lib] -name = "datafusion_types" - -[dependencies] -arrow = { workspace = true } -# datafusion-common = { workspace = true } # FIXME or circular dependency - -# TODO move to workspace -strum = { version = "0.26.1", features = ["derive"] } -# TODO move to workspace -strum_macros = "0.26.0" \ No newline at end of file