diff --git a/Cargo.lock b/Cargo.lock index 2ebfbf5e32..aa02a7fb58 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -685,7 +685,6 @@ name = "clap_blocks" version = "0.1.0" dependencies = [ "clap 3.1.12", - "data_types", "futures", "humantime", "iox_catalog", @@ -813,7 +812,6 @@ dependencies = [ "async-trait", "backoff 0.1.0", "bytes", - "data_types", "data_types2", "datafusion 0.1.0", "futures", @@ -1172,7 +1170,6 @@ dependencies = [ name = "data_types2" version = "0.1.0" dependencies = [ - "data_types", "influxdb_line_protocol", "observability_deps", "ordered-float 3.0.0", @@ -1413,7 +1410,6 @@ name = "dml" version = "0.1.0" dependencies = [ "arrow_util", - "data_types", "data_types2", "hashbrown 0.12.0", "iox_time", @@ -2168,7 +2164,6 @@ dependencies = [ "compactor", "console-subscriber", "csv", - "data_types", "data_types2", "datafusion 0.1.0", "dml", @@ -2336,7 +2331,6 @@ dependencies = [ "bitflags", "bytes", "chrono", - "data_types", "data_types2", "datafusion 0.1.0", "datafusion_util", @@ -2458,7 +2452,6 @@ dependencies = [ "chrono-english", "clap 3.1.12", "criterion", - "data_types", "futures", "handlebars", "humantime", @@ -2571,7 +2564,6 @@ dependencies = [ "chrono", "clap 3.1.12", "clap_blocks", - "data_types", "data_types2", "dml", "flate2", @@ -3304,7 +3296,6 @@ dependencies = [ "arrow", "arrow_util", "chrono", - "data_types", "data_types2", "hashbrown 0.12.0", "iox_time", @@ -3801,7 +3792,6 @@ dependencies = [ "arrow_util", "base64 0.13.0", "bytes", - "data_types", "data_types2", "datafusion 0.1.0", "datafusion_util", @@ -4268,7 +4258,6 @@ dependencies = [ "bytes", "client_util", "criterion", - "data_types", "data_types2", "datafusion 0.1.0", "datafusion_util", @@ -4313,7 +4302,6 @@ dependencies = [ "async-trait", "chrono", "croaring", - "data_types", "data_types2", "datafusion 0.1.0", "datafusion_util", @@ -5220,7 +5208,6 @@ version = "0.1.0" dependencies = [ "arrow", "async-trait", - "data_types", "data_types2", "datafusion 0.1.0", "futures", @@ -6790,7 +6777,6 @@ name = "write_buffer" version = "0.1.0" dependencies = [ "async-trait", - "data_types", "data_types2", "dml", "dotenv", @@ -6825,7 +6811,6 @@ name = "write_summary" version = "0.1.0" dependencies = [ "base64 0.13.0", - "data_types", "data_types2", "dml", "generated_types", diff --git a/clap_blocks/Cargo.toml b/clap_blocks/Cargo.toml index ff507f92b9..b24945f600 100644 --- a/clap_blocks/Cargo.toml +++ b/clap_blocks/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] clap = { version = "3", features = ["derive", "env"] } -data_types = { path = "../data_types" } futures = "0.3" humantime = "2.1.0" iox_catalog = { path = "../iox_catalog" } diff --git a/compactor/Cargo.toml b/compactor/Cargo.toml index 62b61baf60..e21d11f287 100644 --- a/compactor/Cargo.toml +++ b/compactor/Cargo.toml @@ -9,7 +9,6 @@ arrow = { version = "13", features = ["prettyprint"] } async-trait = "0.1.53" backoff = { path = "../backoff" } bytes = "1.0" -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } datafusion = { path = "../datafusion" } futures = "0.3" diff --git a/data_types2/Cargo.toml b/data_types2/Cargo.toml index 84c58e76d8..4ef50bff7c 100644 --- a/data_types2/Cargo.toml +++ b/data_types2/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" description = "Shared data types in the IOx NG architecture" [dependencies] -data_types = { path = "../data_types" } influxdb_line_protocol = { path = "../influxdb_line_protocol" } observability_deps = { path = "../observability_deps" } ordered-float = "3" diff --git a/dml/Cargo.toml b/dml/Cargo.toml index 4606ad7ab2..2d43fd9cf1 100644 --- a/dml/Cargo.toml +++ b/dml/Cargo.toml @@ -6,7 +6,6 @@ description = "DML types" [dependencies] arrow_util = { path = "../arrow_util" } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } hashbrown = "0.12" mutable_batch = { path = "../mutable_batch" } diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml index ce6c8b59b9..6c902b2c89 100644 --- a/influxdb_iox/Cargo.toml +++ b/influxdb_iox/Cargo.toml @@ -9,7 +9,6 @@ default-run = "influxdb_iox" # Workspace dependencies, in alphabetical order clap_blocks = { path = "../clap_blocks" } compactor = { path = "../compactor" } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } datafusion = { path = "../datafusion" } dml = { path = "../dml" } diff --git a/ingester/Cargo.toml b/ingester/Cargo.toml index 669c643f8b..08cb2f1fb5 100644 --- a/ingester/Cargo.toml +++ b/ingester/Cargo.toml @@ -14,7 +14,6 @@ base64 = "0.13" bytes = "1.0" datafusion = { path = "../datafusion" } datafusion_util = { path = "../datafusion_util" } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } futures = "0.3" generated_types = { path = "../generated_types" } diff --git a/iox_data_generator/Cargo.toml b/iox_data_generator/Cargo.toml index a8d94347e9..adb72661af 100644 --- a/iox_data_generator/Cargo.toml +++ b/iox_data_generator/Cargo.toml @@ -12,7 +12,6 @@ clap = { version = "3", features = ["cargo"] } futures = "0.3" handlebars = "4.2.2" humantime = "2.1.0" -data_types = { path = "../data_types" } influxdb2_client = { path = "../influxdb2_client" } influxdb_iox_client = { path = "../influxdb_iox_client" } itertools = "0.10.0" diff --git a/ioxd_common/Cargo.toml b/ioxd_common/Cargo.toml index 3582869dcb..e2d6f4533c 100644 --- a/ioxd_common/Cargo.toml +++ b/ioxd_common/Cargo.toml @@ -10,7 +10,6 @@ edition = "2021" [dependencies] # Workspace dependencies, in alphabetical order clap_blocks = { path = "../clap_blocks" } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } dml = { path = "../dml" } metric = { path = "../metric" } diff --git a/mutable_batch/Cargo.toml b/mutable_batch/Cargo.toml index 1abfb504eb..020f7bf353 100644 --- a/mutable_batch/Cargo.toml +++ b/mutable_batch/Cargo.toml @@ -8,7 +8,6 @@ description = "A mutable arrow RecordBatch" arrow = { version = "13", features = ["prettyprint"] } arrow_util = { path = "../arrow_util" } chrono = { version = "0.4", default-features = false } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } iox_time = { path = "../iox_time" } schema = { path = "../schema" } diff --git a/parquet_file/Cargo.toml b/parquet_file/Cargo.toml index 2c046b0916..464f9924f0 100644 --- a/parquet_file/Cargo.toml +++ b/parquet_file/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" arrow = { version = "13", features = ["prettyprint"] } base64 = "0.13" bytes = "1.0" -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } datafusion = { path = "../datafusion" } datafusion_util = { path = "../datafusion_util" } diff --git a/querier/Cargo.toml b/querier/Cargo.toml index e20e2270cc..077c8c002a 100644 --- a/querier/Cargo.toml +++ b/querier/Cargo.toml @@ -10,7 +10,6 @@ async-trait = "0.1.53" backoff = { path = "../backoff" } bytes = "1.0" client_util = { path = "../client_util" } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } datafusion = { path = "../datafusion" } datafusion_util = { path = "../datafusion_util" } diff --git a/query/Cargo.toml b/query/Cargo.toml index a60448cb7c..8c5703a43e 100644 --- a/query/Cargo.toml +++ b/query/Cargo.toml @@ -19,7 +19,6 @@ arrow_util = { path = "../arrow_util" } async-trait = "0.1" chrono = { version = "0.4", default-features = false } croaring = "0.6" -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } datafusion = { path = "../datafusion" } datafusion_util = { path = "../datafusion_util" } diff --git a/service_grpc_influxrpc/Cargo.toml b/service_grpc_influxrpc/Cargo.toml index b9630afd4c..78a79a87cf 100644 --- a/service_grpc_influxrpc/Cargo.toml +++ b/service_grpc_influxrpc/Cargo.toml @@ -8,7 +8,6 @@ edition = "2021" [dependencies] # Workspace dependencies, in alphabetical order datafusion = { path = "../datafusion" } -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } generated_types = { path = "../generated_types" } observability_deps = { path = "../observability_deps" } diff --git a/write_buffer/Cargo.toml b/write_buffer/Cargo.toml index 61e2a20a43..fee3cd539e 100644 --- a/write_buffer/Cargo.toml +++ b/write_buffer/Cargo.toml @@ -5,7 +5,6 @@ edition = "2021" [dependencies] async-trait = "0.1" -data_types = { path = "../data_types" } data_types2 = { path = "../data_types2" } dml = { path = "../dml" } dotenv = "0.15.0" diff --git a/write_summary/Cargo.toml b/write_summary/Cargo.toml index f6e660933e..4fdcb66bbf 100644 --- a/write_summary/Cargo.toml +++ b/write_summary/Cargo.toml @@ -3,27 +3,15 @@ name = "write_summary" version = "0.1.0" edition = "2021" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] -# Workspace dependencies, in alphabetical order +base64 = "0.13" data_types2 = { path = "../data_types2" } dml = { path = "../dml" } generated_types = { path = "../generated_types" } observability_deps = { path = "../observability_deps" } -workspace-hack = { path = "../workspace-hack"} - - -# Crates.io dependencies, in alphabetical order -base64 = "0.13" serde_json = "1.0.81" snafu = "0.7" - +workspace-hack = { path = "../workspace-hack"} [dev-dependencies] -# Workspace dependencies, in alphabetical order -data_types = { path = "../data_types" } iox_time = { path = "../iox_time" } - - -# Crates.io dependencies, in alphabetical order