From bc7244c48ea67a5b845ded36d1089eedbd03e02f Mon Sep 17 00:00:00 2001 From: Marco Neumann Date: Mon, 25 Oct 2021 10:45:44 +0200 Subject: [PATCH 1/3] chore: use Rust edition 2021 --- Cargo.toml | 2 +- arrow_util/Cargo.toml | 2 +- client_util/Cargo.toml | 4 ++-- data_types/Cargo.toml | 2 +- datafusion/Cargo.toml | 2 +- datafusion_util/Cargo.toml | 2 +- entry/Cargo.toml | 2 +- generated_types/Cargo.toml | 2 +- grpc-router/Cargo.toml | 2 +- grpc-router/grpc-router-test-gen/Cargo.toml | 2 +- influxdb2_client/Cargo.toml | 2 +- influxdb_iox_client/Cargo.toml | 2 +- influxdb_line_protocol/Cargo.toml | 4 ++-- influxdb_storage_client/Cargo.toml | 4 ++-- influxdb_tsm/Cargo.toml | 2 +- internal_types/Cargo.toml | 2 +- iox_data_generator/Cargo.toml | 2 +- iox_object_store/Cargo.toml | 2 +- lifecycle/Cargo.toml | 2 +- logfmt/Cargo.toml | 2 +- metric/Cargo.toml | 2 +- metric_exporters/Cargo.toml | 2 +- mutable_batch/Cargo.toml | 2 +- mutable_batch_lp/Cargo.toml | 2 +- mutable_batch_pb/Cargo.toml | 2 +- mutable_buffer/Cargo.toml | 2 +- object_store/Cargo.toml | 2 +- observability_deps/Cargo.toml | 2 +- packers/Cargo.toml | 2 +- panic_logging/Cargo.toml | 2 +- parquet_catalog/Cargo.toml | 2 +- parquet_file/Cargo.toml | 2 +- persistence_windows/Cargo.toml | 2 +- predicate/Cargo.toml | 2 +- query/Cargo.toml | 2 +- query_tests/Cargo.toml | 2 +- query_tests/generate/Cargo.toml | 4 ++-- read_buffer/Cargo.toml | 2 +- rustfmt.toml | 2 +- schema/Cargo.toml | 2 +- server/Cargo.toml | 2 +- server/src/lib.rs | 3 +++ server_benchmarks/Cargo.toml | 2 +- test_helpers/Cargo.toml | 2 +- time/Cargo.toml | 2 +- trace/Cargo.toml | 2 +- trace_exporters/Cargo.toml | 2 +- trace_http/Cargo.toml | 2 +- tracker/Cargo.toml | 2 +- trogging/Cargo.toml | 2 +- write_buffer/Cargo.toml | 2 +- 51 files changed, 57 insertions(+), 54 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2351e44efc..3510a2c032 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "influxdb_iox" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" default-run = "influxdb_iox" readme = "README.md" diff --git a/arrow_util/Cargo.toml b/arrow_util/Cargo.toml index 0aa118f64b..e6682746a2 100644 --- a/arrow_util/Cargo.toml +++ b/arrow_util/Cargo.toml @@ -2,7 +2,7 @@ name = "arrow_util" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "Apache Arrow utilities" [dependencies] diff --git a/client_util/Cargo.toml b/client_util/Cargo.toml index b61f69e75e..af6f4a1b16 100644 --- a/client_util/Cargo.toml +++ b/client_util/Cargo.toml @@ -3,7 +3,7 @@ name = "client_util" version = "0.1.0" authors = ["Raphael Taylor-Davies "] description = "Shared code for IOx clients" -edition = "2018" +edition = "2021" [dependencies] http = "0.2.3" @@ -13,4 +13,4 @@ tonic = { version = "0.5.0" } tower = "0.4" [dev-dependencies] -tokio = { version = "1.11", features = ["macros"] } \ No newline at end of file +tokio = { version = "1.11", features = ["macros"] } diff --git a/data_types/Cargo.toml b/data_types/Cargo.toml index 0a729fbc25..eee2b2c9ff 100644 --- a/data_types/Cargo.toml +++ b/data_types/Cargo.toml @@ -3,7 +3,7 @@ name = "data_types" version = "0.1.0" authors = ["pauldix "] description = "InfluxDB IOx data_types, shared between IOx instances and IOx clients" -edition = "2018" +edition = "2021" readme = "README.md" [dependencies] # In alphabetical order diff --git a/datafusion/Cargo.toml b/datafusion/Cargo.toml index 66af425cea..7326fa3728 100644 --- a/datafusion/Cargo.toml +++ b/datafusion/Cargo.toml @@ -2,7 +2,7 @@ name = "datafusion" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "Re-exports datafusion at a specific version" [dependencies] diff --git a/datafusion_util/Cargo.toml b/datafusion_util/Cargo.toml index 2a924f472a..4d3288bb71 100644 --- a/datafusion_util/Cargo.toml +++ b/datafusion_util/Cargo.toml @@ -2,7 +2,7 @@ name = "datafusion_util" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "Datafusion utilities" [dependencies] diff --git a/entry/Cargo.toml b/entry/Cargo.toml index 459f6a59ae..6450bbda2f 100644 --- a/entry/Cargo.toml +++ b/entry/Cargo.toml @@ -2,7 +2,7 @@ name = "entry" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" description = "The entry format used by the write buffer" [dependencies] diff --git a/generated_types/Cargo.toml b/generated_types/Cargo.toml index 48400b3859..2bc44c8970 100644 --- a/generated_types/Cargo.toml +++ b/generated_types/Cargo.toml @@ -2,7 +2,7 @@ name = "generated_types" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order bytes = "1.0" diff --git a/grpc-router/Cargo.toml b/grpc-router/Cargo.toml index 9cfc2102bd..4d832b9b73 100644 --- a/grpc-router/Cargo.toml +++ b/grpc-router/Cargo.toml @@ -2,7 +2,7 @@ name = "grpc-router" version = "0.1.0" authors = ["Marko Mikulicic "] -edition = "2018" +edition = "2021" [dependencies] bytes = "1.0" diff --git a/grpc-router/grpc-router-test-gen/Cargo.toml b/grpc-router/grpc-router-test-gen/Cargo.toml index d3546ba504..f23a1591c1 100644 --- a/grpc-router/grpc-router-test-gen/Cargo.toml +++ b/grpc-router/grpc-router-test-gen/Cargo.toml @@ -2,7 +2,7 @@ name = "grpc-router-test-gen" version = "0.1.0" authors = ["Marko Mikulicic "] -edition = "2018" +edition = "2021" description = "Protobuf used in test for the grpc-router crate; need to be in a separate create because of linter limitations" [dependencies] diff --git a/influxdb2_client/Cargo.toml b/influxdb2_client/Cargo.toml index a475cf5989..0824082817 100644 --- a/influxdb2_client/Cargo.toml +++ b/influxdb2_client/Cargo.toml @@ -2,7 +2,7 @@ name = "influxdb2_client" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order bytes = "1.0" diff --git a/influxdb_iox_client/Cargo.toml b/influxdb_iox_client/Cargo.toml index e43f0cbe54..f0961b9686 100644 --- a/influxdb_iox_client/Cargo.toml +++ b/influxdb_iox_client/Cargo.toml @@ -2,7 +2,7 @@ name = "influxdb_iox_client" version = "0.1.0" authors = ["Dom Dwyer "] -edition = "2018" +edition = "2021" [features] flight = ["arrow", "arrow-flight", "arrow_util", "serde/derive", "serde_json", "futures-util"] diff --git a/influxdb_line_protocol/Cargo.toml b/influxdb_line_protocol/Cargo.toml index b2a194c86b..096cd3f997 100644 --- a/influxdb_line_protocol/Cargo.toml +++ b/influxdb_line_protocol/Cargo.toml @@ -2,7 +2,7 @@ name = "influxdb_line_protocol" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order nom = "7" @@ -11,4 +11,4 @@ snafu = "0.6.2" observability_deps = { path = "../observability_deps" } [dev-dependencies] # In alphabetical order -test_helpers = { path = "../test_helpers" } \ No newline at end of file +test_helpers = { path = "../test_helpers" } diff --git a/influxdb_storage_client/Cargo.toml b/influxdb_storage_client/Cargo.toml index 77e949c8b8..ad0742e840 100644 --- a/influxdb_storage_client/Cargo.toml +++ b/influxdb_storage_client/Cargo.toml @@ -2,7 +2,7 @@ name = "influxdb_storage_client" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" [dependencies] client_util = { path = "../client_util" } @@ -11,4 +11,4 @@ prost = "0.8" tonic = { version = "0.5.0" } futures-util = { version = "0.3.1" } -[dev-dependencies] \ No newline at end of file +[dev-dependencies] diff --git a/influxdb_tsm/Cargo.toml b/influxdb_tsm/Cargo.toml index 200cb8a50f..79e64c3676 100644 --- a/influxdb_tsm/Cargo.toml +++ b/influxdb_tsm/Cargo.toml @@ -2,7 +2,7 @@ name = "influxdb_tsm" version = "0.1.0" authors = ["Edd Robinson "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order integer-encoding = "3.0.2" diff --git a/internal_types/Cargo.toml b/internal_types/Cargo.toml index 9d44a6c55e..a4a010e16a 100644 --- a/internal_types/Cargo.toml +++ b/internal_types/Cargo.toml @@ -2,7 +2,7 @@ name = "internal_types" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "InfluxDB IOx internal types, shared between IOx instances" readme = "README.md" diff --git a/iox_data_generator/Cargo.toml b/iox_data_generator/Cargo.toml index 393ac1a3b1..4e1ae9b74d 100644 --- a/iox_data_generator/Cargo.toml +++ b/iox_data_generator/Cargo.toml @@ -2,7 +2,7 @@ name = "iox_data_generator" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" default-run = "iox_data_generator" [dependencies] diff --git a/iox_object_store/Cargo.toml b/iox_object_store/Cargo.toml index d98b82d208..de6a42e660 100644 --- a/iox_object_store/Cargo.toml +++ b/iox_object_store/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "iox_object_store" version = "0.1.0" -edition = "2018" +edition = "2021" description = "IOx-specific semantics wrapping the general-purpose object store crate" [dependencies] diff --git a/lifecycle/Cargo.toml b/lifecycle/Cargo.toml index 8c827855ef..0f61c025e7 100644 --- a/lifecycle/Cargo.toml +++ b/lifecycle/Cargo.toml @@ -2,7 +2,7 @@ name = "lifecycle" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" description = "Implements the IOx data lifecycle" [dependencies] diff --git a/logfmt/Cargo.toml b/logfmt/Cargo.toml index 7118e276ce..285c62f52e 100644 --- a/logfmt/Cargo.toml +++ b/logfmt/Cargo.toml @@ -3,7 +3,7 @@ name = "logfmt" version = "0.1.0" authors = ["Andrew Lamb "] description = "tracing_subscriber layer for writing out logfmt formatted events" -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order observability_deps = { path = "../observability_deps" } diff --git a/metric/Cargo.toml b/metric/Cargo.toml index 787d25d2f7..f0e24ca25e 100644 --- a/metric/Cargo.toml +++ b/metric/Cargo.toml @@ -2,7 +2,7 @@ name = "metric" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order diff --git a/metric_exporters/Cargo.toml b/metric_exporters/Cargo.toml index 7f9020fe2b..8af1f1cade 100644 --- a/metric_exporters/Cargo.toml +++ b/metric_exporters/Cargo.toml @@ -2,7 +2,7 @@ name = "metric_exporters" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order diff --git a/mutable_batch/Cargo.toml b/mutable_batch/Cargo.toml index ee412b5557..a050d9711d 100644 --- a/mutable_batch/Cargo.toml +++ b/mutable_batch/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mutable_batch" version = "0.1.0" -edition = "2018" +edition = "2021" description = "A mutable arrow RecordBatch" [dependencies] diff --git a/mutable_batch_lp/Cargo.toml b/mutable_batch_lp/Cargo.toml index cc1dd86458..d67f38159d 100644 --- a/mutable_batch_lp/Cargo.toml +++ b/mutable_batch_lp/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mutable_batch_lp" version = "0.1.0" -edition = "2018" +edition = "2021" description = "Conversion logic for line protocol -> MutableBatch" [dependencies] diff --git a/mutable_batch_pb/Cargo.toml b/mutable_batch_pb/Cargo.toml index 0d55b58948..af9b89a5e8 100644 --- a/mutable_batch_pb/Cargo.toml +++ b/mutable_batch_pb/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "mutable_batch_pb" version = "0.1.0" -edition = "2018" +edition = "2021" description = "Conversion logic for binary write protocol <-> MutableBatch" [dependencies] diff --git a/mutable_buffer/Cargo.toml b/mutable_buffer/Cargo.toml index f6fc45a408..c34e433cb5 100644 --- a/mutable_buffer/Cargo.toml +++ b/mutable_buffer/Cargo.toml @@ -2,7 +2,7 @@ name = "mutable_buffer" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order arrow = { version = "6.0", features = ["prettyprint"] } diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index a38d56c065..1538f61094 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -2,7 +2,7 @@ name = "object_store" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order async-trait = "0.1.42" diff --git a/observability_deps/Cargo.toml b/observability_deps/Cargo.toml index 4b66765661..01afbce882 100644 --- a/observability_deps/Cargo.toml +++ b/observability_deps/Cargo.toml @@ -2,7 +2,7 @@ name = "observability_deps" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" description = "Observability ecosystem dependencies for InfluxDB IOx, to ensure consistent versions and unified updates" [dependencies] # In alphabetical order diff --git a/packers/Cargo.toml b/packers/Cargo.toml index 2e5580911e..a6f0dc0e60 100644 --- a/packers/Cargo.toml +++ b/packers/Cargo.toml @@ -2,7 +2,7 @@ name = "packers" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order arrow = { version = "6.0", features = ["prettyprint"] } diff --git a/panic_logging/Cargo.toml b/panic_logging/Cargo.toml index 451ddbda33..d46a6b986a 100644 --- a/panic_logging/Cargo.toml +++ b/panic_logging/Cargo.toml @@ -2,7 +2,7 @@ name = "panic_logging" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order observability_deps = { path = "../observability_deps" } diff --git a/parquet_catalog/Cargo.toml b/parquet_catalog/Cargo.toml index 13f64ec10f..1b47f8063f 100644 --- a/parquet_catalog/Cargo.toml +++ b/parquet_catalog/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "parquet_catalog" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] arrow = { version = "6.0", features = ["prettyprint"] } diff --git a/parquet_file/Cargo.toml b/parquet_file/Cargo.toml index b5038cc9ad..cb7edf049f 100644 --- a/parquet_file/Cargo.toml +++ b/parquet_file/Cargo.toml @@ -2,7 +2,7 @@ name = "parquet_file" version = "0.1.0" authors = ["Nga Tran "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order arrow = { version = "6.0", features = ["prettyprint"] } diff --git a/persistence_windows/Cargo.toml b/persistence_windows/Cargo.toml index 98ce242dac..a068b524be 100644 --- a/persistence_windows/Cargo.toml +++ b/persistence_windows/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "persistence_windows" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] data_types = { path = "../data_types" } diff --git a/predicate/Cargo.toml b/predicate/Cargo.toml index a7f44f6653..843a7ce3a6 100644 --- a/predicate/Cargo.toml +++ b/predicate/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "predicate" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] arrow = { version = "6.0", features = ["prettyprint"] } diff --git a/query/Cargo.toml b/query/Cargo.toml index 766731c189..8d402d4677 100644 --- a/query/Cargo.toml +++ b/query/Cargo.toml @@ -2,7 +2,7 @@ name = "query" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "IOx Query Interface and Executor" # This crate is designed to be independent of the rest of the IOx diff --git a/query_tests/Cargo.toml b/query_tests/Cargo.toml index 1b386903d5..bb69fc3fc1 100644 --- a/query_tests/Cargo.toml +++ b/query_tests/Cargo.toml @@ -2,7 +2,7 @@ name = "query_tests" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "Tests of the query engine against different database configurations" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/query_tests/generate/Cargo.toml b/query_tests/generate/Cargo.toml index bbe46ba52b..2d78f367fe 100644 --- a/query_tests/generate/Cargo.toml +++ b/query_tests/generate/Cargo.toml @@ -3,9 +3,9 @@ name = "generate" description = "Creates rust #tests for files in .sql" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order # Note this is a standalone binary and not part of the overall workspace -[workspace] \ No newline at end of file +[workspace] diff --git a/read_buffer/Cargo.toml b/read_buffer/Cargo.toml index 88877f782d..707189e83b 100644 --- a/read_buffer/Cargo.toml +++ b/read_buffer/Cargo.toml @@ -2,7 +2,7 @@ name = "read_buffer" version = "0.1.0" authors = ["Edd Robinson "] -edition = "2018" +edition = "2021" # Note this crate is designed to be standalone, and should not depend # on the IOx Query Engine. The rationale is: diff --git a/rustfmt.toml b/rustfmt.toml index 4edcabf961..7b060483be 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,4 +1,4 @@ -edition = "2018" +edition = "2021" # Unstable features not yet supported on stable Rust #wrap_comments = true diff --git a/schema/Cargo.toml b/schema/Cargo.toml index 2a6d3b085a..231d10bf80 100644 --- a/schema/Cargo.toml +++ b/schema/Cargo.toml @@ -2,7 +2,7 @@ name = "schema" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "IOx Schema definition" [dependencies] diff --git a/server/Cargo.toml b/server/Cargo.toml index eb53ec8a8a..fa2d104de3 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -2,7 +2,7 @@ name = "server" version = "0.1.0" authors = ["pauldix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order arrow = { version = "6.0", features = ["prettyprint"] } diff --git a/server/src/lib.rs b/server/src/lib.rs index 77dd949feb..1d6a20745e 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -876,6 +876,9 @@ where // immediately to the client and abort all other outstanding requests. futures_util::future::try_join_all(sharded_entries.into_iter().map( |sharded_entry| async { + // capture entire entry in closure + let sharded_entry = sharded_entry; + let sink = match &rules.routing_rules { Some(RoutingRules::ShardConfig(shard_config)) => { let id = sharded_entry.shard_id.expect("sharded entry"); diff --git a/server_benchmarks/Cargo.toml b/server_benchmarks/Cargo.toml index d90c79527d..401c6898bc 100644 --- a/server_benchmarks/Cargo.toml +++ b/server_benchmarks/Cargo.toml @@ -2,7 +2,7 @@ name = "server_benchmarks" version = "0.1.0" authors = ["Andrew Lamb "] -edition = "2018" +edition = "2021" description = "Server related bechmarks, grouped into their own crate to minimize build dev build times" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/test_helpers/Cargo.toml b/test_helpers/Cargo.toml index 4ccfa8f678..05ae27a023 100644 --- a/test_helpers/Cargo.toml +++ b/test_helpers/Cargo.toml @@ -2,7 +2,7 @@ name = "test_helpers" version = "0.1.0" authors = ["Paul Dix "] -edition = "2018" +edition = "2021" [dependencies] # In alphabetical order dotenv = "0.15.0" diff --git a/time/Cargo.toml b/time/Cargo.toml index 0557fda4c0..f1b4c9075b 100644 --- a/time/Cargo.toml +++ b/time/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "time" version = "0.1.0" -edition = "2018" +edition = "2021" description = "Time functionality for IOx" [dependencies] diff --git a/trace/Cargo.toml b/trace/Cargo.toml index 1e1d0f2527..c5173ac459 100644 --- a/trace/Cargo.toml +++ b/trace/Cargo.toml @@ -2,7 +2,7 @@ name = "trace" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" description = "Distributed tracing support within IOx" [dependencies] diff --git a/trace_exporters/Cargo.toml b/trace_exporters/Cargo.toml index c9e3d07f60..1f91219680 100644 --- a/trace_exporters/Cargo.toml +++ b/trace_exporters/Cargo.toml @@ -2,7 +2,7 @@ name = "trace_exporters" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" description = "Additional tracing exporters for IOx" [dependencies] diff --git a/trace_http/Cargo.toml b/trace_http/Cargo.toml index 74ef6b9ef6..311a636f93 100644 --- a/trace_http/Cargo.toml +++ b/trace_http/Cargo.toml @@ -2,7 +2,7 @@ name = "trace_http" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" description = "Distributed tracing support for HTTP services" [dependencies] diff --git a/tracker/Cargo.toml b/tracker/Cargo.toml index 66ab6b6f48..3a71bcd1fc 100644 --- a/tracker/Cargo.toml +++ b/tracker/Cargo.toml @@ -2,7 +2,7 @@ name = "tracker" version = "0.1.0" authors = ["Raphael Taylor-Davies "] -edition = "2018" +edition = "2021" description = "Utilities for tracking resource utilisation within IOx" [dependencies] diff --git a/trogging/Cargo.toml b/trogging/Cargo.toml index 0647192fab..39afca016b 100644 --- a/trogging/Cargo.toml +++ b/trogging/Cargo.toml @@ -2,7 +2,7 @@ name = "trogging" version = "0.1.0" authors = ["Marko Mikulicic "] -edition = "2018" +edition = "2021" description = "IOx logging pipeline built upon tokio-tracing" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/write_buffer/Cargo.toml b/write_buffer/Cargo.toml index a6fbda7608..2afe4a73b4 100644 --- a/write_buffer/Cargo.toml +++ b/write_buffer/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "write_buffer" version = "0.1.0" -edition = "2018" +edition = "2021" [dependencies] async-trait = "0.1" From c8981e4f78a90d47cd7ceb2f481f8496fc458392 Mon Sep 17 00:00:00 2001 From: Marco Neumann Date: Mon, 25 Oct 2021 10:58:15 +0200 Subject: [PATCH 2/3] fix: fix optional dependencies for `influxdb_iox_client` --- influxdb_iox_client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/influxdb_iox_client/Cargo.toml b/influxdb_iox_client/Cargo.toml index f0961b9686..e4a5d4dd18 100644 --- a/influxdb_iox_client/Cargo.toml +++ b/influxdb_iox_client/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [features] flight = ["arrow", "arrow-flight", "arrow_util", "serde/derive", "serde_json", "futures-util"] -format = ["arrow"] +format = ["arrow", "arrow_util"] [dependencies] # Workspace dependencies, in alphabetical order From 7a28982e2ab8e4570aef78285f66e763de41104e Mon Sep 17 00:00:00 2001 From: Marco Neumann Date: Mon, 25 Oct 2021 11:15:19 +0200 Subject: [PATCH 3/3] fix: fix dependency features for `influxdb_iox` --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3510a2c032..514415522e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,7 +94,7 @@ data_types = { path = "data_types" } entry = { path = "entry" } generated_types = { path = "generated_types" } -influxdb_iox_client = { path = "influxdb_iox_client", features = ["format"] } +influxdb_iox_client = { path = "influxdb_iox_client", features = ["flight", "format"] } influxdb_line_protocol = { path = "influxdb_line_protocol" } internal_types = { path = "internal_types" } iox_object_store = { path = "iox_object_store" }