From 994938b2f0db7dfd0c363c9f05403d40064abeba Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Fri, 19 Nov 2021 14:02:08 -0500
Subject: [PATCH] fix: Alphabetize/organize deps
---
Cargo.toml | 2 +-
influxdb_iox/Cargo.toml | 18 ++++++++----------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index f26e75b722..445233ffbb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,12 +10,12 @@ members = [
"generated_types",
"grpc-router",
"grpc-router-test-gen",
- "influxdb2_client",
"influxdb_iox",
"influxdb_iox_client",
"influxdb_line_protocol",
"influxdb_storage_client",
"influxdb_tsm",
+ "influxdb2_client",
"internal_types",
"iox_data_generator",
"iox_object_store",
diff --git a/influxdb_iox/Cargo.toml b/influxdb_iox/Cargo.toml
index 7522775531..07d4a53803 100644
--- a/influxdb_iox/Cargo.toml
+++ b/influxdb_iox/Cargo.toml
@@ -7,11 +7,10 @@ default-run = "influxdb_iox"
[dependencies]
# Workspace dependencies, in alphabetical order
-datafusion = { path = "../datafusion" }
data_types = { path = "../data_types" }
+datafusion = { path = "../datafusion" }
dml = { path = "../dml" }
generated_types = { path = "../generated_types" }
-
influxdb_iox_client = { path = "../influxdb_iox_client", features = ["flight", "format", "write_lp"] }
influxdb_line_protocol = { path = "../influxdb_line_protocol" }
internal_types = { path = "../internal_types" }
@@ -22,7 +21,6 @@ metric_exporters = { path = "../metric_exporters" }
mutable_batch_lp = { path = "../mutable_batch_lp" }
mutable_batch_pb = { path = "../mutable_batch_pb" }
mutable_buffer = { path = "../mutable_buffer" }
-num_cpus = "1.13.0"
object_store = { path = "../object_store" }
observability_deps = { path = "../observability_deps" }
panic_logging = { path = "../panic_logging" }
@@ -33,12 +31,12 @@ query = { path = "../query" }
read_buffer = { path = "../read_buffer" }
router = { path = "../router" }
server = { path = "../server" }
+time = { path = "../time" }
trace = { path = "../trace" }
trace_exporters = { path = "../trace_exporters" }
trace_http = { path = "../trace_http" }
tracker = { path = "../tracker" }
trogging = { path = "../trogging", default-features = false, features = ["structopt"] }
-time = { path = "../time" }
# Crates.io dependencies, in alphabetical order
arrow = { version = "6.0", features = ["prettyprint"] }
@@ -49,6 +47,8 @@ byteorder = "1.3.4"
bytes = "1.0"
chrono = "0.4"
clap = "2.34.0"
+# used by arrow/datafusion anyway
+comfy-table = { version = "5.0", default-features = false }
csv = "1.1"
dotenv = "0.15.0"
flate2 = "1.0"
@@ -57,15 +57,14 @@ hashbrown = "0.11"
http = "0.2.0"
humantime = "2.1.0"
hyper = "0.14"
+itertools = "0.10.1"
libc = { version = "0.2" }
log = "0.4"
+num_cpus = "1.13.0"
once_cell = { version = "1.4.0", features = ["parking_lot"] }
parking_lot = "0.11.2"
-itertools = "0.10.1"
parquet = "6.0"
pin-project = "1.0"
-# used by arrow/datafusion anyway
-comfy-table = { version = "5.0", default-features = false }
pprof = { version = "^0.5", default-features = false, features = ["flamegraph", "protobuf"], optional = true }
prost = "0.8"
rustyline = { version = "9.0", default-features = false }
@@ -90,14 +89,12 @@ tikv-jemalloc-sys = { version = "0.4.0", optional = true, features = ["unprefixe
heappy = { git = "https://github.com/mkmik/heappy", rev = "20aa466524ac9ce34a4bae29f27ec11869b50e21", features = ["enable_heap_profiler", "jemalloc_shim", "measure_free"], optional = true }
workspace-hack = { path = "../workspace-hack"}
-
[dev-dependencies]
# Workspace dependencies, in alphabetical order
arrow_util = { path = "../arrow_util" }
-influxdb2_client = { path = "../influxdb2_client" }
influxdb_storage_client = { path = "../influxdb_storage_client" }
+influxdb2_client = { path = "../influxdb2_client" }
test_helpers = { path = "../test_helpers" }
-regex = "1.4"
schema = { path = "../schema" }
write_buffer = { path = "../write_buffer" }
@@ -106,6 +103,7 @@ assert_cmd = "2.0.2"
hex = "0.4.2"
predicates = "2.1.0"
rand = "0.8.3"
+regex = "1.4"
reqwest = "0.11"
tempfile = "3.1.0"