From e328c7067ce95f042b273030dde6875b643934e7 Mon Sep 17 00:00:00 2001 From: "Lei, HUANG" <6406592+v0y4g3r@users.noreply.github.com> Date: Fri, 25 Oct 2024 08:23:32 +0800 Subject: [PATCH] chore: udapte Rust toolchain to 2024-10-19 (#4857) * update rust toolchain * change toolchain to 2024-10-17 * fix: clippy * fix: ut * bump shadow-rs * fix: use nightly-2024-10-19 * fix: clippy * chore/udapte-toolchain-2024-10-17: Update DEV_BUILDER_IMAGE_TAG to 2024-10-19-a5c00e85-20241024184445 in Makefile --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- Makefile | 2 +- rust-toolchain.toml | 3 +-- .../src/user_provider/static_user_provider.rs | 4 ++-- .../information_schema/table_names.rs | 2 +- .../system_schema/pg_catalog/pg_namespace.rs | 6 +++--- src/cmd/src/lib.rs | 1 + src/common/base/src/secrets.rs | 5 +++-- src/common/catalog/src/consts.rs | 5 +++-- src/common/greptimedb-telemetry/src/lib.rs | 1 + src/common/macro/src/lib.rs | 11 ++++++---- src/common/meta/src/cluster.rs | 1 + src/common/meta/src/key/catalog_name.rs | 2 +- src/common/meta/src/key/datanode_table.rs | 2 +- src/common/meta/src/key/flow/flow_info.rs | 6 +++--- src/common/meta/src/key/flow/flow_name.rs | 8 ++++---- src/common/meta/src/key/node_address.rs | 2 +- src/common/meta/src/key/schema_name.rs | 2 +- src/common/meta/src/key/table_info.rs | 11 ++++------ src/common/meta/src/key/table_route.rs | 12 +++++------ src/common/meta/src/key/view_info.rs | 12 +++++------ src/common/meta/src/lock_key.rs | 4 ++-- src/common/procedure/src/store.rs | 2 +- src/common/recordbatch/src/recordbatch.rs | 4 ++-- src/datatypes/src/scalars.rs | 8 ++++---- src/datatypes/src/types/cast.rs | 4 ++-- src/datatypes/src/types/primitive_type.rs | 7 ++++--- src/datatypes/src/value.rs | 20 +++++++++---------- src/datatypes/src/vectors/decimal.rs | 2 +- src/datatypes/src/vectors/list.rs | 2 +- src/datatypes/src/vectors/primitive.rs | 2 +- src/flow/src/compute/render.rs | 6 +++--- src/flow/src/compute/render/map.rs | 2 +- src/flow/src/compute/render/reduce.rs | 2 +- src/flow/src/compute/render/src_sink.rs | 2 +- src/flow/src/df_optimizer.rs | 2 +- .../search/fst_values_mapper.rs | 4 +++- .../search/index_apply/predicates_apply.rs | 2 +- src/meta-srv/src/lib.rs | 1 - src/mito2/src/cache/cache_size.rs | 2 +- src/mito2/src/config.rs | 2 +- src/mito2/src/memtable/key_values.rs | 2 +- .../inverted_index/applier/builder/between.rs | 2 +- .../applier/builder/comparison.rs | 2 +- .../inverted_index/applier/builder/eq_list.rs | 2 +- .../inverted_index/applier/builder/in_list.rs | 2 +- .../applier/builder/regex_match.rs | 2 +- src/mito2/src/sst/index/store.rs | 8 ++++---- src/mito2/src/sst/parquet/metadata.rs | 6 +++++- src/mito2/src/sst/parquet/row_group.rs | 2 +- src/mito2/src/sst/parquet/stats.rs | 2 +- src/object-store/src/util.rs | 2 +- src/pipeline/src/etl/processor.rs | 3 ++- src/pipeline/src/etl/processor/timestamp.rs | 4 ++-- .../transform/transformer/greptime/coerce.rs | 8 +++----- src/pipeline/src/etl/value.rs | 4 ++-- src/pipeline/src/manager.rs | 1 + .../src/extension_plan/histogram_fold.rs | 4 +++- .../src/extension_plan/scalar_calculate.rs | 3 ++- src/promql/src/lib.rs | 1 - src/query/src/dist_plan/planner.rs | 1 + src/query/src/lib.rs | 1 - src/query/src/range_select/plan_rewrite.rs | 4 ++-- src/script/src/python/rspython/vector_impl.rs | 3 ++- src/servers/src/export_metrics.rs | 4 +++- src/servers/src/query_handler.rs | 2 ++ src/sql/src/parser.rs | 19 ++++++++---------- src/sql/src/parsers/admin_parser.rs | 2 +- src/sql/src/parsers/alter_parser.rs | 4 ++-- src/sql/src/parsers/copy_parser.rs | 2 +- src/sql/src/parsers/create_parser.rs | 4 ++-- src/sql/src/parsers/deallocate_parser.rs | 2 +- src/sql/src/parsers/delete_parser.rs | 2 +- src/sql/src/parsers/describe_parser.rs | 2 +- src/sql/src/parsers/drop_parser.rs | 2 +- src/sql/src/parsers/execute_parser.rs | 2 +- src/sql/src/parsers/explain_parser.rs | 2 +- src/sql/src/parsers/insert_parser.rs | 2 +- src/sql/src/parsers/prepare_parser.rs | 2 +- src/sql/src/parsers/query_parser.rs | 2 +- src/sql/src/parsers/set_var_parser.rs | 2 +- src/sql/src/parsers/show_parser.rs | 2 +- src/sql/src/parsers/tql_parser.rs | 2 +- src/sql/src/parsers/truncate_parser.rs | 2 +- src/sql/src/statements/tql.rs | 1 + src/sql/src/util.rs | 2 +- src/store-api/src/manifest/action.rs | 5 +++-- src/store-api/src/path_utils.rs | 6 ++++-- src/store-api/src/region_engine.rs | 1 + src/table/src/metadata.rs | 3 ++- src/table/src/predicate/stats.rs | 2 +- src/table/src/stats.rs | 3 ++- src/table/src/table_reference.rs | 2 +- 94 files changed, 181 insertions(+), 164 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e13a7c6929..f447ea1148 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -5269,7 +5269,7 @@ dependencies = [ [[package]] name = "influxdb_line_protocol" version = "0.1.0" -source = "git+https://github.com/evenyag/influxdb_iox?branch=feat/line-protocol#10ef0d0b02705ac7518717390939fa3a9bcfcacc" +source = "git+https://github.com/evenyag/influxdb_iox?branch=feat%2Fline-protocol#10ef0d0b02705ac7518717390939fa3a9bcfcacc" dependencies = [ "bytes", "nom", @@ -10953,9 +10953,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.31.1" +version = "0.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c282402d25101f9c893e9cd7e4cae535fe7db18b81291de973026c219ddf1e" +checksum = "2311e39772c00391875f40e34d43efef247b23930143a70ca5fbec9505937420" dependencies = [ "const_format", "git2", diff --git a/Cargo.toml b/Cargo.toml index ab78bbd90f..60d8215634 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -169,7 +169,7 @@ schemars = "0.8" serde = { version = "1.0", features = ["derive"] } serde_json = { version = "1.0", features = ["float_roundtrip"] } serde_with = "3" -shadow-rs = "0.31" +shadow-rs = "0.35" similar-asserts = "1.6.0" smallvec = { version = "1", features = ["serde"] } snafu = "0.8" diff --git a/Makefile b/Makefile index c63acb67b4..dd335c370a 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ CARGO_BUILD_OPTS := --locked IMAGE_REGISTRY ?= docker.io IMAGE_NAMESPACE ?= greptime IMAGE_TAG ?= latest -DEV_BUILDER_IMAGE_TAG ?= 2024-06-06-5674c14f-20240920110415 +DEV_BUILDER_IMAGE_TAG ?= 2024-10-19-a5c00e85-20241024184445 BUILDX_MULTI_PLATFORM_BUILD ?= false BUILDX_BUILDER_NAME ?= gtbuilder BASE_IMAGE ?= ubuntu diff --git a/rust-toolchain.toml b/rust-toolchain.toml index cfa276d72f..c986eedd97 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,2 @@ [toolchain] -channel = "nightly-2024-06-06" - +channel = "nightly-2024-10-19" diff --git a/src/auth/src/user_provider/static_user_provider.rs b/src/auth/src/user_provider/static_user_provider.rs index 9e05671219..24093d5e37 100644 --- a/src/auth/src/user_provider/static_user_provider.rs +++ b/src/auth/src/user_provider/static_user_provider.rs @@ -33,7 +33,7 @@ impl StaticUserProvider { value: value.to_string(), msg: "StaticUserProviderOption must be in format `