From 1565c8d2363eb785500d356aff34c30267b60381 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Tue, 15 Nov 2022 15:58:54 +0800 Subject: [PATCH] chore: specify import style in rustfmt (#460) Signed-off-by: Ruihang Xia Signed-off-by: Ruihang Xia --- Cargo.lock | 221 +----------------- benchmarks/src/bin/nyc-taxi.rs | 40 ++-- rustfmt.toml | 3 +- src/api/src/helper.rs | 3 +- src/api/src/result.rs | 5 +- src/api/src/serde.rs | 8 +- src/api/src/v1/meta.rs | 3 +- src/catalog/src/local/manager.rs | 6 +- src/catalog/src/local/memory.rs | 3 +- src/catalog/src/remote/manager.rs | 5 +- src/catalog/src/system.rs | 8 +- src/client/examples/insert.rs | 3 +- src/client/examples/logical.rs | 13 +- src/client/examples/physical.rs | 6 +- src/client/src/admin.rs | 4 +- src/client/src/client.rs | 9 +- src/client/src/database.rs | 11 +- src/client/src/lib.rs | 8 +- src/cmd/src/bin/greptime.rs | 7 +- src/cmd/src/metasrv.rs | 6 +- src/common/error/src/format.rs | 3 +- src/common/error/src/lib.rs | 3 +- .../function-macro/tests/test_derive.rs | 3 +- .../function/src/scalars/aggregate/argmax.rs | 3 +- .../function/src/scalars/aggregate/argmin.rs | 3 +- .../function/src/scalars/aggregate/diff.rs | 3 +- .../function/src/scalars/aggregate/mean.rs | 3 +- .../function/src/scalars/aggregate/polyval.rs | 3 +- .../function/src/scalars/function_registry.rs | 3 +- src/common/function/src/scalars/numpy/clip.rs | 3 +- .../function/src/scalars/numpy/interp.rs | 14 +- .../src/scalars/timestamp/from_unixtime.rs | 3 +- src/common/function/src/scalars/udf.rs | 3 +- src/common/grpc/src/channel_manager.rs | 7 +- src/common/grpc/src/error.rs | 3 +- src/common/grpc/src/lib.rs | 6 +- src/common/grpc/src/physical.rs | 3 +- src/common/grpc/src/physical/expr.rs | 12 +- src/common/grpc/src/physical/plan.rs | 41 ++-- src/common/grpc/src/writer.rs | 11 +- src/common/insert/src/insert.rs | 48 ++-- src/common/query/src/columnar_value.rs | 3 +- src/common/query/src/function.rs | 3 +- .../query/src/logical_plan/accumulator.rs | 3 +- src/common/query/src/logical_plan/mod.rs | 10 +- src/common/query/src/logical_plan/udaf.rs | 7 +- src/common/query/src/logical_plan/udf.rs | 3 +- src/common/query/src/physical_plan.rs | 3 +- src/common/query/src/prelude.rs | 5 +- src/common/recordbatch/src/adapter.rs | 8 +- src/common/recordbatch/src/util.rs | 6 +- src/common/runtime/src/runtime.rs | 7 +- src/common/substrait/src/df_logical.rs | 20 +- src/common/substrait/src/types.rs | 3 +- src/common/telemetry/src/lib.rs | 9 +- src/common/telemetry/src/logging.rs | 14 +- src/common/time/src/date.rs | 3 +- src/common/time/src/timestamp.rs | 3 +- src/datanode/src/instance.rs | 12 +- src/datanode/src/instance/sql.rs | 6 +- src/datanode/src/mock.rs | 4 +- src/datanode/src/server/grpc/ddl.rs | 6 +- src/datanode/src/server/grpc/plan.rs | 9 +- src/datanode/src/server/grpc/select.rs | 18 +- src/datanode/src/sql.rs | 3 +- src/datanode/src/sql/insert.rs | 10 +- src/datanode/src/tests/grpc_test.rs | 8 +- src/datanode/src/tests/http_test.rs | 3 +- src/datanode/src/tests/test_util.rs | 3 +- src/datatypes/src/arrow_array.rs | 6 +- src/datatypes/src/data_type.rs | 6 +- src/datatypes/src/types/primitive_type.rs | 3 +- src/datatypes/src/vectors/binary.rs | 3 +- src/datatypes/src/vectors/constant.rs | 3 +- src/datatypes/src/vectors/null.rs | 3 +- src/datatypes/src/vectors/primitive.rs | 6 +- src/frontend/src/expr_factory.rs | 4 +- src/frontend/src/instance.rs | 9 +- src/frontend/src/instance/influxdb.rs | 3 +- src/frontend/src/instance/prometheus.rs | 13 +- src/frontend/src/mock.rs | 6 +- src/frontend/src/spliter.rs | 34 ++- src/frontend/src/table.rs | 3 +- src/frontend/src/table/insert.rs | 18 +- src/log-store/src/fs/chunk.rs | 3 +- src/log-store/src/fs/file.rs | 6 +- src/log-store/src/fs/io/unix.rs | 3 +- src/log-store/src/fs/log.rs | 6 +- src/log-store/src/fs/noop.rs | 7 +- src/log-store/src/test_util/log_store_util.rs | 3 +- src/meta-client/examples/meta_client.rs | 22 +- src/meta-client/src/client.rs | 33 +-- src/meta-client/src/client/heartbeat.rs | 15 +- src/meta-client/src/client/router.rs | 11 +- src/meta-client/src/client/store.rs | 21 +- src/meta-client/src/lib.rs | 3 +- src/meta-client/src/mocks.rs | 3 +- src/meta-client/src/rpc.rs | 32 +-- src/meta-client/src/rpc/router.rs | 32 +-- src/meta-client/src/rpc/store.rs | 42 ++-- src/meta-srv/examples/kv_store.rs | 8 +- src/meta-srv/src/bootstrap.rs | 3 +- src/meta-srv/src/election/etcd.rs | 17 +- src/meta-srv/src/error.rs | 3 +- src/meta-srv/src/handler.rs | 4 +- src/meta-srv/src/handler/check_leader.rs | 6 +- src/meta-srv/src/handler/datanode_lease.rs | 13 +- src/meta-srv/src/handler/response_header.rs | 7 +- src/meta-srv/src/keys.rs | 7 +- src/meta-srv/src/lease.rs | 4 +- src/meta-srv/src/metasrv.rs | 12 +- src/meta-srv/src/mocks.rs | 7 +- src/meta-srv/src/selector/lease_based.rs | 6 +- src/meta-srv/src/sequence.rs | 3 +- src/meta-srv/src/service.rs | 3 +- src/meta-srv/src/service/admin.rs | 8 +- src/meta-srv/src/service/heartbeat.rs | 30 +-- src/meta-srv/src/service/router.rs | 31 +-- src/meta-srv/src/service/store.rs | 18 +- src/meta-srv/src/service/store/etcd.rs | 32 +-- src/meta-srv/src/service/store/kv.rs | 14 +- src/meta-srv/src/service/store/memory.rs | 17 +- src/object-store/src/lib.rs | 5 +- src/object-store/tests/object_store_test.rs | 6 +- src/query/src/datafusion.rs | 33 ++- src/query/src/datafusion/catalog_adapter.rs | 12 +- src/query/src/datafusion/planner.rs | 5 +- src/query/src/executor.rs | 3 +- src/query/src/optimizer.rs | 3 +- src/query/src/physical_optimizer.rs | 3 +- src/query/src/planner.rs | 3 +- src/query/tests/argmax_test.rs | 3 +- src/query/tests/argmin_test.rs | 3 +- src/query/tests/mean_test.rs | 3 +- src/query/tests/my_sum_udaf_example.rs | 9 +- src/query/tests/percentile_test.rs | 3 +- src/query/tests/polyval_test.rs | 3 +- src/query/tests/pow.rs | 3 +- src/query/tests/query_engine_test.rs | 3 +- src/query/tests/scipy_stats_norm_cdf_test.rs | 3 +- src/query/tests/scipy_stats_norm_pdf.rs | 3 +- src/script/src/manager.rs | 6 +- src/script/src/python/builtins/mod.rs | 56 ++--- src/script/src/python/builtins/test.rs | 31 ++- src/script/src/python/coprocessor.rs | 10 +- src/script/src/python/coprocessor/compile.rs | 7 +- src/script/src/python/coprocessor/parse.rs | 11 +- src/script/src/python/engine.rs | 19 +- src/script/src/python/error.rs | 6 +- src/script/src/python/test.rs | 9 +- src/script/src/python/utils.rs | 11 +- src/script/src/python/vector.rs | 41 ++-- src/script/src/table.rs | 3 +- src/servers/src/error.rs | 6 +- src/servers/src/grpc.rs | 3 +- src/servers/src/http.rs | 18 +- src/servers/src/http/context.rs | 10 +- src/servers/src/http/influxdb.rs | 3 +- src/servers/src/http/prometheus.rs | 3 +- src/servers/src/influxdb.rs | 27 ++- src/servers/src/line_writer.rs | 16 +- src/servers/src/mysql/handler.rs | 8 +- src/servers/src/opentsdb/codec.rs | 6 +- src/servers/src/postgres/auth_handler.rs | 3 +- src/servers/src/prometheus.rs | 16 +- src/servers/src/server.rs | 3 +- src/servers/tests/http/http_handler_test.rs | 4 +- src/servers/tests/http/prometheus_test.rs | 3 +- src/servers/tests/mod.rs | 11 +- src/servers/tests/mysql/mod.rs | 3 +- src/servers/tests/opentsdb.rs | 3 +- src/sql/src/parser.rs | 3 +- src/sql/src/parsers/create_parser.rs | 3 +- .../benches/memtable/bench_memtable_read.rs | 3 +- .../bench_memtable_read_write_ratio.rs | 15 +- src/storage/benches/memtable/mod.rs | 16 +- src/storage/benches/memtable/util/mod.rs | 8 +- .../benches/memtable/util/regiondesc_util.rs | 3 +- src/storage/benches/wal/util/mod.rs | 14 +- src/storage/src/engine.rs | 6 +- src/storage/src/flush.rs | 3 +- src/storage/src/manifest/action.rs | 6 +- src/storage/src/manifest/impl_.rs | 9 +- src/storage/src/manifest/region.rs | 3 +- src/storage/src/manifest/storage.rs | 3 +- src/storage/src/memtable/btree.rs | 6 +- src/storage/src/memtable/inserter.rs | 3 +- src/storage/src/memtable/version.rs | 3 +- src/storage/src/metadata.rs | 2 +- src/storage/src/proto/write_batch.rs | 21 +- src/storage/src/region.rs | 11 +- src/storage/src/region/tests.rs | 11 +- src/storage/src/region/tests/alter.rs | 10 +- src/storage/src/region/tests/projection.rs | 3 +- src/storage/src/region/writer.rs | 6 +- src/storage/src/schema/compat.rs | 9 +- src/storage/src/sst/parquet.rs | 5 +- src/storage/src/test_util/config_util.rs | 6 +- src/storage/src/test_util/descriptor_util.rs | 3 +- src/storage/src/version.rs | 3 +- src/storage/src/wal.rs | 28 +-- src/storage/src/write_batch.rs | 54 ++--- src/store-api/src/manifest.rs | 6 +- src/table-engine/src/engine.rs | 18 +- src/table-engine/src/manifest/action.rs | 3 +- src/table-engine/src/table.rs | 9 +- src/table-engine/src/table/test_util.rs | 15 +- src/table/src/predicate.rs | 7 +- src/table/src/table/adapter.rs | 6 +- src/table/src/table/scan.rs | 7 +- src/table/src/test_util/empty_table.rs | 12 +- src/table/src/test_util/mock_engine.rs | 8 +- 212 files changed, 779 insertions(+), 1416 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1a8f2b8c33b..658cd4529c34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,7 +119,6 @@ name = "api" version = "0.1.0" dependencies = [ "common-base", - "common-error", "common-time", "datatypes", "prost 0.11.0", @@ -277,36 +276,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "async-io" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" -dependencies = [ - "async-lock", - "autocfg", - "concurrent-queue", - "futures-lite", - "libc", - "log", - "parking", - "polling", - "slab", - "socket2", - "waker-fn", - "winapi", -] - -[[package]] -name = "async-lock" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" -dependencies = [ - "event-listener", - "futures-lite", -] - [[package]] name = "async-stream" version = "0.3.3" @@ -688,12 +657,6 @@ version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d" -[[package]] -name = "bytecount" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" - [[package]] name = "bytemuck" version = "1.12.1" @@ -735,37 +698,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" -[[package]] -name = "camino" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - [[package]] name = "caseless" version = "0.2.1" @@ -1026,7 +958,6 @@ dependencies = [ "common-base", "common-error", "common-grpc", - "common-insert", "common-query", "common-recordbatch", "common-time", @@ -1729,7 +1660,6 @@ dependencies = [ "datafusion", "datafusion-common", "datatypes", - "frontend", "futures", "hyper", "log-store", @@ -1948,15 +1878,6 @@ dependencies = [ "libc", ] -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - [[package]] name = "error-code" version = "2.3.1" @@ -2094,13 +2015,11 @@ dependencies = [ "async-stream", "async-trait", "catalog", - "chrono", "client", "common-base", "common-catalog", "common-error", "common-grpc", - "common-insert", "common-query", "common-recordbatch", "common-runtime", @@ -2112,11 +2031,8 @@ dependencies = [ "datanode", "datatypes", "futures", - "futures-util", "itertools", "meta-client", - "meta-srv", - "moka", "openmetrics-parser", "prost 0.11.0", "query", @@ -2258,21 +2174,6 @@ version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" -[[package]] -name = "futures-lite" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.24" @@ -3044,7 +2945,6 @@ dependencies = [ "futures", "meta-srv", "rand 0.8.5", - "serde", "snafu", "tokio", "tokio-stream", @@ -3184,32 +3084,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "moka" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b49a05f67020456541f4f29cbaa812016a266a86ec76f96d3873d459c68fe5e" -dependencies = [ - "async-io", - "async-lock", - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "futures-util", - "num_cpus", - "once_cell", - "parking_lot", - "quanta", - "rustc_version", - "scheduled-thread-pool", - "skeptic", - "smallvec", - "tagptr", - "thiserror", - "triomphe", - "uuid", -] - [[package]] name = "multimap" version = "0.8.3" @@ -3684,12 +3558,6 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - [[package]] name = "parking_lot" version = "0.12.1" @@ -3870,9 +3738,9 @@ dependencies = [ [[package]] name = "pgwire" -version = "0.5.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dacbf864d6cb6a0e676c9a1162ab7b315b5c8e6c87fa9b6e0ba9ba0a569adb1" +checksum = "9e30e99a0b8acf60a6815aa8178e9ffb08178ef3ca1366673bb0d6c7ababe4c2" dependencies = [ "async-trait", "bytes", @@ -3885,7 +3753,6 @@ dependencies = [ "thiserror", "time 0.3.14", "tokio", - "tokio-rustls", "tokio-util", ] @@ -4052,20 +3919,6 @@ dependencies = [ "syn", ] -[[package]] -name = "polling" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" -dependencies = [ - "autocfg", - "cfg-if", - "libc", - "log", - "wepoll-ffi", - "winapi", -] - [[package]] name = "portable-atomic" version = "0.3.15" @@ -4273,17 +4126,6 @@ dependencies = [ "prost 0.11.0", ] -[[package]] -name = "pulldown-cmark" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" -dependencies = [ - "bitflags", - "memchr", - "unicase", -] - [[package]] name = "quanta" version = "0.10.1" @@ -4887,10 +4729,6 @@ dependencies = [ name = "rustpython-pylib" version = "0.1.0" source = "git+https://github.com/RustPython/RustPython?rev=02a1d1d#02a1d1d7db57afbb78049599c2585cc7cd59e6d3" -dependencies = [ - "rustpython-bytecode", - "rustpython-derive", -] [[package]] name = "rustpython-vm" @@ -5027,15 +4865,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "scheduled-thread-pool" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf" -dependencies = [ - "parking_lot", -] - [[package]] name = "schemars" version = "0.8.11" @@ -5147,9 +4976,6 @@ name = "semver" version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -dependencies = [ - "serde", -] [[package]] name = "serde" @@ -5363,21 +5189,6 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" -[[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata", - "error-chain", - "glob", - "pulldown-cmark", - "tempfile", - "walkdir", -] - [[package]] name = "sketches-ddsketch" version = "0.2.0" @@ -5459,7 +5270,6 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" name = "sql" version = "0.1.0" dependencies = [ - "api", "catalog", "common-catalog", "common-error", @@ -5805,12 +5615,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - [[package]] name = "tap" version = "1.0.1" @@ -6384,12 +6188,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "triomphe" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ee9bd9239c339d714d657fac840c6d2a4f9c45f4f9ec7b0975113458be78db" - [[package]] name = "try-lock" version = "0.2.3" @@ -6646,12 +6444,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8e76fae08f03f96e166d2dfda232190638c10e0383841252416f9cfe2ae60e6" -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" version = "2.3.2" @@ -6780,15 +6572,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "which" version = "4.3.0" diff --git a/benchmarks/src/bin/nyc-taxi.rs b/benchmarks/src/bin/nyc-taxi.rs index bde094183789..caac625ef4b4 100644 --- a/benchmarks/src/bin/nyc-taxi.rs +++ b/benchmarks/src/bin/nyc-taxi.rs @@ -4,32 +4,24 @@ #![feature(once_cell)] #![allow(clippy::print_stdout)] -use std::{ - collections::HashMap, - path::{Path, PathBuf}, - sync::Arc, - time::Instant, -}; - -use arrow::{ - array::{ArrayRef, PrimitiveArray, StringArray, TimestampNanosecondArray}, - datatypes::{DataType, Float64Type, Int64Type}, - record_batch::RecordBatch, -}; +use std::collections::HashMap; +use std::path::{Path, PathBuf}; +use std::sync::Arc; +use std::time::Instant; + +use arrow::array::{ArrayRef, PrimitiveArray, StringArray, TimestampNanosecondArray}; +use arrow::datatypes::{DataType, Float64Type, Int64Type}; +use arrow::record_batch::RecordBatch; use clap::Parser; -use client::{ - admin::Admin, - api::v1::{ - codec::InsertBatch, column::Values, insert_expr, Column, ColumnDataType, ColumnDef, - CreateExpr, InsertExpr, - }, - Client, Database, Select, -}; +use client::admin::Admin; +use client::api::v1::codec::InsertBatch; +use client::api::v1::column::Values; +use client::api::v1::{insert_expr, Column, ColumnDataType, ColumnDef, CreateExpr, InsertExpr}; +use client::{Client, Database, Select}; use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; -use parquet::{ - arrow::{ArrowReader, ParquetFileArrowReader}, - file::{reader::FileReader, serialized_reader::SerializedFileReader}, -}; +use parquet::arrow::{ArrowReader, ParquetFileArrowReader}; +use parquet::file::reader::FileReader; +use parquet::file::serialized_reader::SerializedFileReader; use tokio::task::JoinSet; const DATABASE_NAME: &str = "greptime"; diff --git a/rustfmt.toml b/rustfmt.toml index f3dae047e27f..64d94def2665 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,3 +1,2 @@ group_imports = "StdExternalCrate" - - +imports_granularity = "Module" diff --git a/src/api/src/helper.rs b/src/api/src/helper.rs index 7c1a4a9b6cf4..7958eb2c1e89 100644 --- a/src/api/src/helper.rs +++ b/src/api/src/helper.rs @@ -7,8 +7,7 @@ use snafu::prelude::*; use crate::error::{self, Result}; use crate::v1::column::Values; -use crate::v1::Column; -use crate::v1::ColumnDataType; +use crate::v1::{Column, ColumnDataType}; #[derive(Debug, PartialEq, Eq)] pub struct ColumnDataTypeWrapper(ColumnDataType); diff --git a/src/api/src/result.rs b/src/api/src/result.rs index 34b65470d702..725ccce68c7f 100644 --- a/src/api/src/result.rs +++ b/src/api/src/result.rs @@ -1,8 +1,9 @@ use common_error::prelude::ErrorExt; +use crate::v1::codec::SelectResult; use crate::v1::{ - admin_result, codec::SelectResult, object_result, AdminResult, MutateResult, ObjectResult, - ResultHeader, SelectResult as SelectResultRaw, + admin_result, object_result, AdminResult, MutateResult, ObjectResult, ResultHeader, + SelectResult as SelectResultRaw, }; pub const PROTOCOL_VERSION: u32 = 1; diff --git a/src/api/src/serde.rs b/src/api/src/serde.rs index d97ed88dffbf..d485c7cef83e 100644 --- a/src/api/src/serde.rs +++ b/src/api/src/serde.rs @@ -1,10 +1,7 @@ pub use prost::DecodeError; use prost::Message; -use crate::v1::codec::InsertBatch; -use crate::v1::codec::PhysicalPlanNode; -use crate::v1::codec::RegionNumber; -use crate::v1::codec::SelectResult; +use crate::v1::codec::{InsertBatch, PhysicalPlanNode, RegionNumber, SelectResult}; use crate::v1::meta::TableRouteValue; macro_rules! impl_convert_with_bytes { @@ -36,8 +33,7 @@ mod tests { use std::ops::Deref; use crate::v1::codec::*; - use crate::v1::column; - use crate::v1::Column; + use crate::v1::{column, Column}; const SEMANTIC_TAG: i32 = 0; diff --git a/src/api/src/v1/meta.rs b/src/api/src/v1/meta.rs index 087c00be8808..fd74246a4d7a 100644 --- a/src/api/src/v1/meta.rs +++ b/src/api/src/v1/meta.rs @@ -1,8 +1,7 @@ tonic::include_proto!("greptime.v1.meta"); use std::collections::HashMap; -use std::hash::Hash; -use std::hash::Hasher; +use std::hash::{Hash, Hasher}; pub const PROTOCOL_VERSION: u64 = 1; diff --git a/src/catalog/src/local/manager.rs b/src/catalog/src/local/manager.rs index 6179b5530e30..f2f09d81aab3 100644 --- a/src/catalog/src/local/manager.rs +++ b/src/catalog/src/local/manager.rs @@ -20,10 +20,10 @@ use table::table::TableIdProvider; use table::TableRef; use crate::error::{ - CatalogNotFoundSnafu, IllegalManagerStateSnafu, OpenTableSnafu, SchemaNotFoundSnafu, - SystemCatalogSnafu, SystemCatalogTypeMismatchSnafu, TableExistsSnafu, TableNotFoundSnafu, + CatalogNotFoundSnafu, IllegalManagerStateSnafu, OpenTableSnafu, ReadSystemCatalogSnafu, Result, + SchemaExistsSnafu, SchemaNotFoundSnafu, SystemCatalogSnafu, SystemCatalogTypeMismatchSnafu, + TableExistsSnafu, TableNotFoundSnafu, }; -use crate::error::{ReadSystemCatalogSnafu, Result, SchemaExistsSnafu}; use crate::local::memory::{MemoryCatalogManager, MemoryCatalogProvider, MemorySchemaProvider}; use crate::system::{ decode_system_catalog, Entry, SystemCatalogTable, TableEntry, ENTRY_TYPE_INDEX, KEY_INDEX, diff --git a/src/catalog/src/local/memory.rs b/src/catalog/src/local/memory.rs index 8c98ac0fbfca..65cd03506baf 100644 --- a/src/catalog/src/local/memory.rs +++ b/src/catalog/src/local/memory.rs @@ -2,8 +2,7 @@ use std::any::Any; use std::collections::hash_map::Entry; use std::collections::HashMap; use std::sync::atomic::{AtomicU32, Ordering}; -use std::sync::Arc; -use std::sync::RwLock; +use std::sync::{Arc, RwLock}; use common_catalog::consts::MIN_USER_TABLE_ID; use snafu::OptionExt; diff --git a/src/catalog/src/remote/manager.rs b/src/catalog/src/remote/manager.rs index e397b607c75a..7d0ce17ec58a 100644 --- a/src/catalog/src/remote/manager.rs +++ b/src/catalog/src/remote/manager.rs @@ -22,10 +22,9 @@ use table::TableRef; use tokio::sync::Mutex; use crate::error::{ - CatalogNotFoundSnafu, CreateTableSnafu, InvalidCatalogValueSnafu, OpenTableSnafu, - SchemaNotFoundSnafu, TableExistsSnafu, + CatalogNotFoundSnafu, CreateTableSnafu, InvalidCatalogValueSnafu, InvalidTableSchemaSnafu, + OpenTableSnafu, Result, SchemaNotFoundSnafu, TableExistsSnafu, }; -use crate::error::{InvalidTableSchemaSnafu, Result}; use crate::remote::{Kv, KvBackendRef}; use crate::{ handle_system_table_request, CatalogList, CatalogManager, CatalogProvider, CatalogProviderRef, diff --git a/src/catalog/src/system.rs b/src/catalog/src/system.rs index dff4c644c21a..3175d9b0a7bd 100644 --- a/src/catalog/src/system.rs +++ b/src/catalog/src/system.rs @@ -2,14 +2,12 @@ use std::any::Any; use std::collections::HashMap; use std::sync::Arc; -use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_catalog::consts::{ - INFORMATION_SCHEMA_NAME, SYSTEM_CATALOG_NAME, SYSTEM_CATALOG_TABLE_ID, - SYSTEM_CATALOG_TABLE_NAME, + DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME, SYSTEM_CATALOG_NAME, + SYSTEM_CATALOG_TABLE_ID, SYSTEM_CATALOG_TABLE_NAME, }; use common_query::logical_plan::Expr; -use common_query::physical_plan::PhysicalPlanRef; -use common_query::physical_plan::RuntimeEnv; +use common_query::physical_plan::{PhysicalPlanRef, RuntimeEnv}; use common_recordbatch::SendableRecordBatchStream; use common_telemetry::debug; use common_time::timestamp::Timestamp; diff --git a/src/client/examples/insert.rs b/src/client/examples/insert.rs index 13850ebc11ac..9e813e3759c2 100644 --- a/src/client/examples/insert.rs +++ b/src/client/examples/insert.rs @@ -1,6 +1,7 @@ use std::collections::HashMap; -use api::v1::{codec::InsertBatch, *}; +use api::v1::codec::InsertBatch; +use api::v1::*; use client::{Client, Database}; fn main() { tracing::subscriber::set_global_default(tracing_subscriber::FmtSubscriber::builder().finish()) diff --git a/src/client/examples/logical.rs b/src/client/examples/logical.rs index 843cb0f8a8a3..cd105ded5a8c 100644 --- a/src/client/examples/logical.rs +++ b/src/client/examples/logical.rs @@ -1,12 +1,11 @@ use api::v1::{ColumnDataType, ColumnDef, CreateExpr}; -use client::{admin::Admin, Client, Database}; +use client::admin::Admin; +use client::{Client, Database}; use prost_09::Message; -use substrait_proto::protobuf::{ - plan_rel::RelType as PlanRelType, - read_rel::{NamedTable, ReadType}, - rel::RelType, - PlanRel, ReadRel, Rel, -}; +use substrait_proto::protobuf::plan_rel::RelType as PlanRelType; +use substrait_proto::protobuf::read_rel::{NamedTable, ReadType}; +use substrait_proto::protobuf::rel::RelType; +use substrait_proto::protobuf::{PlanRel, ReadRel, Rel}; use tracing::{event, Level}; fn main() { diff --git a/src/client/examples/physical.rs b/src/client/examples/physical.rs index 1e866fd80fbc..a6263487dc15 100644 --- a/src/client/examples/physical.rs +++ b/src/client/examples/physical.rs @@ -2,9 +2,9 @@ use std::sync::Arc; use client::{Client, Database}; use common_grpc::MockExecution; -use datafusion::physical_plan::{ - expressions::Column, projection::ProjectionExec, ExecutionPlan, PhysicalExpr, -}; +use datafusion::physical_plan::expressions::Column; +use datafusion::physical_plan::projection::ProjectionExec; +use datafusion::physical_plan::{ExecutionPlan, PhysicalExpr}; use tracing::{event, Level}; fn main() { diff --git a/src/client/src/admin.rs b/src/client/src/admin.rs index a73d546d85fe..d0784058a04d 100644 --- a/src/client/src/admin.rs +++ b/src/client/src/admin.rs @@ -4,9 +4,7 @@ use common_query::Output; use snafu::prelude::*; use crate::database::PROTOCOL_VERSION; -use crate::error; -use crate::Client; -use crate::Result; +use crate::{error, Client, Result}; #[derive(Clone, Debug)] pub struct Admin { diff --git a/src/client/src/client.rs b/src/client/src/client.rs index 8913f6139c3d..a43334bb455e 100644 --- a/src/client/src/client.rs +++ b/src/client/src/client.rs @@ -4,14 +4,11 @@ use api::v1::greptime_client::GreptimeClient; use api::v1::*; use common_grpc::channel_manager::ChannelManager; use parking_lot::RwLock; -use snafu::OptionExt; -use snafu::ResultExt; +use snafu::{OptionExt, ResultExt}; use tonic::transport::Channel; -use crate::error; -use crate::load_balance::LoadBalance; -use crate::load_balance::Loadbalancer; -use crate::Result; +use crate::load_balance::{LoadBalance, Loadbalancer}; +use crate::{error, Result}; #[derive(Clone, Debug, Default)] pub struct Client { diff --git a/src/client/src/database.rs b/src/client/src/database.rs index 2a49babbc23d..d8c4fc913cd9 100644 --- a/src/client/src/database.rs +++ b/src/client/src/database.rs @@ -7,8 +7,7 @@ use api::v1::{ SelectExpr, }; use common_error::status_code::StatusCode; -use common_grpc::AsExcutionPlan; -use common_grpc::DefaultAsPlanImpl; +use common_grpc::{AsExcutionPlan, DefaultAsPlanImpl}; use common_insert::column_to_vector; use common_query::Output; use common_recordbatch::{RecordBatch, RecordBatches}; @@ -17,12 +16,10 @@ use datatypes::prelude::*; use datatypes::schema::{ColumnSchema, Schema}; use snafu::{ensure, OptionExt, ResultExt}; -use crate::error; -use crate::error::ColumnToVectorSnafu; -use crate::{ - error::{ConvertSchemaSnafu, DatanodeSnafu, DecodeSelectSnafu, EncodePhysicalSnafu}, - Client, Result, +use crate::error::{ + ColumnToVectorSnafu, ConvertSchemaSnafu, DatanodeSnafu, DecodeSelectSnafu, EncodePhysicalSnafu, }; +use crate::{error, Client, Result}; pub const PROTOCOL_VERSION: u32 = 1; diff --git a/src/client/src/lib.rs b/src/client/src/lib.rs index c3d02a3c6bd1..3ce630a301a4 100644 --- a/src/client/src/lib.rs +++ b/src/client/src/lib.rs @@ -6,8 +6,6 @@ pub mod load_balance; pub use api; -pub use self::{ - client::Client, - database::{Database, ObjectResult, Select}, - error::{Error, Result}, -}; +pub use self::client::Client; +pub use self::database::{Database, ObjectResult, Select}; +pub use self::error::{Error, Result}; diff --git a/src/cmd/src/bin/greptime.rs b/src/cmd/src/bin/greptime.rs index 8615bcd6e45a..b173af1d83d4 100644 --- a/src/cmd/src/bin/greptime.rs +++ b/src/cmd/src/bin/greptime.rs @@ -2,11 +2,8 @@ use std::fmt; use clap::Parser; use cmd::error::Result; -use cmd::frontend; -use cmd::metasrv; -use cmd::{datanode, standalone}; -use common_telemetry::logging::error; -use common_telemetry::logging::info; +use cmd::{datanode, frontend, metasrv, standalone}; +use common_telemetry::logging::{error, info}; #[derive(Parser)] #[clap(name = "greptimedb")] diff --git a/src/cmd/src/metasrv.rs b/src/cmd/src/metasrv.rs index 0e98b5419aac..9c9f3b62b5ae 100644 --- a/src/cmd/src/metasrv.rs +++ b/src/cmd/src/metasrv.rs @@ -4,10 +4,8 @@ use meta_srv::bootstrap; use meta_srv::metasrv::MetaSrvOptions; use snafu::ResultExt; -use crate::error; -use crate::error::Error; -use crate::error::Result; -use crate::toml_loader; +use crate::error::{Error, Result}; +use crate::{error, toml_loader}; #[derive(Parser)] pub struct Command { diff --git a/src/common/error/src/format.rs b/src/common/error/src/format.rs index b79c85bb2cd6..74e3c6bd5d70 100644 --- a/src/common/error/src/format.rs +++ b/src/common/error/src/format.rs @@ -32,7 +32,8 @@ impl<'a, E: ErrorExt + ?Sized> fmt::Debug for DebugFormat<'a, E> { mod tests { use std::any::Any; - use snafu::{prelude::*, Backtrace, GenerateImplicitData}; + use snafu::prelude::*; + use snafu::{Backtrace, GenerateImplicitData}; use super::*; diff --git a/src/common/error/src/lib.rs b/src/common/error/src/lib.rs index 7401f5163436..f65f8190a52d 100644 --- a/src/common/error/src/lib.rs +++ b/src/common/error/src/lib.rs @@ -4,7 +4,8 @@ pub mod mock; pub mod status_code; pub mod prelude { - pub use snafu::{prelude::*, Backtrace, ErrorCompat}; + pub use snafu::prelude::*; + pub use snafu::{Backtrace, ErrorCompat}; pub use crate::ext::{BoxedError, ErrorExt}; pub use crate::format::DebugFormat; diff --git a/src/common/function-macro/tests/test_derive.rs b/src/common/function-macro/tests/test_derive.rs index 58199aa24c99..08c57c24032b 100644 --- a/src/common/function-macro/tests/test_derive.rs +++ b/src/common/function-macro/tests/test_derive.rs @@ -1,5 +1,4 @@ -use common_function_macro::as_aggr_func_creator; -use common_function_macro::AggrFuncTypeStore; +use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore}; use static_assertions::{assert_fields, assert_impl_all}; #[as_aggr_func_creator] diff --git a/src/common/function/src/scalars/aggregate/argmax.rs b/src/common/function/src/scalars/aggregate/argmax.rs index 390591c676cb..dd5e2d275ffc 100644 --- a/src/common/function/src/scalars/aggregate/argmax.rs +++ b/src/common/function/src/scalars/aggregate/argmax.rs @@ -5,8 +5,9 @@ use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore}; use common_query::error::{BadAccumulatorImplSnafu, CreateAccumulatorSnafu, Result}; use common_query::logical_plan::{Accumulator, AggregateFunctionCreator}; use common_query::prelude::*; +use datatypes::prelude::*; use datatypes::vectors::ConstantVector; -use datatypes::{prelude::*, with_match_primitive_type_id}; +use datatypes::with_match_primitive_type_id; use snafu::ensure; // https://numpy.org/doc/stable/reference/generated/numpy.argmax.html diff --git a/src/common/function/src/scalars/aggregate/argmin.rs b/src/common/function/src/scalars/aggregate/argmin.rs index a3d8457ce8cd..61ccecc3cc87 100644 --- a/src/common/function/src/scalars/aggregate/argmin.rs +++ b/src/common/function/src/scalars/aggregate/argmin.rs @@ -5,8 +5,9 @@ use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore}; use common_query::error::{BadAccumulatorImplSnafu, CreateAccumulatorSnafu, Result}; use common_query::logical_plan::{Accumulator, AggregateFunctionCreator}; use common_query::prelude::*; +use datatypes::prelude::*; use datatypes::vectors::ConstantVector; -use datatypes::{prelude::*, with_match_primitive_type_id}; +use datatypes::with_match_primitive_type_id; use snafu::ensure; // // https://numpy.org/doc/stable/reference/generated/numpy.argmin.html diff --git a/src/common/function/src/scalars/aggregate/diff.rs b/src/common/function/src/scalars/aggregate/diff.rs index e43c66b4e4b0..7fb10a01ce05 100644 --- a/src/common/function/src/scalars/aggregate/diff.rs +++ b/src/common/function/src/scalars/aggregate/diff.rs @@ -7,10 +7,11 @@ use common_query::error::{ }; use common_query::logical_plan::{Accumulator, AggregateFunctionCreator}; use common_query::prelude::*; +use datatypes::prelude::*; use datatypes::types::PrimitiveType; use datatypes::value::ListValue; use datatypes::vectors::{ConstantVector, ListVector}; -use datatypes::{prelude::*, with_match_primitive_type_id}; +use datatypes::with_match_primitive_type_id; use num_traits::AsPrimitive; use snafu::{ensure, OptionExt, ResultExt}; diff --git a/src/common/function/src/scalars/aggregate/mean.rs b/src/common/function/src/scalars/aggregate/mean.rs index f4cf0839aef8..4f37a49d4e7b 100644 --- a/src/common/function/src/scalars/aggregate/mean.rs +++ b/src/common/function/src/scalars/aggregate/mean.rs @@ -7,8 +7,9 @@ use common_query::error::{ }; use common_query::logical_plan::{Accumulator, AggregateFunctionCreator}; use common_query::prelude::*; +use datatypes::prelude::*; use datatypes::vectors::{ConstantVector, Float64Vector, UInt64Vector}; -use datatypes::{prelude::*, with_match_primitive_type_id}; +use datatypes::with_match_primitive_type_id; use num_traits::AsPrimitive; use snafu::{ensure, OptionExt}; diff --git a/src/common/function/src/scalars/aggregate/polyval.rs b/src/common/function/src/scalars/aggregate/polyval.rs index 5a87c49d8593..aa9f2e35ebde 100644 --- a/src/common/function/src/scalars/aggregate/polyval.rs +++ b/src/common/function/src/scalars/aggregate/polyval.rs @@ -8,10 +8,11 @@ use common_query::error::{ }; use common_query::logical_plan::{Accumulator, AggregateFunctionCreator}; use common_query::prelude::*; +use datatypes::prelude::*; use datatypes::types::PrimitiveType; use datatypes::value::ListValue; use datatypes::vectors::{ConstantVector, Int64Vector, ListVector}; -use datatypes::{prelude::*, with_match_primitive_type_id}; +use datatypes::with_match_primitive_type_id; use num_traits::AsPrimitive; use snafu::{ensure, OptionExt, ResultExt}; diff --git a/src/common/function/src/scalars/function_registry.rs b/src/common/function/src/scalars/function_registry.rs index 7e70018a7d33..a3c9d5d4a34c 100644 --- a/src/common/function/src/scalars/function_registry.rs +++ b/src/common/function/src/scalars/function_registry.rs @@ -1,7 +1,6 @@ //! functions registry use std::collections::HashMap; -use std::sync::Arc; -use std::sync::RwLock; +use std::sync::{Arc, RwLock}; use once_cell::sync::Lazy; diff --git a/src/common/function/src/scalars/numpy/clip.rs b/src/common/function/src/scalars/numpy/clip.rs index 5a57fbc7a982..63455c08310f 100644 --- a/src/common/function/src/scalars/numpy/clip.rs +++ b/src/common/function/src/scalars/numpy/clip.rs @@ -2,8 +2,7 @@ use std::fmt; use std::sync::Arc; use common_query::prelude::{Signature, Volatility}; -use datatypes::data_type::ConcreteDataType; -use datatypes::data_type::DataType; +use datatypes::data_type::{ConcreteDataType, DataType}; use datatypes::prelude::{Scalar, VectorRef}; use datatypes::with_match_primitive_type_id; use num_traits::AsPrimitive; diff --git a/src/common/function/src/scalars/numpy/interp.rs b/src/common/function/src/scalars/numpy/interp.rs index 25a34836bbe8..cacd0729150b 100644 --- a/src/common/function/src/scalars/numpy/interp.rs +++ b/src/common/function/src/scalars/numpy/interp.rs @@ -3,16 +3,12 @@ use std::sync::Arc; use arrow::array::PrimitiveArray; use arrow::compute::cast::primitive_to_primitive; use arrow::datatypes::DataType::Float64; -use datatypes::arrow; use datatypes::data_type::DataType; use datatypes::prelude::ScalarVector; use datatypes::type_id::LogicalTypeId; use datatypes::value::Value; -use datatypes::vectors::Float64Vector; -use datatypes::vectors::PrimitiveVector; -use datatypes::vectors::Vector; -use datatypes::vectors::VectorRef; -use datatypes::with_match_primitive_type_id; +use datatypes::vectors::{Float64Vector, PrimitiveVector, Vector, VectorRef}; +use datatypes::{arrow, with_match_primitive_type_id}; use snafu::{ensure, Snafu}; #[derive(Debug, Snafu)] @@ -247,10 +243,8 @@ pub fn interp(args: &[VectorRef]) -> Result { mod tests { use std::sync::Arc; - use datatypes::{ - prelude::ScalarVectorBuilder, - vectors::{Int32Vector, Int64Vector, PrimitiveVectorBuilder}, - }; + use datatypes::prelude::ScalarVectorBuilder; + use datatypes::vectors::{Int32Vector, Int64Vector, PrimitiveVectorBuilder}; use super::*; #[test] diff --git a/src/common/function/src/scalars/timestamp/from_unixtime.rs b/src/common/function/src/scalars/timestamp/from_unixtime.rs index 68cb99511455..b3a5472de1a2 100644 --- a/src/common/function/src/scalars/timestamp/from_unixtime.rs +++ b/src/common/function/src/scalars/timestamp/from_unixtime.rs @@ -9,8 +9,7 @@ use arrow::scalar::PrimitiveScalar; use common_query::error::{IntoVectorSnafu, UnsupportedInputDataTypeSnafu}; use common_query::prelude::{Signature, Volatility}; use datatypes::prelude::ConcreteDataType; -use datatypes::vectors::TimestampVector; -use datatypes::vectors::VectorRef; +use datatypes::vectors::{TimestampVector, VectorRef}; use snafu::ResultExt; use crate::error::Result; diff --git a/src/common/function/src/scalars/udf.rs b/src/common/function/src/scalars/udf.rs index 94e176728a83..cef806a985ca 100644 --- a/src/common/function/src/scalars/udf.rs +++ b/src/common/function/src/scalars/udf.rs @@ -1,9 +1,8 @@ use std::sync::Arc; use common_query::error::{ExecuteFunctionSnafu, FromScalarValueSnafu}; -use common_query::prelude::ScalarValue; use common_query::prelude::{ - ColumnarValue, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUdf, + ColumnarValue, ReturnTypeFunction, ScalarFunctionImplementation, ScalarUdf, ScalarValue, }; use datatypes::error::Error as DataTypeError; use datatypes::prelude::{ConcreteDataType, VectorHelper}; diff --git a/src/common/grpc/src/channel_manager.rs b/src/common/grpc/src/channel_manager.rs index a209bb7b109d..ffb45b10eee1 100644 --- a/src/common/grpc/src/channel_manager.rs +++ b/src/common/grpc/src/channel_manager.rs @@ -1,14 +1,11 @@ -use std::sync::atomic::AtomicUsize; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::time::Duration; use dashmap::mapref::entry::Entry; use dashmap::DashMap; use snafu::ResultExt; -use tonic::transport::Channel as InnerChannel; -use tonic::transport::Endpoint; -use tonic::transport::Uri; +use tonic::transport::{Channel as InnerChannel, Endpoint, Uri}; use tower::make::MakeConnection; use crate::error; diff --git a/src/common/grpc/src/error.rs b/src/common/grpc/src/error.rs index 55489b1468b3..eb62ac7f2a30 100644 --- a/src/common/grpc/src/error.rs +++ b/src/common/grpc/src/error.rs @@ -84,8 +84,7 @@ impl ErrorExt for Error { #[cfg(test)] mod tests { - use snafu::OptionExt; - use snafu::ResultExt; + use snafu::{OptionExt, ResultExt}; use super::*; diff --git a/src/common/grpc/src/lib.rs b/src/common/grpc/src/lib.rs index 48abde31392a..62a2f53ecd15 100644 --- a/src/common/grpc/src/lib.rs +++ b/src/common/grpc/src/lib.rs @@ -4,7 +4,5 @@ pub mod physical; pub mod writer; pub use error::Error; -pub use physical::{ - plan::{DefaultAsPlanImpl, MockExecution}, - AsExcutionPlan, -}; +pub use physical::plan::{DefaultAsPlanImpl, MockExecution}; +pub use physical::AsExcutionPlan; diff --git a/src/common/grpc/src/physical.rs b/src/common/grpc/src/physical.rs index 2745cadc328d..fc3c6a0061c9 100644 --- a/src/common/grpc/src/physical.rs +++ b/src/common/grpc/src/physical.rs @@ -1,7 +1,8 @@ mod expr; pub mod plan; -use std::{result::Result, sync::Arc}; +use std::result::Result; +use std::sync::Arc; use datafusion::physical_plan::ExecutionPlan; diff --git a/src/common/grpc/src/physical/expr.rs b/src/common/grpc/src/physical/expr.rs index 79e75ff6e26d..e6dfe70681fa 100644 --- a/src/common/grpc/src/physical/expr.rs +++ b/src/common/grpc/src/physical/expr.rs @@ -1,7 +1,9 @@ -use std::{result::Result, sync::Arc}; +use std::result::Result; +use std::sync::Arc; use api::v1::codec; -use datafusion::physical_plan::{expressions::Column as DfColumn, PhysicalExpr as DfPhysicalExpr}; +use datafusion::physical_plan::expressions::Column as DfColumn; +use datafusion::physical_plan::PhysicalExpr as DfPhysicalExpr; use snafu::OptionExt; use crate::error::{EmptyPhysicalExprSnafu, Error, UnsupportedDfExprSnafu}; @@ -52,8 +54,10 @@ pub(crate) fn parse_df_physical_expr( mod tests { use std::sync::Arc; - use api::v1::codec::{physical_expr_node::ExprType::Column, PhysicalColumn, PhysicalExprNode}; - use datafusion::physical_plan::{expressions::Column as DfColumn, PhysicalExpr}; + use api::v1::codec::physical_expr_node::ExprType::Column; + use api::v1::codec::{PhysicalColumn, PhysicalExprNode}; + use datafusion::physical_plan::expressions::Column as DfColumn; + use datafusion::physical_plan::PhysicalExpr; use crate::physical::expr::{parse_df_physical_expr, parse_grpc_physical_expr}; diff --git a/src/common/grpc/src/physical/plan.rs b/src/common/grpc/src/physical/plan.rs index 6914c833dc0a..885c7237d644 100644 --- a/src/common/grpc/src/physical/plan.rs +++ b/src/common/grpc/src/physical/plan.rs @@ -1,22 +1,20 @@ -use std::{ops::Deref, result::Result, sync::Arc}; - -use api::v1::codec::{ - physical_plan_node::PhysicalPlanType, MockInputExecNode, PhysicalPlanNode, ProjectionExecNode, -}; -use arrow::{ - array::{PrimitiveArray, Utf8Array}, - datatypes::{DataType, Field, Schema}, -}; +use std::ops::Deref; +use std::result::Result; +use std::sync::Arc; + +use api::v1::codec::physical_plan_node::PhysicalPlanType; +use api::v1::codec::{MockInputExecNode, PhysicalPlanNode, ProjectionExecNode}; +use arrow::array::{PrimitiveArray, Utf8Array}; +use arrow::datatypes::{DataType, Field, Schema}; use async_trait::async_trait; -use datafusion::{ - execution::runtime_env::RuntimeEnv, - field_util::SchemaExt, - physical_plan::{ - memory::MemoryStream, projection::ProjectionExec, ExecutionPlan, PhysicalExpr, - SendableRecordBatchStream, Statistics, - }, - record_batch::RecordBatch, +use datafusion::execution::runtime_env::RuntimeEnv; +use datafusion::field_util::SchemaExt; +use datafusion::physical_plan::memory::MemoryStream; +use datafusion::physical_plan::projection::ProjectionExec; +use datafusion::physical_plan::{ + ExecutionPlan, PhysicalExpr, SendableRecordBatchStream, Statistics, }; +use datafusion::record_batch::RecordBatch; use snafu::{OptionExt, ResultExt}; use crate::error::{ @@ -211,12 +209,11 @@ mod tests { use std::sync::Arc; use api::v1::codec::PhysicalPlanNode; - use datafusion::physical_plan::{expressions::Column, projection::ProjectionExec}; + use datafusion::physical_plan::expressions::Column; + use datafusion::physical_plan::projection::ProjectionExec; - use crate::physical::{ - plan::{DefaultAsPlanImpl, MockExecution}, - {AsExcutionPlan, ExecutionPlanRef}, - }; + use crate::physical::plan::{DefaultAsPlanImpl, MockExecution}; + use crate::physical::{AsExcutionPlan, ExecutionPlanRef}; #[test] fn test_convert_df_projection_with_bytes() { diff --git a/src/common/grpc/src/writer.rs b/src/common/grpc/src/writer.rs index 904b710fde2b..364c9a01822d 100644 --- a/src/common/grpc/src/writer.rs +++ b/src/common/grpc/src/writer.rs @@ -1,10 +1,8 @@ use std::collections::HashMap; -use api::v1::{ - codec::InsertBatch, - column::{SemanticType, Values}, - Column, ColumnDataType, -}; +use api::v1::codec::InsertBatch; +use api::v1::column::{SemanticType, Values}; +use api::v1::{Column, ColumnDataType}; use common_base::BitVec; use snafu::ensure; @@ -232,7 +230,8 @@ pub enum Precision { #[cfg(test)] mod tests { - use api::v1::{column::SemanticType, ColumnDataType}; + use api::v1::column::SemanticType; + use api::v1::ColumnDataType; use common_base::BitVec; use super::LinesWriter; diff --git a/src/common/insert/src/insert.rs b/src/common/insert/src/insert.rs index 57247b213ac5..173d9121e0fc 100644 --- a/src/common/insert/src/insert.rs +++ b/src/common/insert/src/insert.rs @@ -1,30 +1,24 @@ -use std::collections::HashSet; -use std::{ - collections::{hash_map::Entry, HashMap}, - ops::Deref, - sync::Arc, -}; +use std::collections::hash_map::Entry; +use std::collections::{HashMap, HashSet}; +use std::ops::Deref; +use std::sync::Arc; use api::helper::ColumnDataTypeWrapper; -use api::v1::{ - codec::InsertBatch, - column::{SemanticType, Values}, - AddColumns, Column, ColumnDataType, -}; -use api::v1::{AddColumn, ColumnDef, CreateExpr}; +use api::v1::codec::InsertBatch; +use api::v1::column::{SemanticType, Values}; +use api::v1::{AddColumn, AddColumns, Column, ColumnDataType, ColumnDef, CreateExpr}; use common_base::BitVec; use common_time::timestamp::Timestamp; -use common_time::Date; -use common_time::DateTime; +use common_time::{Date, DateTime}; +use datatypes::data_type::ConcreteDataType; use datatypes::prelude::{ValueRef, VectorRef}; use datatypes::schema::SchemaRef; -use datatypes::{data_type::ConcreteDataType, value::Value, vectors::VectorBuilder}; +use datatypes::value::Value; +use datatypes::vectors::VectorBuilder; use snafu::{ensure, OptionExt, ResultExt}; use table::metadata::TableId; -use table::{ - requests::{AddColumnRequest, AlterKind, AlterTableRequest, InsertRequest}, - Table, -}; +use table::requests::{AddColumnRequest, AlterKind, AlterTableRequest, InsertRequest}; +use table::Table; use crate::error::{ ColumnDataTypeSnafu, ColumnNotFoundSnafu, CreateVectorSnafu, DecodeInsertSnafu, @@ -455,20 +449,16 @@ mod tests { use std::sync::Arc; use api::helper::ColumnDataTypeWrapper; - use api::v1::{ - codec::InsertBatch, - column::{self, SemanticType, Values}, - insert_expr, Column, ColumnDataType, - }; + use api::v1::codec::InsertBatch; + use api::v1::column::{self, SemanticType, Values}; + use api::v1::{insert_expr, Column, ColumnDataType}; use common_base::BitVec; use common_query::physical_plan::PhysicalPlanRef; use common_query::prelude::Expr; use common_time::timestamp::Timestamp; - use datatypes::{ - data_type::ConcreteDataType, - schema::{ColumnSchema, SchemaBuilder, SchemaRef}, - value::Value, - }; + use datatypes::data_type::ConcreteDataType; + use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef}; + use datatypes::value::Value; use snafu::ResultExt; use table::error::Result as TableResult; use table::metadata::TableInfoRef; diff --git a/src/common/query/src/columnar_value.rs b/src/common/query/src/columnar_value.rs index 8f82b62bef58..2e645979c4c3 100644 --- a/src/common/query/src/columnar_value.rs +++ b/src/common/query/src/columnar_value.rs @@ -1,7 +1,6 @@ use datafusion_expr::ColumnarValue as DfColumnarValue; use datatypes::prelude::ConcreteDataType; -use datatypes::vectors::Helper; -use datatypes::vectors::VectorRef; +use datatypes::vectors::{Helper, VectorRef}; use snafu::ResultExt; use crate::error::{self, IntoVectorSnafu, Result}; diff --git a/src/common/query/src/function.rs b/src/common/query/src/function.rs index 7f123a3fdf01..bcb4170afffd 100644 --- a/src/common/query/src/function.rs +++ b/src/common/query/src/function.rs @@ -102,8 +102,7 @@ pub fn to_df_return_type(func: ReturnTypeFunction) -> DfReturnTypeFunction { mod tests { use std::sync::Arc; - use datatypes::prelude::ScalarVector; - use datatypes::prelude::Vector; + use datatypes::prelude::{ScalarVector, Vector}; use datatypes::vectors::BooleanVector; use super::*; diff --git a/src/common/query/src/logical_plan/accumulator.rs b/src/common/query/src/logical_plan/accumulator.rs index d0c60902efca..4247b61c9798 100644 --- a/src/common/query/src/logical_plan/accumulator.rs +++ b/src/common/query/src/logical_plan/accumulator.rs @@ -9,8 +9,7 @@ use datafusion_common::Result as DfResult; use datafusion_expr::Accumulator as DfAccumulator; use datatypes::prelude::*; use datatypes::value::ListValue; -use datatypes::vectors::Helper as VectorHelper; -use datatypes::vectors::VectorRef; +use datatypes::vectors::{Helper as VectorHelper, VectorRef}; use snafu::ResultExt; use crate::error::{self, Error, FromScalarValueSnafu, IntoVectorSnafu, Result}; diff --git a/src/common/query/src/logical_plan/mod.rs b/src/common/query/src/logical_plan/mod.rs index c19ca49f54d4..36777ce0c326 100644 --- a/src/common/query/src/logical_plan/mod.rs +++ b/src/common/query/src/logical_plan/mod.rs @@ -60,12 +60,12 @@ mod tests { use arrow::array::BooleanArray; use arrow::datatypes::DataType; - use datafusion_expr::ColumnarValue as DfColumnarValue; - use datafusion_expr::ScalarUDF as DfScalarUDF; - use datafusion_expr::TypeSignature as DfTypeSignature; + use datafusion_expr::{ + ColumnarValue as DfColumnarValue, ScalarUDF as DfScalarUDF, + TypeSignature as DfTypeSignature, + }; use datatypes::prelude::*; - use datatypes::vectors::BooleanVector; - use datatypes::vectors::VectorRef; + use datatypes::vectors::{BooleanVector, VectorRef}; use super::*; use crate::error::Result; diff --git a/src/common/query/src/logical_plan/udaf.rs b/src/common/query/src/logical_plan/udaf.rs index a4e8d867436a..9761fb470afa 100644 --- a/src/common/query/src/logical_plan/udaf.rs +++ b/src/common/query/src/logical_plan/udaf.rs @@ -6,9 +6,10 @@ use std::fmt::{self, Debug, Formatter}; use std::sync::Arc; use arrow::datatypes::DataType as ArrowDataType; -use datafusion_expr::AccumulatorFunctionImplementation as DfAccumulatorFunctionImplementation; -use datafusion_expr::AggregateUDF as DfAggregateUdf; -use datafusion_expr::StateTypeFunction as DfStateTypeFunction; +use datafusion_expr::{ + AccumulatorFunctionImplementation as DfAccumulatorFunctionImplementation, + AggregateUDF as DfAggregateUdf, StateTypeFunction as DfStateTypeFunction, +}; use datatypes::prelude::*; use crate::function::{ diff --git a/src/common/query/src/logical_plan/udf.rs b/src/common/query/src/logical_plan/udf.rs index 9ba40f69a357..dbd0926243bf 100644 --- a/src/common/query/src/logical_plan/udf.rs +++ b/src/common/query/src/logical_plan/udf.rs @@ -1,8 +1,7 @@ //! Udf module contains foundational types that are used to represent UDFs. //! It's modifed from datafusion. use std::fmt; -use std::fmt::Debug; -use std::fmt::Formatter; +use std::fmt::{Debug, Formatter}; use std::sync::Arc; use datafusion_expr::{ diff --git a/src/common/query/src/physical_plan.rs b/src/common/query/src/physical_plan.rs index 2e7972e903b1..a1ebda8083af 100644 --- a/src/common/query/src/physical_plan.rs +++ b/src/common/query/src/physical_plan.rs @@ -4,8 +4,7 @@ use std::sync::Arc; use async_trait::async_trait; use common_recordbatch::adapter::{DfRecordBatchStreamAdapter, RecordBatchStreamAdapter}; -use common_recordbatch::DfSendableRecordBatchStream; -use common_recordbatch::SendableRecordBatchStream; +use common_recordbatch::{DfSendableRecordBatchStream, SendableRecordBatchStream}; use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef; use datafusion::error::Result as DfResult; pub use datafusion::execution::runtime_env::RuntimeEnv; diff --git a/src/common/query/src/prelude.rs b/src/common/query/src/prelude.rs index 709457e393e0..4ca737456bbc 100644 --- a/src/common/query/src/prelude.rs +++ b/src/common/query/src/prelude.rs @@ -2,8 +2,5 @@ pub use datafusion_common::ScalarValue; pub use crate::columnar_value::ColumnarValue; pub use crate::function::*; -pub use crate::logical_plan::create_udf; -pub use crate::logical_plan::AggregateFunction; -pub use crate::logical_plan::Expr; -pub use crate::logical_plan::ScalarUdf; +pub use crate::logical_plan::{create_udf, AggregateFunction, Expr, ScalarUdf}; pub use crate::signature::{Signature, TypeSignature, Volatility}; diff --git a/src/common/recordbatch/src/adapter.rs b/src/common/recordbatch/src/adapter.rs index 18bcd7f848c3..afbc79d9e6ed 100644 --- a/src/common/recordbatch/src/adapter.rs +++ b/src/common/recordbatch/src/adapter.rs @@ -5,14 +5,14 @@ use std::task::{Context, Poll}; use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef; use datafusion::physical_plan::RecordBatchStream as DfRecordBatchStream; use datafusion_common::record_batch::RecordBatch as DfRecordBatch; -use datatypes::arrow::error::ArrowError; -use datatypes::arrow::error::Result as ArrowResult; +use datatypes::arrow::error::{ArrowError, Result as ArrowResult}; use datatypes::schema::{Schema, SchemaRef}; use snafu::ResultExt; use crate::error::{self, Result}; -use crate::DfSendableRecordBatchStream; -use crate::{RecordBatch, RecordBatchStream, SendableRecordBatchStream, Stream}; +use crate::{ + DfSendableRecordBatchStream, RecordBatch, RecordBatchStream, SendableRecordBatchStream, Stream, +}; /// Greptime SendableRecordBatchStream -> DataFusion RecordBatchStream pub struct DfRecordBatchStreamAdapter { diff --git a/src/common/recordbatch/src/util.rs b/src/common/recordbatch/src/util.rs index 8a030289c57e..8a146be1c0e9 100644 --- a/src/common/recordbatch/src/util.rs +++ b/src/common/recordbatch/src/util.rs @@ -1,6 +1,7 @@ use futures::TryStreamExt; -use crate::{error::Result, RecordBatch, SendableRecordBatchStream}; +use crate::error::Result; +use crate::{RecordBatch, SendableRecordBatchStream}; pub async fn collect(stream: SendableRecordBatchStream) -> Result> { stream.try_collect::>().await @@ -16,8 +17,7 @@ mod tests { use datafusion_common::record_batch::RecordBatch as DfRecordBatch; use datatypes::arrow::array::UInt32Array; use datatypes::arrow::datatypes::{DataType, Field, Schema as ArrowSchema}; - use datatypes::schema::Schema; - use datatypes::schema::SchemaRef; + use datatypes::schema::{Schema, SchemaRef}; use futures::task::{Context, Poll}; use futures::Stream; diff --git a/src/common/runtime/src/runtime.rs b/src/common/runtime/src/runtime.rs index 9c226bd2f997..97949494e0d0 100644 --- a/src/common/runtime/src/runtime.rs +++ b/src/common/runtime/src/runtime.rs @@ -1,6 +1,7 @@ +use std::future::Future; use std::sync::Arc; use std::thread; -use std::{future::Future, time::Duration}; +use std::time::Duration; use metrics::{decrement_gauge, increment_gauge}; use snafu::ResultExt; @@ -165,7 +166,9 @@ fn on_thread_unpark(thread_name: String) -> impl Fn() + 'static { #[cfg(test)] mod tests { - use std::{sync::Arc, thread, time::Duration}; + use std::sync::Arc; + use std::thread; + use std::time::Duration; use common_telemetry::metric; use tokio::sync::oneshot; diff --git a/src/common/substrait/src/df_logical.rs b/src/common/substrait/src/df_logical.rs index 45adbb748c98..b991004ecd09 100644 --- a/src/common/substrait/src/df_logical.rs +++ b/src/common/substrait/src/df_logical.rs @@ -7,21 +7,17 @@ use datafusion::datasource::TableProvider; use datafusion::logical_plan::{LogicalPlan, TableScan, ToDFSchema}; use datafusion::physical_plan::project_schema; use prost::Message; -use snafu::ensure; -use snafu::{OptionExt, ResultExt}; +use snafu::{ensure, OptionExt, ResultExt}; use substrait_proto::protobuf::expression::mask_expression::{StructItem, StructSelect}; use substrait_proto::protobuf::expression::MaskExpression; use substrait_proto::protobuf::plan_rel::RelType as PlanRelType; use substrait_proto::protobuf::read_rel::{NamedTable, ReadType}; use substrait_proto::protobuf::rel::RelType; -use substrait_proto::protobuf::PlanRel; -use substrait_proto::protobuf::ReadRel; -use substrait_proto::protobuf::Rel; +use substrait_proto::protobuf::{PlanRel, ReadRel, Rel}; use table::table::adapter::DfTableProviderAdapter; -use crate::error::Error; use crate::error::{ - DFInternalSnafu, DecodeRelSnafu, EmptyPlanSnafu, EncodeRelSnafu, InternalSnafu, + DFInternalSnafu, DecodeRelSnafu, EmptyPlanSnafu, EncodeRelSnafu, Error, InternalSnafu, InvalidParametersSnafu, MissingFieldSnafu, SchemaNotMatchSnafu, TableNotFoundSnafu, UnknownPlanSnafu, UnsupportedExprSnafu, UnsupportedPlanSnafu, }; @@ -334,15 +330,13 @@ impl DFLogicalSubstraitConvertor { #[cfg(test)] mod test { - use catalog::local::LocalCatalogManager; - use catalog::{ - local::{MemoryCatalogProvider, MemorySchemaProvider}, - CatalogList, CatalogProvider, RegisterTableRequest, - }; + use catalog::local::{LocalCatalogManager, MemoryCatalogProvider, MemorySchemaProvider}; + use catalog::{CatalogList, CatalogProvider, RegisterTableRequest}; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use datafusion::logical_plan::DFSchema; use datatypes::schema::Schema; - use table::{requests::CreateTableRequest, test_util::EmptyTable, test_util::MockTableEngine}; + use table::requests::CreateTableRequest; + use table::test_util::{EmptyTable, MockTableEngine}; use super::*; use crate::schema::test::supported_types; diff --git a/src/common/substrait/src/types.rs b/src/common/substrait/src/types.rs index b15f7ed7a062..ba6cea28d10f 100644 --- a/src/common/substrait/src/types.rs +++ b/src/common/substrait/src/types.rs @@ -8,8 +8,7 @@ use datatypes::prelude::ConcreteDataType; use substrait_proto::protobuf::r#type::{self as s_type, Kind, Nullability}; use substrait_proto::protobuf::Type as SType; -use crate::error::Result; -use crate::error::{UnsupportedConcreteTypeSnafu, UnsupportedSubstraitTypeSnafu}; +use crate::error::{Result, UnsupportedConcreteTypeSnafu, UnsupportedSubstraitTypeSnafu}; macro_rules! substrait_kind { ($desc:ident, $concrete_ty:ident) => {{ diff --git a/src/common/telemetry/src/lib.rs b/src/common/telemetry/src/lib.rs index 811b954c2dfc..ed3dd5a79a0c 100644 --- a/src/common/telemetry/src/lib.rs +++ b/src/common/telemetry/src/lib.rs @@ -3,12 +3,7 @@ mod macros; pub mod metric; mod panic_hook; -pub use common_error; -pub use logging::init_default_ut_logging; -pub use logging::init_global_logging; +pub use logging::{init_default_ut_logging, init_global_logging}; pub use metric::init_default_metrics_recorder; pub use panic_hook::set_panic_hook; -pub use tracing; -pub use tracing_appender; -pub use tracing_futures; -pub use tracing_subscriber; +pub use {common_error, tracing, tracing_appender, tracing_futures, tracing_subscriber}; diff --git a/src/common/telemetry/src/logging.rs b/src/common/telemetry/src/logging.rs index a9cd69d81edb..2698e2e3f681 100644 --- a/src/common/telemetry/src/logging.rs +++ b/src/common/telemetry/src/logging.rs @@ -1,24 +1,18 @@ //! logging stuffs, inspired by databend use std::env; -use std::sync::Arc; -use std::sync::Mutex; -use std::sync::Once; +use std::sync::{Arc, Mutex, Once}; use once_cell::sync::Lazy; use opentelemetry::global; use opentelemetry::sdk::propagation::TraceContextPropagator; pub use tracing::{event, span, Level}; use tracing_appender::non_blocking::WorkerGuard; -use tracing_appender::rolling::RollingFileAppender; -use tracing_appender::rolling::Rotation; -use tracing_bunyan_formatter::BunyanFormattingLayer; -use tracing_bunyan_formatter::JsonStorageLayer; +use tracing_appender::rolling::{RollingFileAppender, Rotation}; +use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer}; use tracing_log::LogTracer; -use tracing_subscriber::filter; use tracing_subscriber::fmt::Layer; use tracing_subscriber::layer::SubscriberExt; -use tracing_subscriber::EnvFilter; -use tracing_subscriber::Registry; +use tracing_subscriber::{filter, EnvFilter, Registry}; pub use crate::{debug, error, info, log, trace, warn}; diff --git a/src/common/time/src/date.rs b/src/common/time/src/date.rs index 6f13046afa7c..5f67a4b8a001 100644 --- a/src/common/time/src/date.rs +++ b/src/common/time/src/date.rs @@ -6,8 +6,7 @@ use serde::{Deserialize, Serialize}; use serde_json::Value; use snafu::ResultExt; -use crate::error::Result; -use crate::error::{Error, ParseDateStrSnafu}; +use crate::error::{Error, ParseDateStrSnafu, Result}; const UNIX_EPOCH_FROM_CE: i32 = 719_163; diff --git a/src/common/time/src/timestamp.rs b/src/common/time/src/timestamp.rs index 4e969158e343..d3538d78b565 100644 --- a/src/common/time/src/timestamp.rs +++ b/src/common/time/src/timestamp.rs @@ -3,7 +3,8 @@ use std::cmp::Ordering; use std::hash::{Hash, Hasher}; use std::str::FromStr; -use chrono::{offset::Local, DateTime, LocalResult, NaiveDateTime, TimeZone, Utc}; +use chrono::offset::Local; +use chrono::{DateTime, LocalResult, NaiveDateTime, TimeZone, Utc}; use serde::{Deserialize, Serialize}; use crate::error::{Error, ParseTimestampSnafu}; diff --git a/src/datanode/src/instance.rs b/src/datanode/src/instance.rs index 426a66c1753e..98bfe85e2014 100644 --- a/src/datanode/src/instance.rs +++ b/src/datanode/src/instance.rs @@ -1,19 +1,23 @@ +use std::sync::Arc; use std::time::Duration; -use std::{fs, path, sync::Arc}; +use std::{fs, path}; use catalog::remote::MetaKvBackend; use catalog::CatalogManagerRef; use common_grpc::channel_manager::{ChannelConfig, ChannelManager}; use common_telemetry::logging::info; use frontend::frontend::Mode; -use log_store::fs::{config::LogConfig, log::LocalFileLogStore}; +use log_store::fs::config::LogConfig; +use log_store::fs::log::LocalFileLogStore; use meta_client::client::{MetaClient, MetaClientBuilder}; use meta_client::MetaClientOpts; use object_store::layers::LoggingLayer; -use object_store::{services::fs::Builder, util, ObjectStore}; +use object_store::services::fs::Builder; +use object_store::{util, ObjectStore}; use query::query_engine::{QueryEngineFactory, QueryEngineRef}; use snafu::prelude::*; -use storage::{config::EngineConfig as StorageEngineConfig, EngineImpl}; +use storage::config::EngineConfig as StorageEngineConfig; +use storage::EngineImpl; use table::table::TableIdProviderRef; use table_engine::config::EngineConfig as TableEngineConfig; use table_engine::engine::MitoEngine; diff --git a/src/datanode/src/instance/sql.rs b/src/datanode/src/instance/sql.rs index 3878ecf5966e..ae5542d75082 100644 --- a/src/datanode/src/instance/sql.rs +++ b/src/datanode/src/instance/sql.rs @@ -1,10 +1,8 @@ use async_trait::async_trait; use common_error::prelude::BoxedError; use common_query::Output; -use common_telemetry::{ - logging::{error, info}, - timer, -}; +use common_telemetry::logging::{error, info}; +use common_telemetry::timer; use servers::query_handler::SqlQueryHandler; use snafu::prelude::*; use sql::statements::statement::Statement; diff --git a/src/datanode/src/mock.rs b/src/datanode/src/mock.rs index 942f72c4f66b..4c8720bec8a3 100644 --- a/src/datanode/src/mock.rs +++ b/src/datanode/src/mock.rs @@ -24,9 +24,7 @@ impl Instance { // This method is used in other crate's testing codes, so move it out of "cfg(test)". // TODO(LFC): Delete it when callers no longer need it. pub async fn new_mock() -> Result { - use table_engine::table::test_util::new_test_object_store; - use table_engine::table::test_util::MockEngine; - use table_engine::table::test_util::MockMitoEngine; + use table_engine::table::test_util::{new_test_object_store, MockEngine, MockMitoEngine}; let mock_info = meta_srv::mocks::mock_with_memstore().await; let meta_client = Some(Arc::new(mock_meta_client(mock_info, 0).await)); diff --git a/src/datanode/src/server/grpc/ddl.rs b/src/datanode/src/server/grpc/ddl.rs index 735874651e08..4247d542abf1 100644 --- a/src/datanode/src/server/grpc/ddl.rs +++ b/src/datanode/src/server/grpc/ddl.rs @@ -2,13 +2,13 @@ use std::sync::Arc; use api::helper::ColumnDataTypeWrapper; use api::result::AdminResultBuilder; -use api::v1::{alter_expr::Kind, AdminResult, AlterExpr, ColumnDef, CreateExpr}; +use api::v1::alter_expr::Kind; +use api::v1::{AdminResult, AlterExpr, ColumnDef, CreateExpr}; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_error::prelude::{ErrorExt, StatusCode}; use common_query::Output; use common_telemetry::{error, info}; -use datatypes::schema::ColumnDefaultConstraint; -use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef}; +use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema, SchemaBuilder, SchemaRef}; use futures::TryFutureExt; use snafu::prelude::*; use table::metadata::TableId; diff --git a/src/datanode/src/server/grpc/plan.rs b/src/datanode/src/server/grpc/plan.rs index cf18d43764bc..0a8dd11c9684 100644 --- a/src/datanode/src/server/grpc/plan.rs +++ b/src/datanode/src/server/grpc/plan.rs @@ -1,16 +1,13 @@ use std::sync::Arc; -use common_grpc::AsExcutionPlan; -use common_grpc::DefaultAsPlanImpl; -use common_query::physical_plan::PhysicalPlanAdapter; -use common_query::physical_plan::PhysicalPlanRef; +use common_grpc::{AsExcutionPlan, DefaultAsPlanImpl}; +use common_query::physical_plan::{PhysicalPlanAdapter, PhysicalPlanRef}; use common_query::Output; use datatypes::schema::Schema; use query::QueryEngineRef; use snafu::ResultExt; -use crate::error::Result; -use crate::error::{ConvertSchemaSnafu, ExecutePhysicalPlanSnafu, IntoPhysicalPlanSnafu}; +use crate::error::{ConvertSchemaSnafu, ExecutePhysicalPlanSnafu, IntoPhysicalPlanSnafu, Result}; pub struct PhysicalPlanner { query_engine: QueryEngineRef, diff --git a/src/datanode/src/server/grpc/select.rs b/src/datanode/src/server/grpc/select.rs index 5aa5f412e20c..431fbaf32154 100644 --- a/src/datanode/src/server/grpc/select.rs +++ b/src/datanode/src/server/grpc/select.rs @@ -2,7 +2,9 @@ use std::sync::Arc; use api::helper::ColumnDataTypeWrapper; use api::result::{build_err_result, ObjectResultBuilder}; -use api::v1::{codec::SelectResult, column::SemanticType, column::Values, Column, ObjectResult}; +use api::v1::codec::SelectResult; +use api::v1::column::{SemanticType, Values}; +use api::v1::{Column, ObjectResult}; use arrow::array::{Array, BooleanArray, PrimitiveArray}; use common_base::BitVec; use common_error::status_code::StatusCode; @@ -183,18 +185,14 @@ pub fn values(arrays: &[Arc]) -> Result { mod tests { use std::sync::Arc; - use arrow::{ - array::{Array, BooleanArray, PrimitiveArray}, - datatypes::{DataType, Field}, - }; + use arrow::array::{Array, BooleanArray, PrimitiveArray}; + use arrow::datatypes::{DataType, Field}; use common_recordbatch::{RecordBatch, RecordBatches}; use datafusion::field_util::SchemaExt; use datatypes::arrow::datatypes::Schema as ArrowSchema; - use datatypes::{ - arrow_array::StringArray, - schema::Schema, - vectors::{UInt32Vector, VectorRef}, - }; + use datatypes::arrow_array::StringArray; + use datatypes::schema::Schema; + use datatypes::vectors::{UInt32Vector, VectorRef}; use crate::server::grpc::select::{null_mask, try_convert, values}; diff --git a/src/datanode/src/sql.rs b/src/datanode/src/sql.rs index 5e3c8fb38bdc..16554fa3144e 100644 --- a/src/datanode/src/sql.rs +++ b/src/datanode/src/sql.rs @@ -83,7 +83,8 @@ mod tests { use datatypes::schema::{ColumnSchema, SchemaBuilder, SchemaRef}; use datatypes::value::Value; use log_store::fs::noop::NoopLogStore; - use object_store::{services::fs::Builder, ObjectStore}; + use object_store::services::fs::Builder; + use object_store::ObjectStore; use query::QueryEngineFactory; use sql::statements::statement::Statement; use storage::config::EngineConfig as StorageEngineConfig; diff --git a/src/datanode/src/sql/insert.rs b/src/datanode/src/sql/insert.rs index fd1a7e6fe8fc..673e9a490f0a 100644 --- a/src/datanode/src/sql/insert.rs +++ b/src/datanode/src/sql/insert.rs @@ -1,12 +1,10 @@ use catalog::SchemaProviderRef; use common_query::Output; -use datatypes::prelude::ConcreteDataType; -use datatypes::prelude::VectorBuilder; -use snafu::ensure; -use snafu::OptionExt; -use snafu::ResultExt; +use datatypes::prelude::{ConcreteDataType, VectorBuilder}; +use snafu::{ensure, OptionExt, ResultExt}; use sql::ast::Value as SqlValue; -use sql::statements::{self, insert::Insert}; +use sql::statements::insert::Insert; +use sql::statements::{self}; use table::engine::TableReference; use table::requests::*; diff --git a/src/datanode/src/tests/grpc_test.rs b/src/datanode/src/tests/grpc_test.rs index d1235403536e..20865e4a6a86 100644 --- a/src/datanode/src/tests/grpc_test.rs +++ b/src/datanode/src/tests/grpc_test.rs @@ -4,11 +4,13 @@ use std::net::SocketAddr; use std::sync::Arc; use std::time::Duration; +use api::v1::alter_expr::Kind; +use api::v1::codec::InsertBatch; +use api::v1::column::SemanticType; use api::v1::{ - admin_result, alter_expr::Kind, codec::InsertBatch, column, column::SemanticType, insert_expr, - AddColumn, AlterExpr, Column, ColumnDef, CreateExpr, InsertExpr, MutateResult, + admin_result, column, insert_expr, AddColumn, AddColumns, AlterExpr, Column, ColumnDataType, + ColumnDef, CreateExpr, InsertExpr, MutateResult, }; -use api::v1::{AddColumns, ColumnDataType}; use client::admin::Admin; use client::{Client, Database, ObjectResult}; use common_catalog::consts::MIN_USER_TABLE_ID; diff --git a/src/datanode/src/tests/http_test.rs b/src/datanode/src/tests/http_test.rs index 0f703e1526c6..187cb6414d78 100644 --- a/src/datanode/src/tests/http_test.rs +++ b/src/datanode/src/tests/http_test.rs @@ -5,8 +5,7 @@ use axum::Router; use axum_test_helper::TestClient; use datatypes::prelude::ConcreteDataType; use frontend::frontend::FrontendOptions; -use frontend::instance::FrontendInstance; -use frontend::instance::Instance as FeInstance; +use frontend::instance::{FrontendInstance, Instance as FeInstance}; use serde_json::json; use servers::http::{ColumnSchema, HttpServer, JsonOutput, JsonResponse, Schema}; use test_util::TestGuard; diff --git a/src/datanode/src/tests/test_util.rs b/src/datanode/src/tests/test_util.rs index 40c7cb18da39..3c63b844c492 100644 --- a/src/datanode/src/tests/test_util.rs +++ b/src/datanode/src/tests/test_util.rs @@ -7,8 +7,7 @@ use datatypes::data_type::ConcreteDataType; use datatypes::schema::{ColumnSchema, SchemaBuilder}; use frontend::frontend::Mode; use snafu::ResultExt; -use table::engine::EngineContext; -use table::engine::TableEngineRef; +use table::engine::{EngineContext, TableEngineRef}; use table::requests::CreateTableRequest; use table_engine::config::EngineConfig; use table_engine::table::test_util::{new_test_object_store, MockEngine, MockMitoEngine}; diff --git a/src/datatypes/src/arrow_array.rs b/src/datatypes/src/arrow_array.rs index 8b8f234ee025..ea982a84d12e 100644 --- a/src/datatypes/src/arrow_array.rs +++ b/src/datatypes/src/arrow_array.rs @@ -85,9 +85,9 @@ pub fn arrow_array_get(array: &dyn Array, idx: usize) -> Result { #[cfg(test)] mod test { - use arrow::array::Int64Array as ArrowI64Array; - use arrow::array::*; - use arrow::array::{MutableListArray, MutablePrimitiveArray, TryExtend}; + use arrow::array::{ + Int64Array as ArrowI64Array, MutableListArray, MutablePrimitiveArray, TryExtend, *, + }; use arrow::buffer::Buffer; use arrow::datatypes::{DataType, TimeUnit as ArrowTimeUnit}; use common_time::timestamp::{TimeUnit, Timestamp}; diff --git a/src/datatypes/src/data_type.rs b/src/datatypes/src/data_type.rs index da9c4c8b5bd9..778bf79e1020 100644 --- a/src/datatypes/src/data_type.rs +++ b/src/datatypes/src/data_type.rs @@ -8,10 +8,10 @@ use serde::{Deserialize, Serialize}; use crate::error::{self, Error, Result}; use crate::type_id::LogicalTypeId; use crate::types::{ - BinaryType, BooleanType, DateType, Float32Type, Float64Type, Int16Type, Int32Type, Int64Type, - Int8Type, ListType, NullType, StringType, UInt16Type, UInt32Type, UInt64Type, UInt8Type, + BinaryType, BooleanType, DateTimeType, DateType, Float32Type, Float64Type, Int16Type, + Int32Type, Int64Type, Int8Type, ListType, NullType, StringType, TimestampType, UInt16Type, + UInt32Type, UInt64Type, UInt8Type, }; -use crate::types::{DateTimeType, TimestampType}; use crate::value::Value; use crate::vectors::MutableVector; diff --git a/src/datatypes/src/types/primitive_type.rs b/src/datatypes/src/types/primitive_type.rs index ad2d59773dac..19418544f528 100644 --- a/src/datatypes/src/types/primitive_type.rs +++ b/src/datatypes/src/types/primitive_type.rs @@ -9,8 +9,7 @@ use snafu::OptionExt; use crate::data_type::{ConcreteDataType, DataType}; use crate::error::{self, Result}; -use crate::scalars::ScalarVectorBuilder; -use crate::scalars::{Scalar, ScalarRef}; +use crate::scalars::{Scalar, ScalarRef, ScalarVectorBuilder}; use crate::type_id::LogicalTypeId; use crate::types::primitive_traits::Primitive; use crate::value::{Value, ValueRef}; diff --git a/src/datatypes/src/vectors/binary.rs b/src/datatypes/src/vectors/binary.rs index d4332976e5c4..74b7cf05a347 100644 --- a/src/datatypes/src/vectors/binary.rs +++ b/src/datatypes/src/vectors/binary.rs @@ -1,8 +1,7 @@ use std::any::Any; use std::sync::Arc; -use arrow::array::{Array, ArrayRef}; -use arrow::array::{BinaryValueIter, MutableArray}; +use arrow::array::{Array, ArrayRef, BinaryValueIter, MutableArray}; use arrow::bitmap::utils::ZipValidity; use snafu::{OptionExt, ResultExt}; diff --git a/src/datatypes/src/vectors/constant.rs b/src/datatypes/src/vectors/constant.rs index dcbd8b87b540..d793f7519e88 100644 --- a/src/datatypes/src/vectors/constant.rs +++ b/src/datatypes/src/vectors/constant.rs @@ -9,8 +9,7 @@ use crate::data_type::ConcreteDataType; use crate::error::{Result, SerializeSnafu}; use crate::serialize::Serializable; use crate::value::{Value, ValueRef}; -use crate::vectors::Helper; -use crate::vectors::{BooleanVector, Validity, Vector, VectorRef}; +use crate::vectors::{BooleanVector, Helper, Validity, Vector, VectorRef}; #[derive(Clone)] pub struct ConstantVector { diff --git a/src/datatypes/src/vectors/null.rs b/src/datatypes/src/vectors/null.rs index 84dd8f75672b..6f01123e2f9c 100644 --- a/src/datatypes/src/vectors/null.rs +++ b/src/datatypes/src/vectors/null.rs @@ -2,8 +2,7 @@ use std::any::Any; use std::fmt; use std::sync::Arc; -use arrow::array::ArrayRef; -use arrow::array::{Array, NullArray}; +use arrow::array::{Array, ArrayRef, NullArray}; use arrow::datatypes::DataType as ArrowDataType; use snafu::{ensure, OptionExt}; diff --git a/src/datatypes/src/vectors/primitive.rs b/src/datatypes/src/vectors/primitive.rs index 3d508ed63914..6c4521b6979d 100644 --- a/src/datatypes/src/vectors/primitive.rs +++ b/src/datatypes/src/vectors/primitive.rs @@ -9,10 +9,8 @@ use serde_json::Value as JsonValue; use snafu::{OptionExt, ResultExt}; use crate::data_type::{ConcreteDataType, DataType}; -use crate::error::ConversionSnafu; -use crate::error::{Result, SerializeSnafu}; -use crate::scalars::{Scalar, ScalarRef}; -use crate::scalars::{ScalarVector, ScalarVectorBuilder}; +use crate::error::{ConversionSnafu, Result, SerializeSnafu}; +use crate::scalars::{Scalar, ScalarRef, ScalarVector, ScalarVectorBuilder}; use crate::serialize::Serializable; use crate::types::{Primitive, PrimitiveElement}; use crate::value::{Value, ValueRef}; diff --git a/src/frontend/src/expr_factory.rs b/src/frontend/src/expr_factory.rs index c3a3ef7a8cac..4e554cbcd60e 100644 --- a/src/frontend/src/expr_factory.rs +++ b/src/frontend/src/expr_factory.rs @@ -10,11 +10,9 @@ use sql::statements::create::{CreateTable, TIME_INDEX}; use sql::statements::{column_def_to_schema, table_idents_to_full_name}; use sqlparser::ast::{ColumnDef, TableConstraint}; -use crate::error::InvalidSqlSnafu; -use crate::error::Result; use crate::error::{ BuildCreateExprOnInsertionSnafu, ColumnDataTypeSnafu, ConvertColumnDefaultConstraintSnafu, - ParseSqlSnafu, + InvalidSqlSnafu, ParseSqlSnafu, Result, }; pub type CreateExprFactoryRef = Arc; diff --git a/src/frontend/src/instance.rs b/src/frontend/src/instance.rs index 81040efbe40c..375c5e0db574 100644 --- a/src/frontend/src/instance.rs +++ b/src/frontend/src/instance.rs @@ -34,10 +34,11 @@ use servers::query_handler::{ PrometheusProtocolHandler, ScriptHandler, ScriptHandlerRef, SqlQueryHandler, }; use snafu::prelude::*; +use sql::dialect::GenericDialect; +use sql::parser::ParserContext; use sql::statements::create::Partitions; use sql::statements::insert::Insert; use sql::statements::statement::Statement; -use sql::{dialect::GenericDialect, parser::ParserContext}; use crate::catalog::FrontendCatalogManager; use crate::datanode::DatanodeClients; @@ -713,10 +714,10 @@ mod tests { use std::assert_matches::assert_matches; use api::v1::codec::{InsertBatch, SelectResult}; + use api::v1::column::SemanticType; use api::v1::{ - admin_expr, admin_result, column, column::SemanticType, object_expr, object_result, - select_expr, Column, ColumnDataType, ColumnDef as GrpcColumnDef, ExprHeader, MutateResult, - SelectExpr, + admin_expr, admin_result, column, object_expr, object_result, select_expr, Column, + ColumnDataType, ColumnDef as GrpcColumnDef, ExprHeader, MutateResult, SelectExpr, }; use datatypes::schema::ColumnDefaultConstraint; use datatypes::value::Value; diff --git a/src/frontend/src/instance/influxdb.rs b/src/frontend/src/instance/influxdb.rs index 601a1750f49e..51d31cc8a989 100644 --- a/src/frontend/src/instance/influxdb.rs +++ b/src/frontend/src/instance/influxdb.rs @@ -7,8 +7,9 @@ use async_trait::async_trait; use common_catalog::consts::DEFAULT_CATALOG_NAME; use common_error::prelude::BoxedError; use common_insert::column_to_vector; +use servers::error as server_error; use servers::influxdb::InfluxdbRequest; -use servers::{error as server_error, query_handler::InfluxdbLineProtocolHandler}; +use servers::query_handler::InfluxdbLineProtocolHandler; use snafu::{OptionExt, ResultExt}; use table::requests::InsertRequest; diff --git a/src/frontend/src/instance/prometheus.rs b/src/frontend/src/instance/prometheus.rs index babc91ef33ce..88b2a19b527c 100644 --- a/src/frontend/src/instance/prometheus.rs +++ b/src/frontend/src/instance/prometheus.rs @@ -1,9 +1,7 @@ -use api::prometheus::remote::{ - read_request::ResponseType, Query, QueryResult, ReadRequest, ReadResponse, WriteRequest, -}; +use api::prometheus::remote::read_request::ResponseType; +use api::prometheus::remote::{Query, QueryResult, ReadRequest, ReadResponse, WriteRequest}; use async_trait::async_trait; -use client::ObjectResult; -use client::{Database, Select}; +use client::{Database, ObjectResult, Select}; use common_error::prelude::BoxedError; use common_telemetry::logging; use prost::Message; @@ -162,9 +160,8 @@ impl PrometheusProtocolHandler for Instance { #[cfg(test)] mod tests { - use api::prometheus::remote::{ - label_matcher::Type as MatcherType, Label, LabelMatcher, Sample, - }; + use api::prometheus::remote::label_matcher::Type as MatcherType; + use api::prometheus::remote::{Label, LabelMatcher, Sample}; use api::v1::CreateDatabaseExpr; use super::*; diff --git a/src/frontend/src/mock.rs b/src/frontend/src/mock.rs index 3d7b96914d28..d7835d6c7e58 100644 --- a/src/frontend/src/mock.rs +++ b/src/frontend/src/mock.rs @@ -4,12 +4,10 @@ use std::fmt::Formatter; use std::sync::Arc; use api::v1::InsertExpr; -use client::ObjectResult; -use client::{Database, Select}; +use client::{Database, ObjectResult, Select}; use common_query::prelude::Expr; use common_query::Output; -use common_recordbatch::util; -use common_recordbatch::RecordBatches; +use common_recordbatch::{util, RecordBatches}; use datafusion::logical_plan::{LogicalPlan as DfLogicPlan, LogicalPlanBuilder}; use datafusion_expr::Expr as DfExpr; use datatypes::prelude::Value; diff --git a/src/frontend/src/spliter.rs b/src/frontend/src/spliter.rs index f0db03209e7e..c9ed76f172a5 100644 --- a/src/frontend/src/spliter.rs +++ b/src/frontend/src/spliter.rs @@ -1,18 +1,14 @@ use std::collections::HashMap; use datatypes::value::Value; -use datatypes::vectors::VectorBuilder; -use datatypes::vectors::VectorRef; -use snafu::ensure; -use snafu::OptionExt; +use datatypes::vectors::{VectorBuilder, VectorRef}; +use snafu::{ensure, OptionExt}; use store_api::storage::RegionNumber; use table::requests::InsertRequest; -use crate::error::Error; -use crate::error::FindPartitionColumnSnafu; -use crate::error::FindRegionSnafu; -use crate::error::InvalidInsertRequestSnafu; -use crate::error::Result; +use crate::error::{ + Error, FindPartitionColumnSnafu, FindRegionSnafu, InvalidInsertRequestSnafu, Result, +}; use crate::partitioning::PartitionRuleRef; pub type DistInsertRequest = HashMap; @@ -159,15 +155,15 @@ fn partition_insert_request( #[cfg(test)] mod tests { use std::any::Any; - use std::{collections::HashMap, result::Result, sync::Arc}; + use std::collections::HashMap; + use std::result::Result; + use std::sync::Arc; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; - use datatypes::{ - data_type::ConcreteDataType, - types::{BooleanType, StringType}, - value::Value, - vectors::VectorBuilder, - }; + use datatypes::data_type::ConcreteDataType; + use datatypes::types::{BooleanType, StringType}; + use datatypes::value::Value; + use datatypes::vectors::VectorBuilder; use serde::{Deserialize, Serialize}; use store_api::storage::RegionNumber; use table::requests::InsertRequest; @@ -176,10 +172,8 @@ mod tests { check_req, find_partitioning_values, partition_insert_request, partition_values, WriteSpliter, }; - use crate::{ - error::Error, - partitioning::{PartitionExpr, PartitionRule, PartitionRuleRef}, - }; + use crate::error::Error; + use crate::partitioning::{PartitionExpr, PartitionRule, PartitionRuleRef}; #[test] fn test_insert_req_check() { diff --git a/src/frontend/src/table.rs b/src/frontend/src/table.rs index 2f32847a5d76..c63e6222249a 100644 --- a/src/frontend/src/table.rs +++ b/src/frontend/src/table.rs @@ -443,8 +443,7 @@ mod test { use common_recordbatch::util; use datafusion::arrow_print; use datafusion_common::record_batch::RecordBatch as DfRecordBatch; - use datafusion_expr::expr_fn::col; - use datafusion_expr::expr_fn::{and, binary_expr, or}; + use datafusion_expr::expr_fn::{and, binary_expr, col, or}; use datafusion_expr::lit; use datanode::datanode::{DatanodeOptions, ObjectStoreConfig}; use datanode::instance::Instance; diff --git a/src/frontend/src/table/insert.rs b/src/frontend/src/table/insert.rs index 252fbeb2c0b4..b7f3afd7f268 100644 --- a/src/frontend/src/table/insert.rs +++ b/src/frontend/src/table/insert.rs @@ -2,19 +2,13 @@ use std::collections::HashMap; use std::sync::Arc; use api::helper::ColumnDataTypeWrapper; -use api::v1::codec; use api::v1::codec::InsertBatch; use api::v1::column::SemanticType; -use api::v1::insert_expr; use api::v1::insert_expr::Expr; -use api::v1::Column; -use api::v1::InsertExpr; -use api::v1::MutateResult; +use api::v1::{codec, insert_expr, Column, InsertExpr, MutateResult}; use client::{Database, ObjectResult}; use datatypes::prelude::ConcreteDataType; -use snafu::ensure; -use snafu::OptionExt; -use snafu::ResultExt; +use snafu::{ensure, OptionExt, ResultExt}; use store_api::storage::RegionNumber; use table::requests::InsertRequest; @@ -144,9 +138,13 @@ fn to_insert_expr(region_number: RegionNumber, insert: InsertRequest) -> Result< mod tests { use std::collections::HashMap; - use api::v1::{codec::InsertBatch, insert_expr::Expr, ColumnDataType, InsertExpr}; + use api::v1::codec::InsertBatch; + use api::v1::insert_expr::Expr; + use api::v1::{ColumnDataType, InsertExpr}; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; - use datatypes::{prelude::ConcreteDataType, types::StringType, vectors::VectorBuilder}; + use datatypes::prelude::ConcreteDataType; + use datatypes::types::StringType; + use datatypes::vectors::VectorBuilder; use table::requests::InsertRequest; use super::to_insert_expr; diff --git a/src/log-store/src/fs/chunk.rs b/src/log-store/src/fs/chunk.rs index 3902801e0099..bd5d07ae5f12 100644 --- a/src/log-store/src/fs/chunk.rs +++ b/src/log-store/src/fs/chunk.rs @@ -1,7 +1,6 @@ use std::collections::LinkedList; -use common_base::buffer::Buffer; -use common_base::buffer::UnderflowSnafu; +use common_base::buffer::{Buffer, UnderflowSnafu}; use snafu::ensure; pub const DEFAULT_CHUNK_SIZE: usize = 4096; diff --git a/src/log-store/src/fs/file.rs b/src/log-store/src/fs/file.rs index 8f3afb92b3de..8f153b07f767 100644 --- a/src/log-store/src/fs/file.rs +++ b/src/log-store/src/fs/file.rs @@ -5,8 +5,7 @@ use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering}; use std::sync::{Arc, Mutex}; use async_stream::stream; -use byteorder::ByteOrder; -use byteorder::LittleEndian; +use byteorder::{ByteOrder, LittleEndian}; use bytes::{Bytes, BytesMut}; use common_error::ext::BoxedError; use common_telemetry::logging::{error, info}; @@ -18,8 +17,7 @@ use store_api::logstore::entry::{Encode, Entry, Id, Offset}; use store_api::logstore::entry_stream::EntryStream; use store_api::logstore::namespace::Namespace; use tokio::sync::mpsc::error::TryRecvError; -use tokio::sync::mpsc::Receiver; -use tokio::sync::mpsc::Sender as MpscSender; +use tokio::sync::mpsc::{Receiver, Sender as MpscSender}; use tokio::sync::oneshot::Sender as OneshotSender; use tokio::sync::{oneshot, Notify}; use tokio::task::JoinHandle; diff --git a/src/log-store/src/fs/io/unix.rs b/src/log-store/src/fs/io/unix.rs index 43e38da65ebc..f2912a3b7318 100644 --- a/src/log-store/src/fs/io/unix.rs +++ b/src/log-store/src/fs/io/unix.rs @@ -3,8 +3,7 @@ use std::os::unix::fs::FileExt; use snafu::ResultExt; -use crate::error::Error; -use crate::error::IoSnafu; +use crate::error::{Error, IoSnafu}; pub fn pread_exact(file: &File, buf: &mut [u8], offset: u64) -> Result<(), Error> { file.read_exact_at(buf, offset as u64).context(IoSnafu) diff --git a/src/log-store/src/fs/log.rs b/src/log-store/src/fs/log.rs index 4bca3425a6a1..1019284d0deb 100644 --- a/src/log-store/src/fs/log.rs +++ b/src/log-store/src/fs/log.rs @@ -5,8 +5,7 @@ use std::sync::Arc; use arc_swap::ArcSwap; use async_stream::stream; use common_telemetry::{error, info, warn}; -use futures::pin_mut; -use futures::StreamExt; +use futures::{pin_mut, StreamExt}; use snafu::{OptionExt, ResultExt}; use store_api::logstore::entry::{Encode, Entry, Id}; use store_api::logstore::entry_stream::SendableEntryStream; @@ -272,7 +271,8 @@ impl LogStore for LocalFileLogStore { #[cfg(test)] mod tests { use futures_util::StreamExt; - use rand::{distributions::Alphanumeric, Rng}; + use rand::distributions::Alphanumeric; + use rand::Rng; use store_api::logstore::entry::Entry; use tempdir::TempDir; diff --git a/src/log-store/src/fs/noop.rs b/src/log-store/src/fs/noop.rs index 2d55d845f565..5842811311fe 100644 --- a/src/log-store/src/fs/noop.rs +++ b/src/log-store/src/fs/noop.rs @@ -1,8 +1,11 @@ +use store_api::logstore::entry::Id; use store_api::logstore::namespace::Id as NamespaceId; -use store_api::logstore::{entry::Id, LogStore}; +use store_api::logstore::LogStore; use crate::error::{Error, Result}; -use crate::fs::{entry::EntryImpl, namespace::LocalNamespace, AppendResponseImpl}; +use crate::fs::entry::EntryImpl; +use crate::fs::namespace::LocalNamespace; +use crate::fs::AppendResponseImpl; /// A noop log store which only for test // TODO: Add a test feature diff --git a/src/log-store/src/test_util/log_store_util.rs b/src/log-store/src/test_util/log_store_util.rs index b8c4f5fb03c5..2c9d2ad39d6b 100644 --- a/src/log-store/src/test_util/log_store_util.rs +++ b/src/log-store/src/test_util/log_store_util.rs @@ -1,6 +1,7 @@ use tempdir::TempDir; -use crate::fs::{config::LogConfig, log::LocalFileLogStore}; +use crate::fs::config::LogConfig; +use crate::fs::log::LocalFileLogStore; /// Create a tmp directory for write log, used for test. // TODO: Add a test feature diff --git a/src/meta-client/examples/meta_client.rs b/src/meta-client/examples/meta_client.rs index c2935b926cfb..421c0c44a753 100644 --- a/src/meta-client/examples/meta_client.rs +++ b/src/meta-client/examples/meta_client.rs @@ -1,21 +1,13 @@ use std::time::Duration; -use api::v1::meta::HeartbeatRequest; -use api::v1::meta::Peer; -use common_grpc::channel_manager::ChannelConfig; -use common_grpc::channel_manager::ChannelManager; +use api::v1::meta::{HeartbeatRequest, Peer}; +use common_grpc::channel_manager::{ChannelConfig, ChannelManager}; use meta_client::client::MetaClientBuilder; -use meta_client::rpc::BatchPutRequest; -use meta_client::rpc::CompareAndPutRequest; -use meta_client::rpc::CreateRequest; -use meta_client::rpc::DeleteRangeRequest; -use meta_client::rpc::Partition; -use meta_client::rpc::PutRequest; -use meta_client::rpc::RangeRequest; -use meta_client::rpc::TableName; -use tracing::event; -use tracing::subscriber; -use tracing::Level; +use meta_client::rpc::{ + BatchPutRequest, CompareAndPutRequest, CreateRequest, DeleteRangeRequest, Partition, + PutRequest, RangeRequest, TableName, +}; +use tracing::{event, subscriber, Level}; use tracing_subscriber::FmtSubscriber; fn main() { diff --git a/src/meta-client/src/client.rs b/src/meta-client/src/client.rs index 72cc4251ad5a..be961c8dd56a 100644 --- a/src/meta-client/src/client.rs +++ b/src/meta-client/src/client.rs @@ -3,31 +3,21 @@ mod load_balance; mod router; mod store; -use common_grpc::channel_manager::ChannelConfig; -use common_grpc::channel_manager::ChannelManager; +use common_grpc::channel_manager::{ChannelConfig, ChannelManager}; use common_telemetry::info; use heartbeat::Client as HeartbeatClient; use router::Client as RouterClient; use snafu::OptionExt; use store::Client as StoreClient; -pub use self::heartbeat::HeartbeatSender; -pub use self::heartbeat::HeartbeatStream; +pub use self::heartbeat::{HeartbeatSender, HeartbeatStream}; use crate::error; use crate::error::Result; -use crate::rpc::BatchPutRequest; -use crate::rpc::BatchPutResponse; -use crate::rpc::CompareAndPutRequest; -use crate::rpc::CompareAndPutResponse; -use crate::rpc::CreateRequest; -use crate::rpc::DeleteRangeRequest; -use crate::rpc::DeleteRangeResponse; -use crate::rpc::PutRequest; -use crate::rpc::PutResponse; -use crate::rpc::RangeRequest; -use crate::rpc::RangeResponse; -use crate::rpc::RouteRequest; -use crate::rpc::RouteResponse; +use crate::rpc::{ + BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, CreateRequest, + DeleteRangeRequest, DeleteRangeResponse, PutRequest, PutResponse, RangeRequest, RangeResponse, + RouteRequest, RouteResponse, +}; pub type Id = (u64, u64); @@ -273,17 +263,14 @@ impl MetaClient { mod tests { use std::sync::Arc; - use api::v1::meta::HeartbeatRequest; - use api::v1::meta::Peer; + use api::v1::meta::{HeartbeatRequest, Peer}; use meta_srv::metasrv::Context; - use meta_srv::selector::Namespace; - use meta_srv::selector::Selector; + use meta_srv::selector::{Namespace, Selector}; use meta_srv::Result as MetaResult; use super::*; use crate::mocks; - use crate::rpc::Partition; - use crate::rpc::TableName; + use crate::rpc::{Partition, TableName}; #[tokio::test] async fn test_meta_client_builder() { diff --git a/src/meta-client/src/client/heartbeat.rs b/src/meta-client/src/client/heartbeat.rs index aef4aad71368..a4cff3fb1694 100644 --- a/src/meta-client/src/client/heartbeat.rs +++ b/src/meta-client/src/client/heartbeat.rs @@ -2,18 +2,11 @@ use std::collections::HashSet; use std::sync::Arc; use api::v1::meta::heartbeat_client::HeartbeatClient; -use api::v1::meta::AskLeaderRequest; -use api::v1::meta::HeartbeatRequest; -use api::v1::meta::HeartbeatResponse; -use api::v1::meta::RequestHeader; +use api::v1::meta::{AskLeaderRequest, HeartbeatRequest, HeartbeatResponse, RequestHeader}; use common_grpc::channel_manager::ChannelManager; -use common_telemetry::debug; -use common_telemetry::info; -use snafu::ensure; -use snafu::OptionExt; -use snafu::ResultExt; -use tokio::sync::mpsc; -use tokio::sync::RwLock; +use common_telemetry::{debug, info}; +use snafu::{ensure, OptionExt, ResultExt}; +use tokio::sync::{mpsc, RwLock}; use tokio_stream::wrappers::ReceiverStream; use tonic::transport::Channel; use tonic::Streaming; diff --git a/src/meta-client/src/client/router.rs b/src/meta-client/src/client/router.rs index 52277bb4fe29..5698cf2c41eb 100644 --- a/src/meta-client/src/client/router.rs +++ b/src/meta-client/src/client/router.rs @@ -2,18 +2,13 @@ use std::collections::HashSet; use std::sync::Arc; use api::v1::meta::router_client::RouterClient; -use api::v1::meta::CreateRequest; -use api::v1::meta::RouteRequest; -use api::v1::meta::RouteResponse; +use api::v1::meta::{CreateRequest, RouteRequest, RouteResponse}; use common_grpc::channel_manager::ChannelManager; -use snafu::ensure; -use snafu::OptionExt; -use snafu::ResultExt; +use snafu::{ensure, OptionExt, ResultExt}; use tokio::sync::RwLock; use tonic::transport::Channel; -use crate::client::load_balance as lb; -use crate::client::Id; +use crate::client::{load_balance as lb, Id}; use crate::error; use crate::error::Result; diff --git a/src/meta-client/src/client/store.rs b/src/meta-client/src/client/store.rs index 36b236c730cf..e9cbfd2fb271 100644 --- a/src/meta-client/src/client/store.rs +++ b/src/meta-client/src/client/store.rs @@ -2,25 +2,16 @@ use std::collections::HashSet; use std::sync::Arc; use api::v1::meta::store_client::StoreClient; -use api::v1::meta::BatchPutRequest; -use api::v1::meta::BatchPutResponse; -use api::v1::meta::CompareAndPutRequest; -use api::v1::meta::CompareAndPutResponse; -use api::v1::meta::DeleteRangeRequest; -use api::v1::meta::DeleteRangeResponse; -use api::v1::meta::PutRequest; -use api::v1::meta::PutResponse; -use api::v1::meta::RangeRequest; -use api::v1::meta::RangeResponse; +use api::v1::meta::{ + BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, + DeleteRangeRequest, DeleteRangeResponse, PutRequest, PutResponse, RangeRequest, RangeResponse, +}; use common_grpc::channel_manager::ChannelManager; -use snafu::ensure; -use snafu::OptionExt; -use snafu::ResultExt; +use snafu::{ensure, OptionExt, ResultExt}; use tokio::sync::RwLock; use tonic::transport::Channel; -use crate::client::load_balance as lb; -use crate::client::Id; +use crate::client::{load_balance as lb, Id}; use crate::error; use crate::error::Result; diff --git a/src/meta-client/src/lib.rs b/src/meta-client/src/lib.rs index 4226cdbea67b..e02c5b921652 100644 --- a/src/meta-client/src/lib.rs +++ b/src/meta-client/src/lib.rs @@ -1,5 +1,4 @@ -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; pub mod client; pub mod error; diff --git a/src/meta-client/src/mocks.rs b/src/meta-client/src/mocks.rs index 11982241faeb..99faaebb2fc5 100644 --- a/src/meta-client/src/mocks.rs +++ b/src/meta-client/src/mocks.rs @@ -2,8 +2,7 @@ use meta_srv::metasrv::SelectorRef; use meta_srv::mocks as server_mock; use meta_srv::mocks::MockInfo; -use crate::client::MetaClient; -use crate::client::MetaClientBuilder; +use crate::client::{MetaClient, MetaClientBuilder}; pub async fn mock_client_with_memstore() -> MetaClient { let mock_info = server_mock::mock_with_memstore().await; diff --git a/src/meta-client/src/rpc.rs b/src/meta-client/src/rpc.rs index 5a6d79d4bfdb..2adeb01339ca 100644 --- a/src/meta-client/src/rpc.rs +++ b/src/meta-client/src/rpc.rs @@ -4,28 +4,18 @@ pub mod util; use std::fmt::{Display, Formatter}; -use api::v1::meta::KeyValue as PbKeyValue; -use api::v1::meta::Peer as PbPeer; -use api::v1::meta::ResponseHeader as PbResponseHeader; -use api::v1::meta::TableName as PbTableName; -pub use router::CreateRequest; -pub use router::Partition; -pub use router::Region; -pub use router::RouteRequest; -pub use router::RouteResponse; -pub use router::Table; -pub use router::TableRoute; +use api::v1::meta::{ + KeyValue as PbKeyValue, Peer as PbPeer, ResponseHeader as PbResponseHeader, + TableName as PbTableName, +}; +pub use router::{ + CreateRequest, Partition, Region, RouteRequest, RouteResponse, Table, TableRoute, +}; use serde::{Deserialize, Serialize}; -pub use store::BatchPutRequest; -pub use store::BatchPutResponse; -pub use store::CompareAndPutRequest; -pub use store::CompareAndPutResponse; -pub use store::DeleteRangeRequest; -pub use store::DeleteRangeResponse; -pub use store::PutRequest; -pub use store::PutResponse; -pub use store::RangeRequest; -pub use store::RangeResponse; +pub use store::{ + BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, + DeleteRangeRequest, DeleteRangeResponse, PutRequest, PutResponse, RangeRequest, RangeResponse, +}; #[derive(Debug, Clone)] pub struct ResponseHeader(PbResponseHeader); diff --git a/src/meta-client/src/rpc/router.rs b/src/meta-client/src/rpc/router.rs index 936fa076fb05..c1eb4a807537 100644 --- a/src/meta-client/src/rpc/router.rs +++ b/src/meta-client/src/rpc/router.rs @@ -1,21 +1,15 @@ use std::collections::HashMap; -use api::v1::meta::CreateRequest as PbCreateRequest; -use api::v1::meta::Partition as PbPartition; -use api::v1::meta::Region as PbRegion; -use api::v1::meta::RouteRequest as PbRouteRequest; -use api::v1::meta::RouteResponse as PbRouteResponse; -use api::v1::meta::Table as PbTable; -use serde::Deserialize; -use serde::Serialize; -use serde::Serializer; +use api::v1::meta::{ + CreateRequest as PbCreateRequest, Partition as PbPartition, Region as PbRegion, + RouteRequest as PbRouteRequest, RouteResponse as PbRouteResponse, Table as PbTable, +}; +use serde::{Deserialize, Serialize, Serializer}; use snafu::OptionExt; use crate::error; use crate::error::Result; -use crate::rpc::util; -use crate::rpc::Peer; -use crate::rpc::TableName; +use crate::rpc::{util, Peer, TableName}; #[derive(Debug, Clone, Default)] pub struct RouteRequest { @@ -266,15 +260,11 @@ impl From for Partition { #[cfg(test)] mod tests { - use api::v1::meta::Partition as PbPartition; - use api::v1::meta::Peer as PbPeer; - use api::v1::meta::Region as PbRegion; - use api::v1::meta::RegionRoute as PbRegionRoute; - use api::v1::meta::RouteRequest as PbRouteRequest; - use api::v1::meta::RouteResponse as PbRouteResponse; - use api::v1::meta::Table as PbTable; - use api::v1::meta::TableName as PbTableName; - use api::v1::meta::TableRoute as PbTableRoute; + use api::v1::meta::{ + Partition as PbPartition, Peer as PbPeer, Region as PbRegion, RegionRoute as PbRegionRoute, + RouteRequest as PbRouteRequest, RouteResponse as PbRouteResponse, Table as PbTable, + TableName as PbTableName, TableRoute as PbTableRoute, + }; use super::*; diff --git a/src/meta-client/src/rpc/store.rs b/src/meta-client/src/rpc/store.rs index 4ecb1cb25b7c..9b878523c786 100644 --- a/src/meta-client/src/rpc/store.rs +++ b/src/meta-client/src/rpc/store.rs @@ -1,20 +1,15 @@ -use api::v1::meta::BatchPutRequest as PbBatchPutRequest; -use api::v1::meta::BatchPutResponse as PbBatchPutResponse; -use api::v1::meta::CompareAndPutRequest as PbCompareAndPutRequest; -use api::v1::meta::CompareAndPutResponse as PbCompareAndPutResponse; -use api::v1::meta::DeleteRangeRequest as PbDeleteRangeRequest; -use api::v1::meta::DeleteRangeResponse as PbDeleteRangeResponse; -use api::v1::meta::KeyValue as PbKeyValue; -use api::v1::meta::PutRequest as PbPutRequest; -use api::v1::meta::PutResponse as PbPutResponse; -use api::v1::meta::RangeRequest as PbRangeRequest; -use api::v1::meta::RangeResponse as PbRangeResponse; +use api::v1::meta::{ + BatchPutRequest as PbBatchPutRequest, BatchPutResponse as PbBatchPutResponse, + CompareAndPutRequest as PbCompareAndPutRequest, + CompareAndPutResponse as PbCompareAndPutResponse, DeleteRangeRequest as PbDeleteRangeRequest, + DeleteRangeResponse as PbDeleteRangeResponse, KeyValue as PbKeyValue, + PutRequest as PbPutRequest, PutResponse as PbPutResponse, RangeRequest as PbRangeRequest, + RangeResponse as PbRangeResponse, +}; use crate::error; use crate::error::Result; -use crate::rpc::util; -use crate::rpc::KeyValue; -use crate::rpc::ResponseHeader; +use crate::rpc::{util, KeyValue, ResponseHeader}; #[derive(Debug, Clone, Default)] pub struct RangeRequest { @@ -514,17 +509,14 @@ impl DeleteRangeResponse { #[cfg(test)] mod tests { - use api::v1::meta::BatchPutRequest as PbBatchPutRequest; - use api::v1::meta::BatchPutResponse as PbBatchPutResponse; - use api::v1::meta::CompareAndPutRequest as PbCompareAndPutRequest; - use api::v1::meta::CompareAndPutResponse as PbCompareAndPutResponse; - use api::v1::meta::DeleteRangeRequest as PbDeleteRangeRequest; - use api::v1::meta::DeleteRangeResponse as PbDeleteRangeResponse; - use api::v1::meta::KeyValue as PbKeyValue; - use api::v1::meta::PutRequest as PbPutRequest; - use api::v1::meta::PutResponse as PbPutResponse; - use api::v1::meta::RangeRequest as PbRangeRequest; - use api::v1::meta::RangeResponse as PbRangeResponse; + use api::v1::meta::{ + BatchPutRequest as PbBatchPutRequest, BatchPutResponse as PbBatchPutResponse, + CompareAndPutRequest as PbCompareAndPutRequest, + CompareAndPutResponse as PbCompareAndPutResponse, + DeleteRangeRequest as PbDeleteRangeRequest, DeleteRangeResponse as PbDeleteRangeResponse, + KeyValue as PbKeyValue, PutRequest as PbPutRequest, PutResponse as PbPutResponse, + RangeRequest as PbRangeRequest, RangeResponse as PbRangeResponse, + }; use super::*; diff --git a/src/meta-srv/examples/kv_store.rs b/src/meta-srv/examples/kv_store.rs index 707c1df152d1..466cd9c5767e 100644 --- a/src/meta-srv/examples/kv_store.rs +++ b/src/meta-srv/examples/kv_store.rs @@ -1,10 +1,6 @@ -use api::v1::meta::DeleteRangeRequest; -use api::v1::meta::PutRequest; -use api::v1::meta::RangeRequest; +use api::v1::meta::{DeleteRangeRequest, PutRequest, RangeRequest}; use meta_srv::service::store::etcd::EtcdStore; -use tracing::event; -use tracing::subscriber; -use tracing::Level; +use tracing::{event, subscriber, Level}; use tracing_subscriber::FmtSubscriber; fn main() { diff --git a/src/meta-srv/src/bootstrap.rs b/src/meta-srv/src/bootstrap.rs index 4ce1f847caef..c3616ee18234 100644 --- a/src/meta-srv/src/bootstrap.rs +++ b/src/meta-srv/src/bootstrap.rs @@ -7,8 +7,7 @@ use tokio_stream::wrappers::TcpListenerStream; use crate::election::etcd::EtcdElection; use crate::error; -use crate::metasrv::MetaSrv; -use crate::metasrv::MetaSrvOptions; +use crate::metasrv::{MetaSrv, MetaSrvOptions}; use crate::service::admin; use crate::service::store::etcd::EtcdStore; diff --git a/src/meta-srv/src/election/etcd.rs b/src/meta-srv/src/election/etcd.rs index e94653e34d2a..d1dcf982bbde 100644 --- a/src/meta-srv/src/election/etcd.rs +++ b/src/meta-srv/src/election/etcd.rs @@ -1,22 +1,15 @@ -use std::sync::atomic::AtomicBool; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use std::time::Duration; -use common_telemetry::info; -use common_telemetry::warn; +use common_telemetry::{info, warn}; use etcd_client::Client; -use snafu::OptionExt; -use snafu::ResultExt; +use snafu::{OptionExt, ResultExt}; -use crate::election::Election; -use crate::election::ELECTION_KEY; -use crate::election::LEASE_SECS; -use crate::election::PROCLAIM_PERIOD_SECS; +use crate::election::{Election, ELECTION_KEY, LEASE_SECS, PROCLAIM_PERIOD_SECS}; use crate::error; use crate::error::Result; -use crate::metasrv::ElectionRef; -use crate::metasrv::LeaderValue; +use crate::metasrv::{ElectionRef, LeaderValue}; pub struct EtcdElection { leader_value: String, diff --git a/src/meta-srv/src/error.rs b/src/meta-srv/src/error.rs index b35e9cd046ac..5817a03f7201 100644 --- a/src/meta-srv/src/error.rs +++ b/src/meta-srv/src/error.rs @@ -1,6 +1,5 @@ use common_error::prelude::*; -use tonic::Code; -use tonic::Status; +use tonic::{Code, Status}; #[derive(Debug, Snafu)] #[snafu(visibility(pub))] diff --git a/src/meta-srv/src/handler.rs b/src/meta-srv/src/handler.rs index de2ca2b50d09..c40dd8ce8d6b 100644 --- a/src/meta-srv/src/handler.rs +++ b/src/meta-srv/src/handler.rs @@ -5,9 +5,7 @@ pub(crate) mod response_header; use std::collections::BTreeMap; use std::sync::Arc; -use api::v1::meta::HeartbeatRequest; -use api::v1::meta::HeartbeatResponse; -use api::v1::meta::ResponseHeader; +use api::v1::meta::{HeartbeatRequest, HeartbeatResponse, ResponseHeader}; use common_telemetry::info; use tokio::sync::mpsc::Sender; use tokio::sync::RwLock; diff --git a/src/meta-srv/src/handler/check_leader.rs b/src/meta-srv/src/handler/check_leader.rs index 67ca01096245..13bae8cfddee 100644 --- a/src/meta-srv/src/handler/check_leader.rs +++ b/src/meta-srv/src/handler/check_leader.rs @@ -1,9 +1,7 @@ -use api::v1::meta::Error; -use api::v1::meta::HeartbeatRequest; +use api::v1::meta::{Error, HeartbeatRequest}; use crate::error::Result; -use crate::handler::HeartbeatAccumulator; -use crate::handler::HeartbeatHandler; +use crate::handler::{HeartbeatAccumulator, HeartbeatHandler}; use crate::metasrv::Context; pub struct CheckLeaderHandler; diff --git a/src/meta-srv/src/handler/datanode_lease.rs b/src/meta-srv/src/handler/datanode_lease.rs index 06ab50a0e814..da33c7d2502e 100644 --- a/src/meta-srv/src/handler/datanode_lease.rs +++ b/src/meta-srv/src/handler/datanode_lease.rs @@ -1,13 +1,10 @@ -use api::v1::meta::HeartbeatRequest; -use api::v1::meta::PutRequest; +use api::v1::meta::{HeartbeatRequest, PutRequest}; use common_telemetry::info; use common_time::util as time_util; use crate::error::Result; -use crate::handler::HeartbeatAccumulator; -use crate::handler::HeartbeatHandler; -use crate::keys::LeaseKey; -use crate::keys::LeaseValue; +use crate::handler::{HeartbeatAccumulator, HeartbeatHandler}; +use crate::keys::{LeaseKey, LeaseValue}; use crate::metasrv::Context; pub struct DatanodeLeaseHandler; @@ -57,9 +54,7 @@ mod tests { use std::sync::atomic::AtomicBool; use std::sync::Arc; - use api::v1::meta::Peer; - use api::v1::meta::RangeRequest; - use api::v1::meta::RequestHeader; + use api::v1::meta::{Peer, RangeRequest, RequestHeader}; use super::*; use crate::service::store::memory::MemStore; diff --git a/src/meta-srv/src/handler/response_header.rs b/src/meta-srv/src/handler/response_header.rs index be87232fd625..32ab981f85ce 100644 --- a/src/meta-srv/src/handler/response_header.rs +++ b/src/meta-srv/src/handler/response_header.rs @@ -1,10 +1,7 @@ -use api::v1::meta::HeartbeatRequest; -use api::v1::meta::ResponseHeader; -use api::v1::meta::PROTOCOL_VERSION; +use api::v1::meta::{HeartbeatRequest, ResponseHeader, PROTOCOL_VERSION}; use crate::error::Result; -use crate::handler::HeartbeatAccumulator; -use crate::handler::HeartbeatHandler; +use crate::handler::{HeartbeatAccumulator, HeartbeatHandler}; use crate::metasrv::Context; pub struct ResponseHeaderHandler; diff --git a/src/meta-srv/src/keys.rs b/src/meta-srv/src/keys.rs index ff25d55ba8e9..9b4aff18deed 100644 --- a/src/meta-srv/src/keys.rs +++ b/src/meta-srv/src/keys.rs @@ -4,11 +4,8 @@ use api::v1::meta::TableName; use common_catalog::TableGlobalKey; use lazy_static::lazy_static; use regex::Regex; -use serde::Deserialize; -use serde::Serialize; -use snafu::ensure; -use snafu::OptionExt; -use snafu::ResultExt; +use serde::{Deserialize, Serialize}; +use snafu::{ensure, OptionExt, ResultExt}; use crate::error; use crate::error::Result; diff --git a/src/meta-srv/src/lease.rs b/src/meta-srv/src/lease.rs index 1e90e201d2a0..f1d64343f1bb 100644 --- a/src/meta-srv/src/lease.rs +++ b/src/meta-srv/src/lease.rs @@ -1,9 +1,7 @@ use api::v1::meta::RangeRequest; use crate::error::Result; -use crate::keys::LeaseKey; -use crate::keys::LeaseValue; -use crate::keys::DN_LEASE_PREFIX; +use crate::keys::{LeaseKey, LeaseValue, DN_LEASE_PREFIX}; use crate::service::store::kv::KvStoreRef; use crate::util; diff --git a/src/meta-srv/src/metasrv.rs b/src/meta-srv/src/metasrv.rs index 8bd9793a528b..0bc66f55e3de 100644 --- a/src/meta-srv/src/metasrv.rs +++ b/src/meta-srv/src/metasrv.rs @@ -1,12 +1,9 @@ -use std::sync::atomic::AtomicBool; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; use api::v1::meta::Peer; -use common_telemetry::info; -use common_telemetry::warn; -use serde::Deserialize; -use serde::Serialize; +use common_telemetry::{info, warn}; +use serde::{Deserialize, Serialize}; use crate::election::Election; use crate::handler::check_leader::CheckLeaderHandler; @@ -15,8 +12,7 @@ use crate::handler::response_header::ResponseHeaderHandler; use crate::handler::HeartbeatHandlerGroup; use crate::selector::lease_based::LeaseBasedSelector; use crate::selector::Selector; -use crate::sequence::Sequence; -use crate::sequence::SequenceRef; +use crate::sequence::{Sequence, SequenceRef}; use crate::service::store::kv::KvStoreRef; pub const TABLE_ID_SEQ: &str = "table_id"; diff --git a/src/meta-srv/src/mocks.rs b/src/meta-srv/src/mocks.rs index f1ad3d836c97..34ac85b95c37 100644 --- a/src/meta-srv/src/mocks.rs +++ b/src/meta-srv/src/mocks.rs @@ -3,13 +3,10 @@ use std::sync::Arc; use api::v1::meta::heartbeat_server::HeartbeatServer; use api::v1::meta::router_server::RouterServer; use api::v1::meta::store_server::StoreServer; -use common_grpc::channel_manager::ChannelConfig; -use common_grpc::channel_manager::ChannelManager; +use common_grpc::channel_manager::{ChannelConfig, ChannelManager}; use tower::service_fn; -use crate::metasrv::MetaSrv; -use crate::metasrv::MetaSrvOptions; -use crate::metasrv::SelectorRef; +use crate::metasrv::{MetaSrv, MetaSrvOptions, SelectorRef}; use crate::service::store::etcd::EtcdStore; use crate::service::store::kv::KvStoreRef; use crate::service::store::memory::MemStore; diff --git a/src/meta-srv/src/selector/lease_based.rs b/src/meta-srv/src/selector/lease_based.rs index c4936011b4de..bfbd224120a6 100644 --- a/src/meta-srv/src/selector/lease_based.rs +++ b/src/meta-srv/src/selector/lease_based.rs @@ -2,12 +2,10 @@ use api::v1::meta::Peer; use common_time::util as time_util; use crate::error::Result; -use crate::keys::LeaseKey; -use crate::keys::LeaseValue; +use crate::keys::{LeaseKey, LeaseValue}; use crate::lease; use crate::metasrv::Context; -use crate::selector::Namespace; -use crate::selector::Selector; +use crate::selector::{Namespace, Selector}; pub struct LeaseBasedSelector; diff --git a/src/meta-srv/src/sequence.rs b/src/meta-srv/src/sequence.rs index 44e89ce4f939..555bcfc77a07 100644 --- a/src/meta-srv/src/sequence.rs +++ b/src/meta-srv/src/sequence.rs @@ -134,7 +134,8 @@ mod tests { use std::sync::Arc; use super::*; - use crate::service::store::{kv::KvStore, memory::MemStore}; + use crate::service::store::kv::KvStore; + use crate::service::store::memory::MemStore; #[tokio::test] async fn test_sequence() { diff --git a/src/meta-srv/src/service.rs b/src/meta-srv/src/service.rs index 0e8fabd8da44..58dc841e6a63 100644 --- a/src/meta-srv/src/service.rs +++ b/src/meta-srv/src/service.rs @@ -1,8 +1,7 @@ use std::pin::Pin; use futures::Stream; -use tonic::Response; -use tonic::Status; +use tonic::{Response, Status}; pub mod admin; mod heartbeat; diff --git a/src/meta-srv/src/service/admin.rs b/src/meta-srv/src/service/admin.rs index 510bcc8fdc86..13e32a6f59fb 100644 --- a/src/meta-srv/src/service/admin.rs +++ b/src/meta-srv/src/service/admin.rs @@ -3,14 +3,10 @@ mod health; use std::collections::HashMap; use std::convert::Infallible; use std::sync::Arc; -use std::task::Context; -use std::task::Poll; +use std::task::{Context, Poll}; use tonic::body::BoxBody; -use tonic::codegen::empty_body; -use tonic::codegen::http; -use tonic::codegen::BoxFuture; -use tonic::codegen::Service; +use tonic::codegen::{empty_body, http, BoxFuture, Service}; use tonic::transport::NamedService; use crate::metasrv::MetaSrv; diff --git a/src/meta-srv/src/service/heartbeat.rs b/src/meta-srv/src/service/heartbeat.rs index 3d8189ffe9c0..895a4bb9aa61 100644 --- a/src/meta-srv/src/service/heartbeat.rs +++ b/src/meta-srv/src/service/heartbeat.rs @@ -1,30 +1,20 @@ use std::io::ErrorKind; -use std::sync::atomic::AtomicU64; -use std::sync::atomic::Ordering; - -use api::v1::meta::heartbeat_server; -use api::v1::meta::AskLeaderRequest; -use api::v1::meta::AskLeaderResponse; -use api::v1::meta::HeartbeatRequest; -use api::v1::meta::HeartbeatResponse; -use api::v1::meta::Peer; -use api::v1::meta::ResponseHeader; -use common_telemetry::error; -use common_telemetry::info; -use common_telemetry::warn; +use std::sync::atomic::{AtomicU64, Ordering}; + +use api::v1::meta::{ + heartbeat_server, AskLeaderRequest, AskLeaderResponse, HeartbeatRequest, HeartbeatResponse, + Peer, ResponseHeader, +}; +use common_telemetry::{error, info, warn}; use futures::StreamExt; use tokio::sync::mpsc; use tokio_stream::wrappers::ReceiverStream; -use tonic::Request; -use tonic::Response; -use tonic::Streaming; +use tonic::{Request, Response, Streaming}; use crate::error; use crate::error::Result; -use crate::metasrv::Context; -use crate::metasrv::MetaSrv; -use crate::service::GrpcResult; -use crate::service::GrpcStream; +use crate::metasrv::{Context, MetaSrv}; +use crate::service::{GrpcResult, GrpcStream}; static PUSHER_ID: AtomicU64 = AtomicU64::new(0); diff --git a/src/meta-srv/src/service/router.rs b/src/meta-srv/src/service/router.rs index 976650fc5ba8..cdb34c3ecc96 100644 --- a/src/meta-srv/src/service/router.rs +++ b/src/meta-srv/src/service/router.rs @@ -1,31 +1,16 @@ -use api::v1::meta::router_server; -use api::v1::meta::CreateRequest; -use api::v1::meta::Error; -use api::v1::meta::PeerDict; -use api::v1::meta::PutRequest; -use api::v1::meta::RangeRequest; -use api::v1::meta::Region; -use api::v1::meta::RegionRoute; -use api::v1::meta::ResponseHeader; -use api::v1::meta::RouteRequest; -use api::v1::meta::RouteResponse; -use api::v1::meta::Table; -use api::v1::meta::TableRoute; -use api::v1::meta::TableRouteValue; -use common_catalog::TableGlobalKey; -use common_catalog::TableGlobalValue; +use api::v1::meta::{ + router_server, CreateRequest, Error, PeerDict, PutRequest, RangeRequest, Region, RegionRoute, + ResponseHeader, RouteRequest, RouteResponse, Table, TableRoute, TableRouteValue, +}; +use common_catalog::{TableGlobalKey, TableGlobalValue}; use common_telemetry::warn; -use snafu::OptionExt; -use snafu::ResultExt; -use tonic::Request; -use tonic::Response; +use snafu::{OptionExt, ResultExt}; +use tonic::{Request, Response}; use crate::error; use crate::error::Result; use crate::keys::TableRouteKey; -use crate::metasrv::Context; -use crate::metasrv::MetaSrv; -use crate::metasrv::SelectorRef; +use crate::metasrv::{Context, MetaSrv, SelectorRef}; use crate::sequence::SequenceRef; use crate::service::store::kv::KvStoreRef; use crate::service::GrpcResult; diff --git a/src/meta-srv/src/service/store.rs b/src/meta-srv/src/service/store.rs index 47096a067391..beef0408cc80 100644 --- a/src/meta-srv/src/service/store.rs +++ b/src/meta-srv/src/service/store.rs @@ -2,19 +2,11 @@ pub mod etcd; pub mod kv; pub mod memory; -use api::v1::meta::store_server; -use api::v1::meta::BatchPutRequest; -use api::v1::meta::BatchPutResponse; -use api::v1::meta::CompareAndPutRequest; -use api::v1::meta::CompareAndPutResponse; -use api::v1::meta::DeleteRangeRequest; -use api::v1::meta::DeleteRangeResponse; -use api::v1::meta::PutRequest; -use api::v1::meta::PutResponse; -use api::v1::meta::RangeRequest; -use api::v1::meta::RangeResponse; -use tonic::Request; -use tonic::Response; +use api::v1::meta::{ + store_server, BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, + DeleteRangeRequest, DeleteRangeResponse, PutRequest, PutResponse, RangeRequest, RangeResponse, +}; +use tonic::{Request, Response}; use crate::metasrv::MetaSrv; use crate::service::GrpcResult; diff --git a/src/meta-srv/src/service/store/etcd.rs b/src/meta-srv/src/service/store/etcd.rs index d7023cd48e6d..bf1573a7da9f 100644 --- a/src/meta-srv/src/service/store/etcd.rs +++ b/src/meta-srv/src/service/store/etcd.rs @@ -1,32 +1,18 @@ use std::sync::Arc; -use api::v1::meta::BatchPutRequest; -use api::v1::meta::BatchPutResponse; -use api::v1::meta::CompareAndPutRequest; -use api::v1::meta::CompareAndPutResponse; -use api::v1::meta::DeleteRangeRequest; -use api::v1::meta::DeleteRangeResponse; -use api::v1::meta::KeyValue; -use api::v1::meta::PutRequest; -use api::v1::meta::PutResponse; -use api::v1::meta::RangeRequest; -use api::v1::meta::RangeResponse; -use api::v1::meta::ResponseHeader; +use api::v1::meta::{ + BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, + DeleteRangeRequest, DeleteRangeResponse, KeyValue, PutRequest, PutResponse, RangeRequest, + RangeResponse, ResponseHeader, +}; use common_error::prelude::*; -use etcd_client::Client; -use etcd_client::Compare; -use etcd_client::CompareOp; -use etcd_client::DeleteOptions; -use etcd_client::GetOptions; -use etcd_client::PutOptions; -use etcd_client::Txn; -use etcd_client::TxnOp; -use etcd_client::TxnOpResponse; +use etcd_client::{ + Client, Compare, CompareOp, DeleteOptions, GetOptions, PutOptions, Txn, TxnOp, TxnOpResponse, +}; use crate::error; use crate::error::Result; -use crate::service::store::kv::KvStore; -use crate::service::store::kv::KvStoreRef; +use crate::service::store::kv::{KvStore, KvStoreRef}; #[derive(Clone)] pub struct EtcdStore { diff --git a/src/meta-srv/src/service/store/kv.rs b/src/meta-srv/src/service/store/kv.rs index 98978ba63e45..52bdf072ada4 100644 --- a/src/meta-srv/src/service/store/kv.rs +++ b/src/meta-srv/src/service/store/kv.rs @@ -1,15 +1,9 @@ use std::sync::Arc; -use api::v1::meta::BatchPutRequest; -use api::v1::meta::BatchPutResponse; -use api::v1::meta::CompareAndPutRequest; -use api::v1::meta::CompareAndPutResponse; -use api::v1::meta::DeleteRangeRequest; -use api::v1::meta::DeleteRangeResponse; -use api::v1::meta::PutRequest; -use api::v1::meta::PutResponse; -use api::v1::meta::RangeRequest; -use api::v1::meta::RangeResponse; +use api::v1::meta::{ + BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, + DeleteRangeRequest, DeleteRangeResponse, PutRequest, PutResponse, RangeRequest, RangeResponse, +}; use crate::error::Result; diff --git a/src/meta-srv/src/service/store/memory.rs b/src/meta-srv/src/service/store/memory.rs index d68d90f4368d..7caf219d2578 100644 --- a/src/meta-srv/src/service/store/memory.rs +++ b/src/meta-srv/src/service/store/memory.rs @@ -3,18 +3,11 @@ use std::collections::BTreeMap; use std::ops::Range; use std::sync::Arc; -use api::v1::meta::BatchPutRequest; -use api::v1::meta::BatchPutResponse; -use api::v1::meta::CompareAndPutRequest; -use api::v1::meta::CompareAndPutResponse; -use api::v1::meta::DeleteRangeRequest; -use api::v1::meta::DeleteRangeResponse; -use api::v1::meta::KeyValue; -use api::v1::meta::PutRequest; -use api::v1::meta::PutResponse; -use api::v1::meta::RangeRequest; -use api::v1::meta::RangeResponse; -use api::v1::meta::ResponseHeader; +use api::v1::meta::{ + BatchPutRequest, BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, + DeleteRangeRequest, DeleteRangeResponse, KeyValue, PutRequest, PutResponse, RangeRequest, + RangeResponse, ResponseHeader, +}; use parking_lot::RwLock; use crate::error::Result; diff --git a/src/object-store/src/lib.rs b/src/object-store/src/lib.rs index 03e47feb3752..83545a4e7d5e 100644 --- a/src/object-store/src/lib.rs +++ b/src/object-store/src/lib.rs @@ -1,6 +1,7 @@ +pub use opendal::io_util::SeekableReader; pub use opendal::{ - io_util::SeekableReader, layers, services, Accessor, DirEntry, DirStreamer, Layer, Object, - ObjectMetadata, ObjectMode, Operator as ObjectStore, + layers, services, Accessor, DirEntry, DirStreamer, Layer, Object, ObjectMetadata, ObjectMode, + Operator as ObjectStore, }; pub mod backend; pub mod util; diff --git a/src/object-store/tests/object_store_test.rs b/src/object-store/tests/object_store_test.rs index 920934d71f58..cb229b43a20d 100644 --- a/src/object-store/tests/object_store_test.rs +++ b/src/object-store/tests/object_store_test.rs @@ -2,10 +2,8 @@ use std::env; use anyhow::Result; use common_telemetry::logging; -use object_store::{ - backend::{fs, s3}, - util, DirStreamer, Object, ObjectMode, ObjectStore, -}; +use object_store::backend::{fs, s3}; +use object_store::{util, DirStreamer, Object, ObjectMode, ObjectStore}; use tempdir::TempDir; async fn test_object_crud(store: &ObjectStore) -> Result<()> { diff --git a/src/query/src/datafusion.rs b/src/query/src/datafusion.rs index 246f6bc3644d..ded7e41b2ab7 100644 --- a/src/query/src/datafusion.rs +++ b/src/query/src/datafusion.rs @@ -10,32 +10,30 @@ use catalog::CatalogListRef; use common_function::scalars::aggregate::AggregateFunctionMetaRef; use common_function::scalars::udf::create_udf; use common_function::scalars::FunctionRef; -use common_query::physical_plan::PhysicalPlanAdapter; -use common_query::physical_plan::{DfPhysicalPlanAdapter, PhysicalPlan}; -use common_query::{prelude::ScalarUdf, Output}; +use common_query::physical_plan::{DfPhysicalPlanAdapter, PhysicalPlan, PhysicalPlanAdapter}; +use common_query::prelude::ScalarUdf; +use common_query::Output; use common_recordbatch::adapter::RecordBatchStreamAdapter; use common_recordbatch::{EmptyRecordBatchStream, SendableRecordBatchStream}; use common_telemetry::timer; use datafusion::physical_plan::coalesce_partitions::CoalescePartitionsExec; use datafusion::physical_plan::ExecutionPlan; use snafu::{OptionExt, ResultExt}; +use sql::dialect::GenericDialect; +use sql::parser::ParserContext; use sql::statements::statement::Statement; -use sql::{dialect::GenericDialect, parser::ParserContext}; pub use crate::datafusion::catalog_adapter::DfCatalogListAdapter; -use crate::metric; +use crate::datafusion::planner::{DfContextProviderAdapter, DfPlanner}; +use crate::error::Result; +use crate::executor::QueryExecutor; +use crate::logical_optimizer::LogicalOptimizer; +use crate::physical_optimizer::PhysicalOptimizer; +use crate::physical_planner::PhysicalPlanner; +use crate::plan::LogicalPlan; +use crate::planner::Planner; use crate::query_engine::{QueryContext, QueryEngineState}; -use crate::{ - datafusion::planner::{DfContextProviderAdapter, DfPlanner}, - error::Result, - executor::QueryExecutor, - logical_optimizer::LogicalOptimizer, - physical_optimizer::PhysicalOptimizer, - physical_planner::PhysicalPlanner, - plan::LogicalPlan, - planner::Planner, - QueryEngine, -}; +use crate::{metric, QueryEngine}; pub(crate) struct DatafusionQueryEngine { state: QueryEngineState, @@ -238,8 +236,7 @@ mod tests { use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_query::Output; use common_recordbatch::util; - use datafusion::field_util::FieldExt; - use datafusion::field_util::SchemaExt; + use datafusion::field_util::{FieldExt, SchemaExt}; use table::table::numbers::NumbersTable; use crate::query_engine::{QueryEngineFactory, QueryEngineRef}; diff --git a/src/query/src/datafusion/catalog_adapter.rs b/src/query/src/datafusion/catalog_adapter.rs index ab4cfdceddef..220b5f0c7ab1 100644 --- a/src/query/src/datafusion/catalog_adapter.rs +++ b/src/query/src/datafusion/catalog_adapter.rs @@ -7,17 +7,15 @@ use catalog::error::Error; use catalog::{ CatalogListRef, CatalogProvider, CatalogProviderRef, SchemaProvider, SchemaProviderRef, }; -use datafusion::catalog::{ - catalog::{CatalogList as DfCatalogList, CatalogProvider as DfCatalogProvider}, - schema::SchemaProvider as DfSchemaProvider, +use datafusion::catalog::catalog::{ + CatalogList as DfCatalogList, CatalogProvider as DfCatalogProvider, }; +use datafusion::catalog::schema::SchemaProvider as DfSchemaProvider; use datafusion::datasource::TableProvider as DfTableProvider; use datafusion::error::Result as DataFusionResult; use snafu::ResultExt; -use table::{ - table::adapter::{DfTableProviderAdapter, TableAdapter}, - TableRef, -}; +use table::table::adapter::{DfTableProviderAdapter, TableAdapter}; +use table::TableRef; use crate::datafusion::error; diff --git a/src/query/src/datafusion/planner.rs b/src/query/src/datafusion/planner.rs index 0c3a989cfbaa..5cbed99d3fbf 100644 --- a/src/query/src/datafusion/planner.rs +++ b/src/query/src/datafusion/planner.rs @@ -11,8 +11,11 @@ use snafu::ResultExt; use sql::statements::query::Query; use sql::statements::statement::Statement; +use crate::datafusion::error; +use crate::error::Result; +use crate::plan::LogicalPlan; +use crate::planner::Planner; use crate::query_engine::QueryEngineState; -use crate::{datafusion::error, error::Result, plan::LogicalPlan, planner::Planner}; pub struct DfPlanner<'a, S: ContextProvider> { sql_to_rel: SqlToRel<'a, S>, diff --git a/src/query/src/executor.rs b/src/query/src/executor.rs index bc17ddd126ce..0d0e45c304ac 100644 --- a/src/query/src/executor.rs +++ b/src/query/src/executor.rs @@ -3,7 +3,8 @@ use std::sync::Arc; use common_query::physical_plan::PhysicalPlan; use common_recordbatch::SendableRecordBatchStream; -use crate::{error::Result, query_engine::QueryContext}; +use crate::error::Result; +use crate::query_engine::QueryContext; /// Executor to run [ExecutionPlan]. #[async_trait::async_trait] diff --git a/src/query/src/optimizer.rs b/src/query/src/optimizer.rs index 8d878d48037c..9bd012af9669 100644 --- a/src/query/src/optimizer.rs +++ b/src/query/src/optimizer.rs @@ -13,8 +13,7 @@ use datafusion::logical_plan::{ }; use datafusion::optimizer::optimizer::OptimizerRule; use datafusion::optimizer::utils; -use datafusion_common::Result; -use datafusion_common::{DFSchemaRef, DataFusionError, ScalarValue}; +use datafusion_common::{DFSchemaRef, DataFusionError, Result, ScalarValue}; /// TypeConversionRule converts some literal values in logical plan to other types according /// to data type of corresponding columns. diff --git a/src/query/src/physical_optimizer.rs b/src/query/src/physical_optimizer.rs index ad449043fca6..65bff044eac5 100644 --- a/src/query/src/physical_optimizer.rs +++ b/src/query/src/physical_optimizer.rs @@ -2,7 +2,8 @@ use std::sync::Arc; use common_query::physical_plan::PhysicalPlan; -use crate::{error::Result, query_engine::QueryContext}; +use crate::error::Result; +use crate::query_engine::QueryContext; pub trait PhysicalOptimizer { fn optimize_physical_plan( diff --git a/src/query/src/planner.rs b/src/query/src/planner.rs index 0814a037116c..413f13833534 100644 --- a/src/query/src/planner.rs +++ b/src/query/src/planner.rs @@ -1,6 +1,7 @@ use sql::statements::statement::Statement; -use crate::{error::Result, plan::LogicalPlan}; +use crate::error::Result; +use crate::plan::LogicalPlan; /// SQL logical planner. pub trait Planner: Send + Sync { diff --git a/src/query/tests/argmax_test.rs b/src/query/tests/argmax_test.rs index f8947f77a49f..fb9192ef1f60 100644 --- a/src/query/tests/argmax_test.rs +++ b/src/query/tests/argmax_test.rs @@ -3,8 +3,7 @@ mod function; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::types::PrimitiveElement; diff --git a/src/query/tests/argmin_test.rs b/src/query/tests/argmin_test.rs index 34334b1341eb..d4b025d0ffc0 100644 --- a/src/query/tests/argmin_test.rs +++ b/src/query/tests/argmin_test.rs @@ -4,8 +4,7 @@ mod function; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::types::PrimitiveElement; diff --git a/src/query/tests/mean_test.rs b/src/query/tests/mean_test.rs index cebd5b835303..f43f2cd8a9e4 100644 --- a/src/query/tests/mean_test.rs +++ b/src/query/tests/mean_test.rs @@ -4,8 +4,7 @@ mod function; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::types::PrimitiveElement; diff --git a/src/query/tests/my_sum_udaf_example.rs b/src/query/tests/my_sum_udaf_example.rs index b28d8e9ddf45..b3ccb2a489bb 100644 --- a/src/query/tests/my_sum_udaf_example.rs +++ b/src/query/tests/my_sum_udaf_example.rs @@ -7,10 +7,8 @@ use catalog::{CatalogList, CatalogProvider, SchemaProvider}; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_function::scalars::aggregate::AggregateFunctionMeta; use common_function_macro::{as_aggr_func_creator, AggrFuncTypeStore}; -use common_query::error::CreateAccumulatorSnafu; -use common_query::error::Result as QueryResult; -use common_query::logical_plan::Accumulator; -use common_query::logical_plan::AggregateFunctionCreator; +use common_query::error::{CreateAccumulatorSnafu, Result as QueryResult}; +use common_query::logical_plan::{Accumulator, AggregateFunctionCreator}; use common_query::prelude::*; use common_query::Output; use common_recordbatch::{util, RecordBatch}; @@ -18,8 +16,7 @@ use datafusion::arrow_print; use datafusion_common::record_batch::RecordBatch as DfRecordBatch; use datatypes::prelude::*; use datatypes::schema::{ColumnSchema, Schema}; -use datatypes::types::PrimitiveElement; -use datatypes::types::PrimitiveType; +use datatypes::types::{PrimitiveElement, PrimitiveType}; use datatypes::vectors::PrimitiveVector; use datatypes::with_match_primitive_type_id; use num_traits::AsPrimitive; diff --git a/src/query/tests/percentile_test.rs b/src/query/tests/percentile_test.rs index 56e17d2575d1..1ef674705e74 100644 --- a/src/query/tests/percentile_test.rs +++ b/src/query/tests/percentile_test.rs @@ -6,8 +6,7 @@ use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::schema::{ColumnSchema, Schema}; diff --git a/src/query/tests/polyval_test.rs b/src/query/tests/polyval_test.rs index 602e51889ed6..5b37849dc339 100644 --- a/src/query/tests/polyval_test.rs +++ b/src/query/tests/polyval_test.rs @@ -4,8 +4,7 @@ mod function; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::types::PrimitiveElement; diff --git a/src/query/tests/pow.rs b/src/query/tests/pow.rs index a93d1f5b816d..09af588d49fe 100644 --- a/src/query/tests/pow.rs +++ b/src/query/tests/pow.rs @@ -1,8 +1,7 @@ use std::sync::Arc; use common_query::error::Result; -use datatypes::prelude::ScalarVector; -use datatypes::prelude::Vector; +use datatypes::prelude::{ScalarVector, Vector}; use datatypes::vectors::{UInt32Vector, VectorRef}; pub fn pow(args: &[VectorRef]) -> Result { diff --git a/src/query/tests/query_engine_test.rs b/src/query/tests/query_engine_test.rs index d0af4ab9022c..1a515158e883 100644 --- a/src/query/tests/query_engine_test.rs +++ b/src/query/tests/query_engine_test.rs @@ -10,8 +10,7 @@ use common_query::prelude::{create_udf, make_scalar_function, Volatility}; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datafusion::logical_plan::LogicalPlanBuilder; use datatypes::for_all_primitive_types; use datatypes::prelude::*; diff --git a/src/query/tests/scipy_stats_norm_cdf_test.rs b/src/query/tests/scipy_stats_norm_cdf_test.rs index a53502b1676b..ae531527e59d 100644 --- a/src/query/tests/scipy_stats_norm_cdf_test.rs +++ b/src/query/tests/scipy_stats_norm_cdf_test.rs @@ -4,8 +4,7 @@ mod function; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::types::PrimitiveElement; diff --git a/src/query/tests/scipy_stats_norm_pdf.rs b/src/query/tests/scipy_stats_norm_pdf.rs index d99dca4cb2ef..b744f38afa30 100644 --- a/src/query/tests/scipy_stats_norm_pdf.rs +++ b/src/query/tests/scipy_stats_norm_pdf.rs @@ -4,8 +4,7 @@ mod function; use common_query::Output; use common_recordbatch::error::Result as RecordResult; use common_recordbatch::{util, RecordBatch}; -use datafusion::field_util::FieldExt; -use datafusion::field_util::SchemaExt; +use datafusion::field_util::{FieldExt, SchemaExt}; use datatypes::for_all_primitive_types; use datatypes::prelude::*; use datatypes::types::PrimitiveElement; diff --git a/src/script/src/manager.rs b/src/script/src/manager.rs index 1b476f5fc53c..d1ed208c6d16 100644 --- a/src/script/src/manager.rs +++ b/src/script/src/manager.rs @@ -88,8 +88,10 @@ mod tests { use super::*; type DefaultEngine = MitoEngine>; - use log_store::fs::{config::LogConfig, log::LocalFileLogStore}; - use storage::{config::EngineConfig as StorageEngineConfig, EngineImpl}; + use log_store::fs::config::LogConfig; + use log_store::fs::log::LocalFileLogStore; + use storage::config::EngineConfig as StorageEngineConfig; + use storage::EngineImpl; use table_engine::engine::MitoEngine; use tempdir::TempDir; diff --git a/src/script/src/python/builtins/mod.rs b/src/script/src/python/builtins/mod.rs index fcce9c71e390..a7b03485dd3d 100644 --- a/src/script/src/python/builtins/mod.rs +++ b/src/script/src/python/builtins/mod.rs @@ -12,12 +12,8 @@ use datatypes::arrow::array::ArrayRef; use datatypes::arrow::compute::cast::CastOptions; use datatypes::arrow::datatypes::DataType; use datatypes::vectors::Helper as HelperVec; -use rustpython_vm::builtins::PyList; -use rustpython_vm::pymodule; -use rustpython_vm::{ - builtins::{PyBaseExceptionRef, PyBool, PyFloat, PyInt, PyStr}, - AsObject, PyObjectRef, PyPayload, PyResult, VirtualMachine, -}; +use rustpython_vm::builtins::{PyBaseExceptionRef, PyBool, PyFloat, PyInt, PyList, PyStr}; +use rustpython_vm::{pymodule, AsObject, PyObjectRef, PyPayload, PyResult, VirtualMachine}; use crate::python::utils::is_instance; use crate::python::PyVector; @@ -274,45 +270,31 @@ pub(crate) mod greptime_builtin { // P.S.: not extract to file because not-inlined proc macro attribute is *unstable* use std::sync::Arc; - use common_function::scalars::{ - function::FunctionContext, math::PowFunction, Function, FunctionRef, FUNCTION_REGISTRY, - }; - use datafusion::{ - arrow::{ - compute::comparison::{gt_eq_scalar, lt_eq_scalar}, - datatypes::DataType, - error::ArrowError, - scalar::{PrimitiveScalar, Scalar}, - }, - physical_plan::expressions, - }; + use common_function::scalars::function::FunctionContext; + use common_function::scalars::math::PowFunction; + use common_function::scalars::{Function, FunctionRef, FUNCTION_REGISTRY}; + use datafusion::arrow::compute::comparison::{gt_eq_scalar, lt_eq_scalar}; + use datafusion::arrow::datatypes::DataType; + use datafusion::arrow::error::ArrowError; + use datafusion::arrow::scalar::{PrimitiveScalar, Scalar}; + use datafusion::physical_plan::expressions; use datafusion_expr::ColumnarValue as DFColValue; use datafusion_physical_expr::math_expressions; - use datatypes::vectors::{ConstantVector, Float64Vector, Helper, Int64Vector}; - use datatypes::{ - arrow::{ - self, - array::{ArrayRef, NullArray}, - compute, - }, - vectors::VectorRef, - }; + use datatypes::arrow::array::{ArrayRef, NullArray}; + use datatypes::arrow::{self, compute}; + use datatypes::vectors::{ConstantVector, Float64Vector, Helper, Int64Vector, VectorRef}; use paste::paste; - use rustpython_vm::{ - builtins::{PyFloat, PyFunction, PyInt, PyStr}, - function::{FuncArgs, KwArgs, OptionalArg}, - AsObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, - }; + use rustpython_vm::builtins::{PyFloat, PyFunction, PyInt, PyStr}; + use rustpython_vm::function::{FuncArgs, KwArgs, OptionalArg}; + use rustpython_vm::{AsObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine}; use crate::python::builtins::{ all_to_f64, eval_aggr_fn, from_df_err, try_into_columnar_value, try_into_py_obj, type_cast_error, }; - use crate::python::{ - utils::{is_instance, py_vec_obj_to_array, PyVectorRef}, - vector::val_to_pyobj, - PyVector, - }; + use crate::python::utils::{is_instance, py_vec_obj_to_array, PyVectorRef}; + use crate::python::vector::val_to_pyobj; + use crate::python::PyVector; #[pyfunction] fn vector(args: OptionalArg, vm: &VirtualMachine) -> PyResult { diff --git a/src/script/src/python/builtins/test.rs b/src/script/src/python/builtins/test.rs index 1d310abdcc5c..50618cd0353d 100644 --- a/src/script/src/python/builtins/test.rs +++ b/src/script/src/python/builtins/test.rs @@ -1,25 +1,24 @@ -use std::{collections::HashMap, fs::File, io::Read, path::Path, sync::Arc}; +use std::collections::HashMap; +use std::fs::File; +use std::io::Read; +use std::path::Path; +use std::sync::Arc; -use arrow::{ - array::{Float64Array, Int64Array, PrimitiveArray}, - compute::cast::CastOptions, - datatypes::DataType, -}; +use arrow::array::{Float64Array, Int64Array, PrimitiveArray}; +use arrow::compute::cast::CastOptions; +use arrow::datatypes::DataType; use datatypes::vectors::VectorRef; use ron::from_str as from_ron_string; +use rustpython_vm::builtins::{PyFloat, PyInt, PyList}; use rustpython_vm::class::PyClassImpl; -use rustpython_vm::{ - builtins::{PyFloat, PyInt, PyList}, - convert::ToPyObject, - scope::Scope, - AsObject, PyObjectRef, VirtualMachine, -}; +use rustpython_vm::convert::ToPyObject; +use rustpython_vm::scope::Scope; +use rustpython_vm::{AsObject, PyObjectRef, VirtualMachine}; use serde::{Deserialize, Serialize}; -use super::greptime_builtin; -use super::*; -use crate::python::utils::format_py_error; -use crate::python::{utils::is_instance, PyVector}; +use super::{greptime_builtin, *}; +use crate::python::utils::{format_py_error, is_instance}; +use crate::python::PyVector; #[test] fn convert_scalar_to_py_obj_and_back() { rustpython_vm::Interpreter::with_init(Default::default(), |vm| { diff --git a/src/script/src/python/coprocessor.rs b/src/script/src/python/coprocessor.rs index c47fd7578fd9..39e527d3c4e6 100644 --- a/src/script/src/python/coprocessor.rs +++ b/src/script/src/python/coprocessor.rs @@ -12,11 +12,11 @@ use datatypes::arrow::array::{Array, ArrayRef}; use datatypes::arrow::compute::cast::CastOptions; use datatypes::arrow::datatypes::{DataType, Field, Schema as ArrowSchema}; use datatypes::schema::Schema; -use datatypes::vectors::Helper; -use datatypes::vectors::{BooleanVector, StringVector, Vector, VectorRef}; +use datatypes::vectors::{BooleanVector, Helper, StringVector, Vector, VectorRef}; use rustpython_bytecode::CodeObject; use rustpython_vm as vm; -use rustpython_vm::{class::PyClassImpl, AsObject}; +use rustpython_vm::class::PyClassImpl; +use rustpython_vm::AsObject; #[cfg(test)] use serde::Deserialize; use snafu::{OptionExt, ResultExt}; @@ -29,8 +29,8 @@ use crate::python::coprocessor::parse::DecoratorArgs; use crate::python::error::{ ensure, ret_other_error_with, ArrowSnafu, OtherSnafu, Result, TypeCastSnafu, }; -use crate::python::utils::{format_py_error, py_vec_obj_to_array}; -use crate::python::{utils::is_instance, PyVector}; +use crate::python::utils::{format_py_error, is_instance, py_vec_obj_to_array}; +use crate::python::PyVector; #[cfg_attr(test, derive(Deserialize))] #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/src/script/src/python/coprocessor/compile.rs b/src/script/src/python/coprocessor/compile.rs index 196684d711fd..151a0dbd882a 100644 --- a/src/script/src/python/coprocessor/compile.rs +++ b/src/script/src/python/coprocessor/compile.rs @@ -2,11 +2,8 @@ use rustpython_bytecode::CodeObject; use rustpython_compiler_core::compile as python_compile; -use rustpython_parser::{ - ast, - ast::{Located, Location}, - parser, -}; +use rustpython_parser::ast::{Located, Location}; +use rustpython_parser::{ast, parser}; use snafu::ResultExt; use crate::fail_parse_error; diff --git a/src/script/src/python/coprocessor/parse.rs b/src/script/src/python/coprocessor/parse.rs index c3f479721899..f329a002e246 100644 --- a/src/script/src/python/coprocessor/parse.rs +++ b/src/script/src/python/coprocessor/parse.rs @@ -1,18 +1,13 @@ use std::collections::HashSet; use datatypes::arrow::datatypes::DataType; -use rustpython_parser::{ - ast, - ast::{Arguments, Location}, - parser, -}; +use rustpython_parser::ast::{Arguments, Location}; +use rustpython_parser::{ast, parser}; #[cfg(test)] use serde::Deserialize; use snafu::{OptionExt, ResultExt}; -use crate::python::coprocessor::compile; -use crate::python::coprocessor::AnnotationInfo; -use crate::python::coprocessor::Coprocessor; +use crate::python::coprocessor::{compile, AnnotationInfo, Coprocessor}; use crate::python::error::{ensure, CoprParseSnafu, PyParseSnafu, Result}; #[cfg_attr(test, derive(Deserialize))] diff --git a/src/script/src/python/engine.rs b/src/script/src/python/engine.rs index acdee232ad37..1f52a541c932 100644 --- a/src/script/src/python/engine.rs +++ b/src/script/src/python/engine.rs @@ -7,10 +7,8 @@ use std::task::{Context, Poll}; use async_trait::async_trait; use common_error::prelude::BoxedError; use common_query::Output; -use common_recordbatch::{ - error::ExternalSnafu, error::Result as RecordBatchResult, RecordBatch, RecordBatchStream, - SendableRecordBatchStream, -}; +use common_recordbatch::error::{ExternalSnafu, Result as RecordBatchResult}; +use common_recordbatch::{RecordBatch, RecordBatchStream, SendableRecordBatchStream}; use datatypes::schema::SchemaRef; use futures::Stream; use query::QueryEngineRef; @@ -18,11 +16,8 @@ use snafu::{ensure, ResultExt}; use sql::statements::statement::Statement; use crate::engine::{CompileContext, EvalContext, Script, ScriptEngine}; -use crate::python::coprocessor::{exec_parsed, parse}; -use crate::python::{ - coprocessor::CoprocessorRef, - error::{self, Result}, -}; +use crate::python::coprocessor::{exec_parsed, parse, CoprocessorRef}; +use crate::python::error::{self, Result}; const PY_ENGINE: &str = "python"; @@ -137,10 +132,8 @@ mod tests { use catalog::{CatalogList, CatalogProvider, SchemaProvider}; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_recordbatch::util; - use datafusion_common::field_util::FieldExt; - use datafusion_common::field_util::SchemaExt; - use datatypes::arrow::array::Float64Array; - use datatypes::arrow::array::Int64Array; + use datafusion_common::field_util::{FieldExt, SchemaExt}; + use datatypes::arrow::array::{Float64Array, Int64Array}; use query::QueryEngineFactory; use table::table::numbers::NumbersTable; diff --git a/src/script/src/python/error.rs b/src/script/src/python/error.rs index 43c7c46c135e..8c418af44d8d 100644 --- a/src/script/src/python/error.rs +++ b/src/script/src/python/error.rs @@ -5,9 +5,11 @@ use datatypes::arrow::error::ArrowError; use datatypes::error::Error as DataTypeError; use query::error::Error as QueryError; use rustpython_compiler_core::error::CompileError as CoreCompileError; -use rustpython_parser::{ast::Location, error::ParseError}; +use rustpython_parser::ast::Location; +use rustpython_parser::error::ParseError; pub use snafu::ensure; -use snafu::{prelude::Snafu, Backtrace}; +use snafu::prelude::Snafu; +use snafu::Backtrace; pub type Result = std::result::Result; pub(crate) fn ret_other_error_with(reason: String) -> OtherSnafu { diff --git a/src/script/src/python/test.rs b/src/script/src/python/test.rs index b307d8568379..6cca4eb7b685 100644 --- a/src/script/src/python/test.rs +++ b/src/script/src/python/test.rs @@ -15,11 +15,10 @@ use rustpython_parser::parser; use serde::{Deserialize, Serialize}; use super::error::{get_error_reason_loc, visualize_loc}; -use crate::python::coprocessor::AnnotationInfo; -use crate::python::error::pretty_print_error_in_src; -use crate::python::{ - coprocessor, coprocessor::parse::parse_and_compile_copr, coprocessor::Coprocessor, error::Error, -}; +use crate::python::coprocessor; +use crate::python::coprocessor::parse::parse_and_compile_copr; +use crate::python::coprocessor::{AnnotationInfo, Coprocessor}; +use crate::python::error::{pretty_print_error_in_src, Error}; #[derive(Deserialize, Debug)] struct TestCase { diff --git a/src/script/src/python/utils.rs b/src/script/src/python/utils.rs index 4b06e552f6c2..5e4415ea3eb3 100644 --- a/src/script/src/python/utils.rs +++ b/src/script/src/python/utils.rs @@ -4,16 +4,13 @@ use datafusion::arrow::array::{ArrayRef, BooleanArray, NullArray, PrimitiveArray use datafusion_common::ScalarValue; use datafusion_expr::ColumnarValue as DFColValue; use datatypes::arrow::datatypes::DataType; -use rustpython_vm::builtins::{PyBool, PyFloat, PyInt, PyList, PyStr}; -use rustpython_vm::{builtins::PyBaseExceptionRef, PyObjectRef, PyPayload, PyRef, VirtualMachine}; -use snafu::OptionExt; -use snafu::ResultExt; -use snafu::{Backtrace, GenerateImplicitData}; +use rustpython_vm::builtins::{PyBaseExceptionRef, PyBool, PyFloat, PyInt, PyList, PyStr}; +use rustpython_vm::{PyObjectRef, PyPayload, PyRef, VirtualMachine}; +use snafu::{Backtrace, GenerateImplicitData, OptionExt, ResultExt}; use crate::python::builtins::try_into_columnar_value; -use crate::python::error; use crate::python::error::ret_other_error_with; -use crate::python::PyVector; +use crate::python::{error, PyVector}; pub(crate) type PyVectorRef = PyRef; diff --git a/src/script/src/python/vector.rs b/src/script/src/python/vector.rs index c3b583002b02..021b51ddbc58 100644 --- a/src/script/src/python/vector.rs +++ b/src/script/src/python/vector.rs @@ -4,40 +4,27 @@ use std::sync::Arc; use common_time::date::Date; use common_time::datetime::DateTime; use common_time::timestamp::Timestamp; -use datatypes::arrow; -use datatypes::arrow::array::BooleanArray; +use datatypes::arrow::array::{Array, ArrayRef, BooleanArray, PrimitiveArray}; use datatypes::arrow::compute; +use datatypes::arrow::compute::cast::{self, CastOptions}; +use datatypes::arrow::compute::{arithmetics, comparison}; use datatypes::arrow::datatypes::DataType; use datatypes::arrow::scalar::{PrimitiveScalar, Scalar}; -use datatypes::arrow::{ - array::{Array, ArrayRef, PrimitiveArray}, - compute::{ - arithmetics, - cast::{self, CastOptions}, - comparison, - }, -}; use datatypes::data_type::ConcreteDataType; use datatypes::prelude::Value; use datatypes::value::OrderedFloat; -use datatypes::{ - value, - vectors::{Helper, NullVector, VectorBuilder, VectorRef}, -}; -use rustpython_vm::function::{Either, PyComparisonValue}; -use rustpython_vm::types::{Comparable, PyComparisonOp}; +use datatypes::vectors::{Helper, NullVector, VectorBuilder, VectorRef}; +use datatypes::{arrow, value}; +use rustpython_vm::builtins::{PyBaseExceptionRef, PyBool, PyBytes, PyFloat, PyInt, PyNone, PyStr}; +use rustpython_vm::function::{Either, OptionalArg, PyComparisonValue}; +use rustpython_vm::protocol::{PyMappingMethods, PySequenceMethods}; +use rustpython_vm::sliceable::{SaturatedSlice, SequenceIndex, SequenceIndexOp}; +use rustpython_vm::types::{AsMapping, AsSequence, Comparable, PyComparisonOp}; use rustpython_vm::{ - builtins::{PyBaseExceptionRef, PyBool, PyBytes, PyFloat, PyInt, PyNone, PyStr}, - function::OptionalArg, - protocol::{PyMappingMethods, PySequenceMethods}, - pyclass, pyimpl, - sliceable::{SaturatedSlice, SequenceIndex, SequenceIndexOp}, - types::{AsMapping, AsSequence}, - AsObject, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, + pyclass, pyimpl, AsObject, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine, }; -use crate::python::utils::is_instance; -use crate::python::utils::PyVectorRef; +use crate::python::utils::{is_instance, PyVectorRef}; #[pyclass(module = false, name = "vector")] #[derive(PyPayload, Debug)] @@ -1033,7 +1020,9 @@ pub mod tests { use std::sync::Arc; use datatypes::vectors::{Float32Vector, Int32Vector, NullVector}; - use rustpython_vm::{builtins::PyList, class::PyClassImpl, protocol::PySequence}; + use rustpython_vm::builtins::PyList; + use rustpython_vm::class::PyClassImpl; + use rustpython_vm::protocol::PySequence; use value::Value; use super::*; diff --git a/src/script/src/table.rs b/src/script/src/table.rs index bd45875bb15a..fa5b4b462402 100644 --- a/src/script/src/table.rs +++ b/src/script/src/table.rs @@ -10,8 +10,7 @@ use common_telemetry::logging; use common_time::timestamp::Timestamp; use common_time::util; use datatypes::arrow::array::Utf8Array; -use datatypes::prelude::ConcreteDataType; -use datatypes::prelude::ScalarVector; +use datatypes::prelude::{ConcreteDataType, ScalarVector}; use datatypes::schema::{ColumnSchema, Schema, SchemaBuilder}; use datatypes::vectors::{StringVector, TimestampVector, VectorRef}; use query::QueryEngineRef; diff --git a/src/servers/src/error.rs b/src/servers/src/error.rs index 9c144f0d0996..51fc7e73f785 100644 --- a/src/servers/src/error.rs +++ b/src/servers/src/error.rs @@ -2,10 +2,8 @@ use std::any::Any; use std::net::SocketAddr; use axum::http::StatusCode as HttpStatusCode; -use axum::{ - response::{IntoResponse, Response}, - Json, -}; +use axum::response::{IntoResponse, Response}; +use axum::Json; use common_error::prelude::*; use serde_json::json; diff --git a/src/servers/src/grpc.rs b/src/servers/src/grpc.rs index b7a4599610d7..97588f529248 100644 --- a/src/servers/src/grpc.rs +++ b/src/servers/src/grpc.rs @@ -8,8 +8,7 @@ use async_trait::async_trait; use common_runtime::Runtime; use common_telemetry::logging::info; use futures::FutureExt; -use snafu::ensure; -use snafu::ResultExt; +use snafu::{ensure, ResultExt}; use tokio::net::TcpListener; use tokio::sync::oneshot::{self, Sender}; use tokio::sync::Mutex; diff --git a/src/servers/src/http.rs b/src/servers/src/http.rs index ea5f36b7cad8..fc913ce28656 100644 --- a/src/servers/src/http.rs +++ b/src/servers/src/http.rs @@ -9,14 +9,13 @@ use std::net::SocketAddr; use std::sync::Arc; use std::time::Duration; -use aide::axum::routing as apirouting; -use aide::axum::{ApiRouter, IntoApiResponse}; +use aide::axum::{routing as apirouting, ApiRouter, IntoApiResponse}; use aide::openapi::{Info, OpenApi, Server as OpenAPIServer}; use async_trait::async_trait; +use axum::error_handling::HandleErrorLayer; use axum::middleware::{self}; -use axum::response::Html; -use axum::Extension; -use axum::{error_handling::HandleErrorLayer, response::Json, routing, BoxError, Router}; +use axum::response::{Html, Json}; +use axum::{routing, BoxError, Extension, Router}; use common_error::prelude::ErrorExt; use common_error::status_code::StatusCode; use common_query::Output; @@ -27,19 +26,18 @@ use futures::FutureExt; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; use serde_json::Value; -use snafu::ensure; -use snafu::ResultExt; +use snafu::{ensure, ResultExt}; use tokio::sync::oneshot::{self, Sender}; use tokio::sync::Mutex; -use tower::{timeout::TimeoutLayer, ServiceBuilder}; +use tower::timeout::TimeoutLayer; +use tower::ServiceBuilder; use tower_http::trace::TraceLayer; use self::influxdb::influxdb_write; use crate::error::{AlreadyStartedSnafu, Result, StartHttpSnafu}; -use crate::query_handler::SqlQueryHandlerRef; use crate::query_handler::{ InfluxdbLineProtocolHandlerRef, OpentsdbProtocolHandlerRef, PrometheusProtocolHandlerRef, - ScriptHandlerRef, + ScriptHandlerRef, SqlQueryHandlerRef, }; use crate::server::Server; diff --git a/src/servers/src/http/context.rs b/src/servers/src/http/context.rs index dd1a84315dc0..8a2050a1a120 100644 --- a/src/servers/src/http/context.rs +++ b/src/servers/src/http/context.rs @@ -1,9 +1,7 @@ -use axum::{ - http, - http::{Request, StatusCode}, - middleware::Next, - response::Response, -}; +use axum::http; +use axum::http::{Request, StatusCode}; +use axum::middleware::Next; +use axum::response::Response; use common_telemetry::error; use crate::context::{AuthMethod, Channel, CtxBuilder}; diff --git a/src/servers/src/http/influxdb.rs b/src/servers/src/http/influxdb.rs index 9a561fac92d1..5b8695e22630 100644 --- a/src/servers/src/http/influxdb.rs +++ b/src/servers/src/http/influxdb.rs @@ -5,8 +5,7 @@ use axum::http::StatusCode; use common_catalog::consts::DEFAULT_SCHEMA_NAME; use common_grpc::writer::Precision; -use crate::error::Result; -use crate::error::TimePrecisionSnafu; +use crate::error::{Result, TimePrecisionSnafu}; use crate::influxdb::InfluxdbRequest; use crate::query_handler::InfluxdbLineProtocolHandlerRef; diff --git a/src/servers/src/http/prometheus.rs b/src/servers/src/http/prometheus.rs index e286bcf75c35..02a62973e741 100644 --- a/src/servers/src/http/prometheus.rs +++ b/src/servers/src/http/prometheus.rs @@ -1,7 +1,6 @@ use api::prometheus::remote::{ReadRequest, WriteRequest}; use axum::extract::{Query, RawBody, State}; -use axum::http::header; -use axum::http::StatusCode; +use axum::http::{header, StatusCode}; use axum::response::IntoResponse; use common_catalog::consts::DEFAULT_SCHEMA_NAME; use hyper::Body; diff --git a/src/servers/src/influxdb.rs b/src/servers/src/influxdb.rs index d09029bbc997..c8e755600c4d 100644 --- a/src/servers/src/influxdb.rs +++ b/src/servers/src/influxdb.rs @@ -1,9 +1,7 @@ use std::collections::HashMap; -use api::v1::{ - insert_expr::{self, Expr}, - InsertExpr, -}; +use api::v1::insert_expr::{self, Expr}; +use api::v1::InsertExpr; use common_grpc::writer::{LinesWriter, Precision}; use influxdb_line_protocol::{parse_lines, FieldValue}; use snafu::ResultExt; @@ -168,17 +166,18 @@ impl TryFrom<&InfluxdbRequest> for Vec { #[cfg(test)] mod tests { - use std::{ops::Deref, sync::Arc}; - - use api::v1::{ - codec::InsertBatch, - column::{SemanticType, Values}, - insert_expr::Expr, - Column, ColumnDataType, InsertExpr, - }; + use std::ops::Deref; + use std::sync::Arc; + + use api::v1::codec::InsertBatch; + use api::v1::column::{SemanticType, Values}; + use api::v1::insert_expr::Expr; + use api::v1::{Column, ColumnDataType, InsertExpr}; use common_base::BitVec; - use common_time::{timestamp::TimeUnit, Timestamp}; - use datatypes::{value::Value, vectors::Vector}; + use common_time::timestamp::TimeUnit; + use common_time::Timestamp; + use datatypes::value::Value; + use datatypes::vectors::Vector; use table::requests::InsertRequest; use crate::influxdb::InfluxdbRequest; diff --git a/src/servers/src/line_writer.rs b/src/servers/src/line_writer.rs index a2196b45b6da..e11ede723c05 100644 --- a/src/servers/src/line_writer.rs +++ b/src/servers/src/line_writer.rs @@ -2,13 +2,12 @@ use std::collections::HashMap; use common_catalog::consts::DEFAULT_CATALOG_NAME; use common_grpc::writer::{to_ms_ts, Precision}; -use common_time::{timestamp::TimeUnit::Millisecond, Timestamp}; -use datatypes::{ - prelude::ConcreteDataType, - types::TimestampType, - value::Value, - vectors::{VectorBuilder, VectorRef}, -}; +use common_time::timestamp::TimeUnit::Millisecond; +use common_time::Timestamp; +use datatypes::prelude::ConcreteDataType; +use datatypes::types::TimestampType; +use datatypes::value::Value; +use datatypes::vectors::{VectorBuilder, VectorRef}; use table::requests::InsertRequest; type ColumnLen = usize; @@ -137,7 +136,8 @@ mod tests { use common_catalog::consts::DEFAULT_SCHEMA_NAME; use common_time::Timestamp; - use datatypes::{value::Value, vectors::Vector}; + use datatypes::value::Value; + use datatypes::vectors::Vector; use crate::line_writer::{LineWriter, Precision}; diff --git a/src/servers/src/mysql/handler.rs b/src/servers/src/mysql/handler.rs index 620fd799ba6e..d200e306d8b4 100644 --- a/src/servers/src/mysql/handler.rs +++ b/src/servers/src/mysql/handler.rs @@ -3,11 +3,9 @@ use std::sync::Arc; use async_trait::async_trait; use common_telemetry::error; -use opensrv_mysql::AsyncMysqlShim; -use opensrv_mysql::ErrorKind; -use opensrv_mysql::ParamParser; -use opensrv_mysql::QueryResultWriter; -use opensrv_mysql::StatementMetaWriter; +use opensrv_mysql::{ + AsyncMysqlShim, ErrorKind, ParamParser, QueryResultWriter, StatementMetaWriter, +}; use rand::RngCore; use tokio::sync::RwLock; diff --git a/src/servers/src/opentsdb/codec.rs b/src/servers/src/opentsdb/codec.rs index cd7f2ea2aa9a..7871f7e05798 100644 --- a/src/servers/src/opentsdb/codec.rs +++ b/src/servers/src/opentsdb/codec.rs @@ -1,7 +1,8 @@ use std::collections::HashMap; use api::v1::codec::InsertBatch; -use api::v1::{column, column::SemanticType, insert_expr, Column, ColumnDataType, InsertExpr}; +use api::v1::column::SemanticType; +use api::v1::{column, insert_expr, Column, ColumnDataType, InsertExpr}; use common_catalog::consts::DEFAULT_SCHEMA_NAME; use common_grpc::writer::Precision; use table::requests::InsertRequest; @@ -206,7 +207,8 @@ impl DataPoint { mod test { use std::sync::Arc; - use common_time::{timestamp::TimeUnit, Timestamp}; + use common_time::timestamp::TimeUnit; + use common_time::Timestamp; use datatypes::value::Value; use datatypes::vectors::Vector; diff --git a/src/servers/src/postgres/auth_handler.rs b/src/servers/src/postgres/auth_handler.rs index ab94e4eb4fb1..6e279d5911db 100644 --- a/src/servers/src/postgres/auth_handler.rs +++ b/src/servers/src/postgres/auth_handler.rs @@ -5,8 +5,7 @@ use async_trait::async_trait; use futures::{Sink, SinkExt}; use pgwire::api::auth::{ServerParameterProvider, StartupHandler}; use pgwire::api::{auth, ClientInfo, PgWireConnectionState}; -use pgwire::error::ErrorInfo; -use pgwire::error::{PgWireError, PgWireResult}; +use pgwire::error::{ErrorInfo, PgWireError, PgWireResult}; use pgwire::messages::response::ErrorResponse; use pgwire::messages::startup::Authentication; use pgwire::messages::{PgWireBackendMessage, PgWireFrontendMessage}; diff --git a/src/servers/src/prometheus.rs b/src/servers/src/prometheus.rs index 4dd642dfb507..485201869249 100644 --- a/src/servers/src/prometheus.rs +++ b/src/servers/src/prometheus.rs @@ -3,14 +3,11 @@ use std::cmp::Ordering; use std::collections::{BTreeMap, HashMap}; use std::hash::{Hash, Hasher}; -use api::prometheus::remote::{ - label_matcher::Type as MatcherType, Label, Query, Sample, TimeSeries, WriteRequest, -}; -use api::v1::codec::InsertBatch; -use api::v1::{ - codec::SelectResult, column, column::SemanticType, insert_expr, Column, ColumnDataType, - InsertExpr, -}; +use api::prometheus::remote::label_matcher::Type as MatcherType; +use api::prometheus::remote::{Label, Query, Sample, TimeSeries, WriteRequest}; +use api::v1::codec::{InsertBatch, SelectResult}; +use api::v1::column::SemanticType; +use api::v1::{column, insert_expr, Column, ColumnDataType, InsertExpr}; use common_grpc::writer::Precision::MILLISECOND; use openmetrics_parser::{MetricsExposition, PrometheusType, PrometheusValue}; use snafu::{OptionExt, ResultExt}; @@ -507,7 +504,8 @@ mod tests { use api::prometheus::remote::LabelMatcher; use common_time::timestamp::TimeUnit; use common_time::Timestamp; - use datatypes::{value::Value, vectors::Vector}; + use datatypes::value::Value; + use datatypes::vectors::Vector; use super::*; diff --git a/src/servers/src/server.rs b/src/servers/src/server.rs index a8f7bfefcbf4..d4927a1e7303 100644 --- a/src/servers/src/server.rs +++ b/src/servers/src/server.rs @@ -4,8 +4,7 @@ use std::sync::Arc; use async_trait::async_trait; use common_runtime::Runtime; use common_telemetry::logging::{error, info}; -use futures::future::AbortRegistration; -use futures::future::{AbortHandle, Abortable}; +use futures::future::{AbortHandle, AbortRegistration, Abortable}; use snafu::ResultExt; use tokio::sync::Mutex; use tokio::task::JoinHandle; diff --git a/src/servers/tests/http/http_handler_test.rs b/src/servers/tests/http/http_handler_test.rs index 6b68f8318c3b..1420967184cb 100644 --- a/src/servers/tests/http/http_handler_test.rs +++ b/src/servers/tests/http/http_handler_test.rs @@ -4,9 +4,7 @@ use axum::body::Body; use axum::extract::{Json, Query, RawBody, State}; use common_telemetry::metric; use metrics::counter; -use servers::http::handler as http_handler; -use servers::http::script as script_handler; -use servers::http::{ApiState, JsonOutput}; +use servers::http::{handler as http_handler, script as script_handler, ApiState, JsonOutput}; use table::test_util::MemTable; use crate::{create_testing_script_handler, create_testing_sql_query_handler}; diff --git a/src/servers/tests/http/prometheus_test.rs b/src/servers/tests/http/prometheus_test.rs index 0ec703a3bb29..05c26623dbc3 100644 --- a/src/servers/tests/http/prometheus_test.rs +++ b/src/servers/tests/http/prometheus_test.rs @@ -11,8 +11,7 @@ use prost::Message; use servers::error::Result; use servers::http::HttpServer; use servers::prometheus; -use servers::prometheus::snappy_compress; -use servers::prometheus::Metrics; +use servers::prometheus::{snappy_compress, Metrics}; use servers::query_handler::{PrometheusProtocolHandler, PrometheusResponse, SqlQueryHandler}; use tokio::sync::mpsc; diff --git a/src/servers/tests/mod.rs b/src/servers/tests/mod.rs index 11a0d7f65cba..4b27848bee7f 100644 --- a/src/servers/tests/mod.rs +++ b/src/servers/tests/mod.rs @@ -8,16 +8,15 @@ use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; use common_query::Output; use query::{QueryEngineFactory, QueryEngineRef}; use servers::error::Result; -use servers::query_handler::ScriptHandlerRef; -use servers::query_handler::{ScriptHandler, SqlQueryHandler, SqlQueryHandlerRef}; +use servers::query_handler::{ + ScriptHandler, ScriptHandlerRef, SqlQueryHandler, SqlQueryHandlerRef, +}; use table::test_util::MemTable; mod http; mod mysql; -use script::{ - engine::{CompileContext, EvalContext, Script, ScriptEngine}, - python::{PyEngine, PyScript}, -}; +use script::engine::{CompileContext, EvalContext, Script, ScriptEngine}; +use script::python::{PyEngine, PyScript}; mod opentsdb; mod postgres; diff --git a/src/servers/tests/mysql/mod.rs b/src/servers/tests/mysql/mod.rs index ddaa407dede0..7f69ec38d0a7 100644 --- a/src/servers/tests/mysql/mod.rs +++ b/src/servers/tests/mysql/mod.rs @@ -8,8 +8,7 @@ use datatypes::vectors::{ UInt8Vector, }; use mysql_async::prelude::FromRow; -use mysql_async::FromRowError; -use mysql_async::Value as MysqlValue; +use mysql_async::{FromRowError, Value as MysqlValue}; use opensrv_mysql::ColumnType; mod mysql_server_test; diff --git a/src/servers/tests/opentsdb.rs b/src/servers/tests/opentsdb.rs index 7a4fffb8e4d2..3caed762d0de 100644 --- a/src/servers/tests/opentsdb.rs +++ b/src/servers/tests/opentsdb.rs @@ -14,8 +14,7 @@ use servers::opentsdb::OpentsdbServer; use servers::query_handler::OpentsdbProtocolHandler; use servers::server::Server; use tokio::net::TcpStream; -use tokio::sync::mpsc; -use tokio::sync::Notify; +use tokio::sync::{mpsc, Notify}; struct DummyOpentsdbInstance { tx: mpsc::Sender, diff --git a/src/sql/src/parser.rs b/src/sql/src/parser.rs index 209c1a271934..5eceb83e4a7f 100644 --- a/src/sql/src/parser.rs +++ b/src/sql/src/parser.rs @@ -1,8 +1,7 @@ use snafu::{ensure, ResultExt}; use sqlparser::dialect::Dialect; use sqlparser::keywords::Keyword; -use sqlparser::parser::Parser; -use sqlparser::parser::ParserError; +use sqlparser::parser::{Parser, ParserError}; use sqlparser::tokenizer::{Token, Tokenizer}; use crate::error::{ diff --git a/src/sql/src/parsers/create_parser.rs b/src/sql/src/parsers/create_parser.rs index 41df8174cd6f..e99bc52ba391 100644 --- a/src/sql/src/parsers/create_parser.rs +++ b/src/sql/src/parsers/create_parser.rs @@ -2,8 +2,7 @@ use std::cmp::Ordering; use itertools::Itertools; use once_cell::sync::Lazy; -use snafu::ResultExt; -use snafu::{ensure, OptionExt}; +use snafu::{ensure, OptionExt, ResultExt}; use sqlparser::ast::Value; use sqlparser::dialect::keywords::Keyword; use sqlparser::parser::IsOptional::Mandatory; diff --git a/src/storage/benches/memtable/bench_memtable_read.rs b/src/storage/benches/memtable/bench_memtable_read.rs index aaa0623fdb19..9a75224534d1 100644 --- a/src/storage/benches/memtable/bench_memtable_read.rs +++ b/src/storage/benches/memtable/bench_memtable_read.rs @@ -1,6 +1,7 @@ use criterion::{criterion_group, criterion_main, Criterion, Throughput}; -use crate::memtable::{generate_kvs, util::bench_context::BenchContext}; +use crate::memtable::generate_kvs; +use crate::memtable::util::bench_context::BenchContext; fn bench_memtable_read(c: &mut Criterion) { // the length of string in value is 20 diff --git a/src/storage/benches/memtable/bench_memtable_read_write_ratio.rs b/src/storage/benches/memtable/bench_memtable_read_write_ratio.rs index bb11662db498..417e62e1711f 100644 --- a/src/storage/benches/memtable/bench_memtable_read_write_ratio.rs +++ b/src/storage/benches/memtable/bench_memtable_read_write_ratio.rs @@ -1,11 +1,7 @@ -use std::{ - sync::{ - atomic::{AtomicBool, AtomicUsize, Ordering}, - Arc, - }, - thread, - time::Instant, -}; +use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; +use std::sync::Arc; +use std::thread; +use std::time::Instant; use atomic_float::AtomicF64; use criterion::{ @@ -13,7 +9,8 @@ use criterion::{ }; use rand::Rng; -use crate::memtable::{generate_kvs, util::bench_context::BenchContext}; +use crate::memtable::generate_kvs; +use crate::memtable::util::bench_context::BenchContext; static READ_NUM: AtomicUsize = AtomicUsize::new(0); static WRITE_NUM: AtomicUsize = AtomicUsize::new(0); diff --git a/src/storage/benches/memtable/mod.rs b/src/storage/benches/memtable/mod.rs index 1b0f56914e6b..1582a76baaee 100644 --- a/src/storage/benches/memtable/mod.rs +++ b/src/storage/benches/memtable/mod.rs @@ -3,17 +3,15 @@ pub mod bench_memtable_read_write_ratio; pub mod bench_memtable_write; pub mod util; -use std::sync::{ - atomic::{AtomicU64, Ordering}, - Arc, -}; +use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::Arc; use common_time::Timestamp; -use datatypes::{ - prelude::ScalarVectorBuilder, - vectors::{StringVectorBuilder, TimestampVectorBuilder, UInt64VectorBuilder}, -}; -use rand::{distributions::Alphanumeric, prelude::ThreadRng, Rng}; +use datatypes::prelude::ScalarVectorBuilder; +use datatypes::vectors::{StringVectorBuilder, TimestampVectorBuilder, UInt64VectorBuilder}; +use rand::distributions::Alphanumeric; +use rand::prelude::ThreadRng; +use rand::Rng; use storage::memtable::KeyValues; use store_api::storage::{OpType, SequenceNumber}; diff --git a/src/storage/benches/memtable/util/mod.rs b/src/storage/benches/memtable/util/mod.rs index bbe7f9a0d019..410a935ee863 100644 --- a/src/storage/benches/memtable/util/mod.rs +++ b/src/storage/benches/memtable/util/mod.rs @@ -3,11 +3,9 @@ pub mod regiondesc_util; pub mod schema_util; use datatypes::type_id::LogicalTypeId; -use storage::{ - memtable::{DefaultMemtableBuilder, MemtableBuilder, MemtableRef}, - metadata::RegionMetadata, - schema::RegionSchemaRef, -}; +use storage::memtable::{DefaultMemtableBuilder, MemtableBuilder, MemtableRef}; +use storage::metadata::RegionMetadata; +use storage::schema::RegionSchemaRef; use crate::memtable::util::regiondesc_util::RegionDescBuilder; diff --git a/src/storage/benches/memtable/util/regiondesc_util.rs b/src/storage/benches/memtable/util/regiondesc_util.rs index db88f76ad71b..82ace380127c 100644 --- a/src/storage/benches/memtable/util/regiondesc_util.rs +++ b/src/storage/benches/memtable/util/regiondesc_util.rs @@ -4,7 +4,8 @@ use store_api::storage::{ RegionDescriptor, RowKeyDescriptorBuilder, }; -use super::{schema_util::ColumnDef, TIMESTAMP_NAME}; +use super::schema_util::ColumnDef; +use super::TIMESTAMP_NAME; pub struct RegionDescBuilder { name: String, diff --git a/src/storage/benches/wal/util/mod.rs b/src/storage/benches/wal/util/mod.rs index ebff52cceb77..5efa5cc64d46 100644 --- a/src/storage/benches/wal/util/mod.rs +++ b/src/storage/benches/wal/util/mod.rs @@ -2,16 +2,14 @@ pub mod write_batch_util; use std::sync::Arc; -use datatypes::{ - prelude::ScalarVector, - type_id::LogicalTypeId, - vectors::{BooleanVector, Float64Vector, StringVector, TimestampVector, UInt64Vector}, +use datatypes::prelude::ScalarVector; +use datatypes::type_id::LogicalTypeId; +use datatypes::vectors::{ + BooleanVector, Float64Vector, StringVector, TimestampVector, UInt64Vector, }; use rand::Rng; -use storage::{ - proto, - write_batch::{PutData, WriteBatch}, -}; +use storage::proto; +use storage::write_batch::{PutData, WriteBatch}; use store_api::storage::{consts, PutOperation, WriteRequest}; pub fn new_test_batch() -> WriteBatch { diff --git a/src/storage/src/engine.rs b/src/storage/src/engine.rs index 016ade9d2273..6863d134206e 100644 --- a/src/storage/src/engine.rs +++ b/src/storage/src/engine.rs @@ -5,9 +5,9 @@ use async_trait::async_trait; use common_telemetry::logging::info; use object_store::{util, ObjectStore}; use snafu::ResultExt; -use store_api::{ - logstore::LogStore, - storage::{CreateOptions, EngineContext, OpenOptions, RegionDescriptor, StorageEngine}, +use store_api::logstore::LogStore; +use store_api::storage::{ + CreateOptions, EngineContext, OpenOptions, RegionDescriptor, StorageEngine, }; use crate::background::JobPoolImpl; diff --git a/src/storage/src/flush.rs b/src/storage/src/flush.rs index 06f2da090c47..fef253bf522d 100644 --- a/src/storage/src/flush.rs +++ b/src/storage/src/flush.rs @@ -12,8 +12,7 @@ use crate::error::{CancelledSnafu, Result}; use crate::manifest::action::*; use crate::manifest::region::RegionManifest; use crate::memtable::{IterContext, MemtableId, MemtableRef}; -use crate::region::RegionWriterRef; -use crate::region::SharedDataRef; +use crate::region::{RegionWriterRef, SharedDataRef}; use crate::sst::{AccessLayerRef, FileMeta, WriteOptions}; use crate::wal::Wal; diff --git a/src/storage/src/manifest/action.rs b/src/storage/src/manifest/action.rs index 2b8a33ccef0b..b28d195b05a1 100644 --- a/src/storage/src/manifest/action.rs +++ b/src/storage/src/manifest/action.rs @@ -4,10 +4,8 @@ use serde::{Deserialize, Serialize}; use serde_json as json; use snafu::{ensure, OptionExt, ResultExt}; use store_api::manifest::action::{ProtocolAction, ProtocolVersion, VersionHeader}; -use store_api::manifest::ManifestVersion; -use store_api::manifest::MetaAction; -use store_api::storage::RegionId; -use store_api::storage::SequenceNumber; +use store_api::manifest::{ManifestVersion, MetaAction}; +use store_api::storage::{RegionId, SequenceNumber}; use crate::error::{ self, DecodeJsonSnafu, DecodeMetaActionListSnafu, ManifestProtocolForbidReadSnafu, diff --git a/src/storage/src/manifest/impl_.rs b/src/storage/src/manifest/impl_.rs index 101fd2d911cf..6f229fa47314 100644 --- a/src/storage/src/manifest/impl_.rs +++ b/src/storage/src/manifest/impl_.rs @@ -1,8 +1,6 @@ use std::marker::PhantomData; -use std::sync::{ - atomic::{AtomicU64, Ordering}, - Arc, -}; +use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::Arc; use arc_swap::ArcSwap; use async_trait::async_trait; @@ -13,8 +11,7 @@ use store_api::manifest::action::{self, ProtocolAction, ProtocolVersion}; use store_api::manifest::*; use crate::error::{Error, ManifestProtocolForbidWriteSnafu, Result}; -use crate::manifest::storage::ManifestObjectStore; -use crate::manifest::storage::ObjectStoreLogIterator; +use crate::manifest::storage::{ManifestObjectStore, ObjectStoreLogIterator}; #[derive(Clone, Debug)] pub struct ManifestImpl> { diff --git a/src/storage/src/manifest/region.rs b/src/storage/src/manifest/region.rs index df04aaf404eb..ce3763dfb27e 100644 --- a/src/storage/src/manifest/region.rs +++ b/src/storage/src/manifest/region.rs @@ -8,7 +8,8 @@ pub type RegionManifest = ManifestImpl; mod tests { use std::sync::Arc; - use object_store::{backend::fs, ObjectStore}; + use object_store::backend::fs; + use object_store::ObjectStore; use store_api::manifest::action::ProtocolAction; use store_api::manifest::{Manifest, MetaActionIterator, MAX_VERSION}; use tempdir::TempDir; diff --git a/src/storage/src/manifest/storage.rs b/src/storage/src/manifest/storage.rs index c651d1c947eb..06abcf6c058e 100644 --- a/src/storage/src/manifest/storage.rs +++ b/src/storage/src/manifest/storage.rs @@ -264,7 +264,8 @@ impl ManifestLogStorage for ManifestObjectStore { #[cfg(test)] mod tests { - use object_store::{backend::fs, ObjectStore}; + use object_store::backend::fs; + use object_store::ObjectStore; use tempdir::TempDir; use super::*; diff --git a/src/storage/src/memtable/btree.rs b/src/storage/src/memtable/btree.rs index f6b6e9b603e4..4fe96d28b9fc 100644 --- a/src/storage/src/memtable/btree.rs +++ b/src/storage/src/memtable/btree.rs @@ -1,10 +1,8 @@ use std::cmp::Ordering; use std::collections::{btree_map, BTreeMap}; use std::ops::Bound; -use std::sync::{ - atomic::{AtomicUsize, Ordering as AtomicOrdering}, - Arc, RwLock, -}; +use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering}; +use std::sync::{Arc, RwLock}; use datatypes::prelude::*; use datatypes::value::Value; diff --git a/src/storage/src/memtable/inserter.rs b/src/storage/src/memtable/inserter.rs index d63a7c9a3789..64d6f9e8dda0 100644 --- a/src/storage/src/memtable/inserter.rs +++ b/src/storage/src/memtable/inserter.rs @@ -124,8 +124,9 @@ mod tests { use std::sync::Arc; use common_time::timestamp::Timestamp; + use datatypes::type_id::LogicalTypeId; + use datatypes::value::Value; use datatypes::vectors::{Int64Vector, TimestampVector}; - use datatypes::{type_id::LogicalTypeId, value::Value}; use store_api::storage::{PutOperation, WriteRequest}; use super::*; diff --git a/src/storage/src/memtable/version.rs b/src/storage/src/memtable/version.rs index 9406f3869bbe..f6f764f64db2 100644 --- a/src/storage/src/memtable/version.rs +++ b/src/storage/src/memtable/version.rs @@ -109,8 +109,7 @@ mod tests { use std::sync::Arc; use super::*; - use crate::memtable::DefaultMemtableBuilder; - use crate::memtable::MemtableBuilder; + use crate::memtable::{DefaultMemtableBuilder, MemtableBuilder}; use crate::test_util::schema_util; #[test] diff --git a/src/storage/src/metadata.rs b/src/storage/src/metadata.rs index eca8314fc62c..580327b6d2fe 100644 --- a/src/storage/src/metadata.rs +++ b/src/storage/src/metadata.rs @@ -8,8 +8,8 @@ use datatypes::data_type::ConcreteDataType; use datatypes::schema::{ColumnSchema, Metadata}; use serde::{Deserialize, Serialize}; use snafu::{ensure, OptionExt}; +use store_api::storage::consts::{self, ReservedColumnId}; use store_api::storage::{ - consts::{self, ReservedColumnId}, AddColumn, AlterOperation, AlterRequest, ColumnDescriptor, ColumnDescriptorBuilder, ColumnDescriptorBuilderError, ColumnFamilyDescriptor, ColumnFamilyDescriptorBuilder, ColumnFamilyId, ColumnId, RegionDescriptor, RegionDescriptorBuilder, RegionId, RegionMeta, diff --git a/src/storage/src/proto/write_batch.rs b/src/storage/src/proto/write_batch.rs index 7289750cf73b..a0885be45cd1 100644 --- a/src/storage/src/proto/write_batch.rs +++ b/src/storage/src/proto/write_batch.rs @@ -5,19 +5,16 @@ use std::sync::Arc; use common_base::BitVec; use common_error::prelude::*; +use datatypes::data_type::ConcreteDataType; +use datatypes::prelude::{ScalarVector, ScalarVectorBuilder}; use datatypes::schema; -use datatypes::{ - data_type::ConcreteDataType, - prelude::{ScalarVector, ScalarVectorBuilder}, - vectors::{ - BinaryVector, BinaryVectorBuilder, BooleanVector, BooleanVectorBuilder, Float32Vector, - Float32VectorBuilder, Float64Vector, Float64VectorBuilder, Int16Vector, Int16VectorBuilder, - Int32Vector, Int32VectorBuilder, Int64Vector, Int64VectorBuilder, Int8Vector, - Int8VectorBuilder, StringVector, StringVectorBuilder, TimestampVector, - TimestampVectorBuilder, UInt16Vector, UInt16VectorBuilder, UInt32Vector, - UInt32VectorBuilder, UInt64Vector, UInt64VectorBuilder, UInt8Vector, UInt8VectorBuilder, - Vector, VectorRef, - }, +use datatypes::vectors::{ + BinaryVector, BinaryVectorBuilder, BooleanVector, BooleanVectorBuilder, Float32Vector, + Float32VectorBuilder, Float64Vector, Float64VectorBuilder, Int16Vector, Int16VectorBuilder, + Int32Vector, Int32VectorBuilder, Int64Vector, Int64VectorBuilder, Int8Vector, + Int8VectorBuilder, StringVector, StringVectorBuilder, TimestampVector, TimestampVectorBuilder, + UInt16Vector, UInt16VectorBuilder, UInt32Vector, UInt32VectorBuilder, UInt64Vector, + UInt64VectorBuilder, UInt8Vector, UInt8VectorBuilder, Vector, VectorRef, }; use paste::paste; use snafu::OptionExt; diff --git a/src/storage/src/region.rs b/src/storage/src/region.rs index 1569136b80ad..1ee1364f5016 100644 --- a/src/storage/src/region.rs +++ b/src/storage/src/region.rs @@ -16,18 +16,19 @@ use store_api::storage::{ use crate::error::{self, Error, Result}; use crate::flush::{FlushSchedulerRef, FlushStrategyRef}; -use crate::manifest::{ - action::{RawRegionMetadata, RegionChange, RegionMetaAction, RegionMetaActionList}, - region::RegionManifest, +use crate::manifest::action::{ + RawRegionMetadata, RegionChange, RegionMetaAction, RegionMetaActionList, }; +use crate::manifest::region::RegionManifest; use crate::memtable::MemtableBuilderRef; use crate::metadata::{RegionMetaImpl, RegionMetadata, RegionMetadataRef}; pub use crate::region::writer::{AlterContext, RegionWriter, RegionWriterRef, WriterContext}; use crate::schema::compat::CompatWrite; use crate::snapshot::SnapshotImpl; use crate::sst::AccessLayerRef; -use crate::version::VersionEdit; -use crate::version::{Version, VersionControl, VersionControlRef, INIT_COMMITTED_SEQUENCE}; +use crate::version::{ + Version, VersionControl, VersionControlRef, VersionEdit, INIT_COMMITTED_SEQUENCE, +}; use crate::wal::Wal; use crate::write_batch::WriteBatch; diff --git a/src/storage/src/region/tests.rs b/src/storage/src/region/tests.rs index 67aec5fa32f0..c76c5d3ad215 100644 --- a/src/storage/src/region/tests.rs +++ b/src/storage/src/region/tests.rs @@ -10,8 +10,10 @@ use common_time::timestamp::Timestamp; use datatypes::prelude::ScalarVector; use datatypes::type_id::LogicalTypeId; use datatypes::vectors::{Int64Vector, TimestampVector}; -use log_store::fs::{log::LocalFileLogStore, noop::NoopLogStore}; -use object_store::{backend::fs, ObjectStore}; +use log_store::fs::log::LocalFileLogStore; +use log_store::fs::noop::NoopLogStore; +use object_store::backend::fs; +use object_store::ObjectStore; use store_api::storage::{ consts, Chunk, ChunkReader, PutOperation, ScanRequest, SequenceNumber, Snapshot, WriteRequest, }; @@ -21,9 +23,8 @@ use super::*; use crate::manifest::action::{RegionChange, RegionMetaActionList}; use crate::manifest::test_utils::*; use crate::memtable::DefaultMemtableBuilder; -use crate::test_util::{ - self, config_util, descriptor_util::RegionDescBuilder, schema_util, write_batch_util, -}; +use crate::test_util::descriptor_util::RegionDescBuilder; +use crate::test_util::{self, config_util, schema_util, write_batch_util}; use crate::write_batch::PutData; /// Create metadata of a region with schema: (timestamp, v0). diff --git a/src/storage/src/region/tests/alter.rs b/src/storage/src/region/tests/alter.rs index 72d213ec4380..5cff8fba3914 100644 --- a/src/storage/src/region/tests/alter.rs +++ b/src/storage/src/region/tests/alter.rs @@ -5,19 +5,15 @@ use common_time::Timestamp; use datatypes::prelude::*; use datatypes::vectors::{Int64Vector, TimestampVector}; use log_store::fs::log::LocalFileLogStore; -use store_api::storage::PutOperation; -use store_api::storage::WriteRequest; use store_api::storage::{ AddColumn, AlterOperation, AlterRequest, Chunk, ChunkReader, ColumnDescriptor, - ColumnDescriptorBuilder, ColumnId, Region, RegionMeta, ScanRequest, SchemaRef, Snapshot, - WriteResponse, + ColumnDescriptorBuilder, ColumnId, PutOperation, Region, RegionMeta, ScanRequest, SchemaRef, + Snapshot, WriteRequest, WriteResponse, }; use tempdir::TempDir; use crate::region::tests::{self, FileTesterBase}; -use crate::region::OpenOptions; -use crate::region::RegionImpl; -use crate::region::{RawRegionMetadata, RegionMetadata}; +use crate::region::{OpenOptions, RawRegionMetadata, RegionImpl, RegionMetadata}; use crate::test_util; use crate::test_util::config_util; use crate::test_util::descriptor_util::RegionDescBuilder; diff --git a/src/storage/src/region/tests/projection.rs b/src/storage/src/region/tests/projection.rs index 04a09184638d..72a5d0e2c585 100644 --- a/src/storage/src/region/tests/projection.rs +++ b/src/storage/src/region/tests/projection.rs @@ -12,8 +12,7 @@ use store_api::storage::{ }; use tempdir::TempDir; -use crate::region::RegionImpl; -use crate::region::RegionMetadata; +use crate::region::{RegionImpl, RegionMetadata}; use crate::test_util::{self, config_util, descriptor_util, write_batch_util}; use crate::write_batch::{PutData, WriteBatch}; diff --git a/src/storage/src/region/writer.rs b/src/storage/src/region/writer.rs index 8b462e788bba..34accb1401b4 100644 --- a/src/storage/src/region/writer.rs +++ b/src/storage/src/region/writer.rs @@ -5,8 +5,7 @@ use futures::TryStreamExt; use snafu::ResultExt; use store_api::logstore::LogStore; use store_api::manifest::{Manifest, ManifestVersion, MetaAction}; -use store_api::storage::SequenceNumber; -use store_api::storage::{AlterRequest, WriteContext, WriteResponse}; +use store_api::storage::{AlterRequest, SequenceNumber, WriteContext, WriteResponse}; use tokio::sync::Mutex; use crate::background::JobHandle; @@ -21,8 +20,7 @@ use crate::proto::wal::WalHeader; use crate::region::{RecoverdMetadata, RecoveredMetadataMap, RegionManifest, SharedDataRef}; use crate::schema::compat::CompatWrite; use crate::sst::AccessLayerRef; -use crate::version::VersionControl; -use crate::version::{VersionControlRef, VersionEdit}; +use crate::version::{VersionControl, VersionControlRef, VersionEdit}; use crate::wal::{Payload, Wal}; use crate::write_batch::WriteBatch; diff --git a/src/storage/src/schema/compat.rs b/src/storage/src/schema/compat.rs index f87b83dd768d..4fcd9210dd27 100644 --- a/src/storage/src/schema/compat.rs +++ b/src/storage/src/schema/compat.rs @@ -310,16 +310,13 @@ impl ReadAdapter { #[cfg(test)] mod tests { use datatypes::data_type::ConcreteDataType; - use store_api::storage::consts; - use store_api::storage::ColumnDescriptorBuilder; + use store_api::storage::{consts, ColumnDescriptorBuilder}; use super::*; use crate::error::Error; use crate::metadata::RegionMetadata; - use crate::schema::tests; - use crate::schema::{ProjectedSchema, RegionSchema}; - use crate::test_util::descriptor_util; - use crate::test_util::schema_util; + use crate::schema::{tests, ProjectedSchema, RegionSchema}; + use crate::test_util::{descriptor_util, schema_util}; fn check_fields(fields: &[Field], names: &[&str]) { for (field, name) in fields.iter().zip(names) { diff --git a/src/storage/src/sst/parquet.rs b/src/storage/src/sst/parquet.rs index fc65530681c3..f96b9129e551 100644 --- a/src/storage/src/sst/parquet.rs +++ b/src/storage/src/sst/parquet.rs @@ -296,8 +296,9 @@ mod tests { use tempdir::TempDir; use super::*; - use crate::memtable::tests as memtable_tests; - use crate::memtable::{DefaultMemtableBuilder, IterContext, MemtableBuilder}; + use crate::memtable::{ + tests as memtable_tests, DefaultMemtableBuilder, IterContext, MemtableBuilder, + }; #[tokio::test] async fn test_parquet_writer() { diff --git a/src/storage/src/test_util/config_util.rs b/src/storage/src/test_util/config_util.rs index b72ff3fe7d3e..829c4873e863 100644 --- a/src/storage/src/test_util/config_util.rs +++ b/src/storage/src/test_util/config_util.rs @@ -1,7 +1,9 @@ use std::sync::Arc; -use log_store::fs::{config::LogConfig, log::LocalFileLogStore}; -use object_store::{backend::fs::Builder, ObjectStore}; +use log_store::fs::config::LogConfig; +use log_store::fs::log::LocalFileLogStore; +use object_store::backend::fs::Builder; +use object_store::ObjectStore; use crate::background::JobPoolImpl; use crate::engine; diff --git a/src/storage/src/test_util/descriptor_util.rs b/src/storage/src/test_util/descriptor_util.rs index a02712bd3d29..21f18826a85b 100644 --- a/src/storage/src/test_util/descriptor_util.rs +++ b/src/storage/src/test_util/descriptor_util.rs @@ -5,7 +5,8 @@ use store_api::storage::{ RegionDescriptor, RegionId, RowKeyDescriptorBuilder, }; -use crate::test_util::{self, schema_util::ColumnDef}; +use crate::test_util::schema_util::ColumnDef; +use crate::test_util::{self}; /// A RegionDescriptor builder for test. pub struct RegionDescBuilder { diff --git a/src/storage/src/version.rs b/src/storage/src/version.rs index 76aedac913f6..bf42615e2357 100644 --- a/src/storage/src/version.rs +++ b/src/storage/src/version.rs @@ -16,8 +16,7 @@ use store_api::storage::{SchemaRef, SequenceNumber}; use crate::memtable::{MemtableId, MemtableRef, MemtableVersion}; use crate::metadata::RegionMetadataRef; use crate::schema::RegionSchemaRef; -use crate::sst::LevelMetas; -use crate::sst::{FileHandle, FileMeta}; +use crate::sst::{FileHandle, FileMeta, LevelMetas}; use crate::sync::CowCell; pub const INIT_COMMITTED_SEQUENCE: u64 = 0; diff --git a/src/storage/src/wal.rs b/src/storage/src/wal.rs index d48101a9f619..3a5ed29bdc70 100644 --- a/src/storage/src/wal.rs +++ b/src/storage/src/wal.rs @@ -5,24 +5,18 @@ use common_error::prelude::BoxedError; use futures::{stream, Stream, TryStreamExt}; use prost::Message; use snafu::{ensure, ResultExt}; -use store_api::storage::RegionId; -use store_api::{ - logstore::{entry::Entry, AppendResponse, LogStore}, - storage::SequenceNumber, -}; - -use crate::{ - codec::{Decoder, Encoder}, - error::{self, Error, Result}, - proto::wal::{self, PayloadType, WalHeader}, - write_batch::{ - codec::{ - WriteBatchArrowDecoder, WriteBatchArrowEncoder, WriteBatchProtobufDecoder, - WriteBatchProtobufEncoder, - }, - WriteBatch, - }, +use store_api::logstore::entry::Entry; +use store_api::logstore::{AppendResponse, LogStore}; +use store_api::storage::{RegionId, SequenceNumber}; + +use crate::codec::{Decoder, Encoder}; +use crate::error::{self, Error, Result}; +use crate::proto::wal::{self, PayloadType, WalHeader}; +use crate::write_batch::codec::{ + WriteBatchArrowDecoder, WriteBatchArrowEncoder, WriteBatchProtobufDecoder, + WriteBatchProtobufEncoder, }; +use crate::write_batch::WriteBatch; #[derive(Debug)] pub struct Wal { diff --git a/src/storage/src/write_batch.rs b/src/storage/src/write_batch.rs index 2e15dbabe530..87883d3f6ede 100644 --- a/src/storage/src/write_batch.rs +++ b/src/storage/src/write_batch.rs @@ -1,21 +1,18 @@ mod compat; -use std::{ - any::Any, - collections::{BTreeSet, HashMap}, - slice, - time::Duration, -}; +use std::any::Any; +use std::collections::{BTreeSet, HashMap}; +use std::slice; +use std::time::Duration; use common_error::prelude::*; use common_time::timestamp_millis::BucketAligned; use common_time::RangeMillis; +use datatypes::arrow::error::ArrowError; +use datatypes::data_type::ConcreteDataType; +use datatypes::prelude::{ScalarVector, Value}; use datatypes::schema::{ColumnSchema, SchemaRef}; -use datatypes::vectors::{Int64Vector, TimestampVector}; -use datatypes::{ - arrow::error::ArrowError, data_type::ConcreteDataType, prelude::ScalarVector, prelude::Value, - vectors::VectorRef, -}; +use datatypes::vectors::{Int64Vector, TimestampVector, VectorRef}; use prost::{DecodeError, EncodeError}; use snafu::{ensure, OptionExt, ResultExt}; use store_api::storage::{consts, PutOperation, WriteRequest}; @@ -491,34 +488,27 @@ impl<'a> IntoIterator for &'a WriteBatch { pub mod codec { - use std::{io::Cursor, sync::Arc}; - - use datatypes::{ - arrow::{ - chunk::Chunk as ArrowChunk, - io::ipc::{ - read::{self, StreamReader, StreamState}, - write::{StreamWriter, WriteOptions}, - }, - }, - schema::{Schema, SchemaRef}, - vectors::Helper, - }; + use std::io::Cursor; + use std::sync::Arc; + + use datatypes::arrow::chunk::Chunk as ArrowChunk; + use datatypes::arrow::io::ipc::read::{self, StreamReader, StreamState}; + use datatypes::arrow::io::ipc::write::{StreamWriter, WriteOptions}; + use datatypes::schema::{Schema, SchemaRef}; + use datatypes::vectors::Helper; use prost::Message; use snafu::{ensure, OptionExt, ResultExt}; use store_api::storage::WriteRequest; use crate::codec::{Decoder, Encoder}; - use crate::proto::{ - wal::MutationType, - write_batch::{self, gen_columns, gen_put_data_vector}, - }; + use crate::proto::wal::MutationType; + use crate::proto::write_batch::{self, gen_columns, gen_put_data_vector}; use crate::write_batch::{ - DataCorruptedSnafu, DecodeArrowSnafu, DecodeVectorSnafu, EncodeArrowSnafu, - Error as WriteBatchError, FromProtobufSnafu, MissingColumnSnafu, Mutation, - ParseSchemaSnafu, Result, StreamWaitingSnafu, ToProtobufSnafu, WriteBatch, + DataCorruptedSnafu, DecodeArrowSnafu, DecodeProtobufSnafu, DecodeVectorSnafu, + EncodeArrowSnafu, EncodeProtobufSnafu, Error as WriteBatchError, FromProtobufSnafu, + MissingColumnSnafu, Mutation, ParseSchemaSnafu, PutData, Result, StreamWaitingSnafu, + ToProtobufSnafu, WriteBatch, }; - use crate::write_batch::{DecodeProtobufSnafu, EncodeProtobufSnafu, PutData}; // TODO(jiachun): We can make a comparison with protobuf, including performance, storage cost, // CPU consumption, etc diff --git a/src/store-api/src/manifest.rs b/src/store-api/src/manifest.rs index 3eaadc17b01f..1f1515f5aae9 100644 --- a/src/store-api/src/manifest.rs +++ b/src/store-api/src/manifest.rs @@ -4,10 +4,10 @@ mod storage; use async_trait::async_trait; use common_error::ext::ErrorExt; -use serde::{de::DeserializeOwned, Serialize}; +use serde::de::DeserializeOwned; +use serde::Serialize; -use crate::manifest::action::ProtocolAction; -use crate::manifest::action::ProtocolVersion; +use crate::manifest::action::{ProtocolAction, ProtocolVersion}; pub use crate::manifest::storage::*; pub type ManifestVersion = u64; diff --git a/src/table-engine/src/engine.rs b/src/table-engine/src/engine.rs index 8ebbbf2938dc..43e56616ba95 100644 --- a/src/table-engine/src/engine.rs +++ b/src/table-engine/src/engine.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; -use std::sync::Arc; -use std::sync::RwLock; +use std::sync::{Arc, RwLock}; use async_trait::async_trait; use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME}; @@ -15,13 +14,10 @@ use store_api::storage::{ RegionId, RowKeyDescriptor, RowKeyDescriptorBuilder, StorageEngine, }; use table::engine::{EngineContext, TableEngine, TableReference}; +use table::metadata::{TableId, TableInfoBuilder, TableMetaBuilder, TableType, TableVersion}; use table::requests::{AlterTableRequest, CreateTableRequest, DropTableRequest, OpenTableRequest}; -use table::Result as TableResult; -use table::{ - metadata::{TableId, TableInfoBuilder, TableMetaBuilder, TableType, TableVersion}, - table::TableRef, - Table, -}; +use table::table::TableRef; +use table::{Result as TableResult, Table}; use tokio::sync::Mutex; use crate::config::EngineConfig; @@ -470,11 +466,9 @@ impl MitoEngineInner { mod tests { use common_query::physical_plan::RuntimeEnv; use common_recordbatch::util; - use datafusion_common::field_util::FieldExt; - use datafusion_common::field_util::SchemaExt; + use datafusion_common::field_util::{FieldExt, SchemaExt}; use datatypes::prelude::{ConcreteDataType, ScalarVector}; - use datatypes::schema::ColumnSchema; - use datatypes::schema::{ColumnDefaultConstraint, SchemaBuilder}; + use datatypes::schema::{ColumnDefaultConstraint, ColumnSchema, SchemaBuilder}; use datatypes::value::Value; use datatypes::vectors::*; use log_store::fs::noop::NoopLogStore; diff --git a/src/table-engine/src/manifest/action.rs b/src/table-engine/src/manifest/action.rs index ce35f6dea5eb..a0711aff9242 100644 --- a/src/table-engine/src/manifest/action.rs +++ b/src/table-engine/src/manifest/action.rs @@ -9,8 +9,7 @@ use storage::error::{ }; use storage::manifest::helper; use store_api::manifest::action::{ProtocolAction, ProtocolVersion, VersionHeader}; -use store_api::manifest::ManifestVersion; -use store_api::manifest::MetaAction; +use store_api::manifest::{ManifestVersion, MetaAction}; use table::metadata::{RawTableInfo, TableIdent}; #[derive(Serialize, Deserialize, Clone, Debug, PartialEq)] diff --git a/src/table-engine/src/table.rs b/src/table-engine/src/table.rs index 0e1c9b2003e3..0d2ce8de1424 100644 --- a/src/table-engine/src/table.rs +++ b/src/table-engine/src/table.rs @@ -24,13 +24,12 @@ use store_api::storage::{ RegionMeta, ScanRequest, SchemaRef, Snapshot, WriteContext, WriteRequest, }; use table::error::{Error as TableError, MissingColumnSnafu, Result as TableResult}; -use table::metadata::{FilterPushDownType, TableInfoRef}; +use table::metadata::{ + FilterPushDownType, RawTableInfo, TableInfo, TableInfoRef, TableMeta, TableType, +}; use table::requests::{AddColumnRequest, AlterKind, AlterTableRequest, InsertRequest}; use table::table::scan::SimpleTableScan; -use table::{ - metadata::{RawTableInfo, TableInfo, TableMeta, TableType}, - table::Table, -}; +use table::table::Table; use tokio::sync::Mutex; use crate::error::{ diff --git a/src/table-engine/src/table/test_util.rs b/src/table-engine/src/table/test_util.rs index fc95b1bad607..15f6c063463d 100644 --- a/src/table-engine/src/table/test_util.rs +++ b/src/table-engine/src/table/test_util.rs @@ -7,22 +7,19 @@ use datatypes::prelude::ConcreteDataType; use datatypes::schema::{ColumnSchema, Schema, SchemaBuilder, SchemaRef}; use datatypes::vectors::VectorRef; use log_store::fs::noop::NoopLogStore; -use object_store::{services::fs::Builder, ObjectStore}; +use object_store::services::fs::Builder; +use object_store::ObjectStore; use storage::config::EngineConfig as StorageEngineConfig; use storage::EngineImpl; -use table::engine::EngineContext; -use table::engine::TableEngine; +use table::engine::{EngineContext, TableEngine}; use table::metadata::{TableInfo, TableInfoBuilder, TableMetaBuilder, TableType}; -use table::requests::CreateTableRequest; -use table::requests::InsertRequest; +use table::requests::{CreateTableRequest, InsertRequest}; use table::TableRef; use tempdir::TempDir; use crate::config::EngineConfig; -use crate::engine::MitoEngine; -use crate::engine::MITO_ENGINE; -pub use crate::table::test_util::mock_engine::MockEngine; -pub use crate::table::test_util::mock_engine::MockRegion; +use crate::engine::{MitoEngine, MITO_ENGINE}; +pub use crate::table::test_util::mock_engine::{MockEngine, MockRegion}; pub const TABLE_NAME: &str = "demo"; diff --git a/src/table/src/predicate.rs b/src/table/src/predicate.rs index 9fcab030f3d5..058e5efbaf77 100644 --- a/src/table/src/predicate.rs +++ b/src/table/src/predicate.rs @@ -58,9 +58,7 @@ mod tests { pub use datafusion::parquet::schema::types::{BasicTypeInfo, PhysicalType}; use datafusion_common::Column; - use datafusion_expr::Expr; - use datafusion_expr::Literal; - use datafusion_expr::Operator; + use datafusion_expr::{Expr, Literal, Operator}; use datatypes::arrow::array::{Int32Array, Utf8Array}; use datatypes::arrow::chunk::Chunk; use datatypes::arrow::datatypes::{DataType, Field, Schema}; @@ -68,8 +66,7 @@ mod tests { use datatypes::arrow::io::parquet::write::{ Compression, Encoding, FileSink, Version, WriteOptions, }; - use futures::AsyncWriteExt; - use futures::SinkExt; + use futures::{AsyncWriteExt, SinkExt}; use tempdir::TempDir; use tokio_util::compat::TokioAsyncWriteCompatExt; diff --git a/src/table/src/table/adapter.rs b/src/table/src/table/adapter.rs index 06b002f98ea4..d970f7a62d4b 100644 --- a/src/table/src/table/adapter.rs +++ b/src/table/src/table/adapter.rs @@ -6,10 +6,8 @@ use common_query::physical_plan::{DfPhysicalPlanAdapter, PhysicalPlanAdapter, Ph use common_query::DfPhysicalPlan; use common_telemetry::debug; use datafusion::arrow::datatypes::SchemaRef as DfSchemaRef; -use datafusion::datasource::{ - datasource::TableProviderFilterPushDown as DfTableProviderFilterPushDown, TableProvider, - TableType as DfTableType, -}; +use datafusion::datasource::datasource::TableProviderFilterPushDown as DfTableProviderFilterPushDown; +use datafusion::datasource::{TableProvider, TableType as DfTableType}; use datafusion::error::Result as DfResult; use datafusion::logical_plan::Expr as DfExpr; use datatypes::schema::{SchemaRef as TableSchemaRef, SchemaRef}; diff --git a/src/table/src/table/scan.rs b/src/table/src/table/scan.rs index 372e35c6775e..6f1fe0f7cbe9 100644 --- a/src/table/src/table/scan.rs +++ b/src/table/src/table/scan.rs @@ -5,9 +5,7 @@ use std::sync::{Arc, Mutex}; use async_trait::async_trait; use common_query::error as query_error; use common_query::error::Result as QueryResult; -use common_query::physical_plan::Partitioning; -use common_query::physical_plan::RuntimeEnv; -use common_query::physical_plan::{PhysicalPlan, PhysicalPlanRef}; +use common_query::physical_plan::{Partitioning, PhysicalPlan, PhysicalPlanRef, RuntimeEnv}; use common_recordbatch::SendableRecordBatchStream; use datatypes::schema::SchemaRef; use snafu::OptionExt; @@ -70,8 +68,7 @@ impl PhysicalPlan for SimpleTableScan { #[cfg(test)] mod test { - use common_recordbatch::util; - use common_recordbatch::{RecordBatch, RecordBatches}; + use common_recordbatch::{util, RecordBatch, RecordBatches}; use datatypes::data_type::ConcreteDataType; use datatypes::schema::{ColumnSchema, Schema}; use datatypes::vectors::Int32Vector; diff --git a/src/table/src/test_util/empty_table.rs b/src/table/src/test_util/empty_table.rs index 7ef87eda36c7..eba10de20a6e 100644 --- a/src/table/src/test_util/empty_table.rs +++ b/src/table/src/test_util/empty_table.rs @@ -4,16 +4,10 @@ use async_trait::async_trait; use common_query::physical_plan::PhysicalPlanRef; use common_recordbatch::EmptyRecordBatchStream; -use crate::metadata::TableInfoBuilder; -use crate::metadata::TableInfoRef; -use crate::requests::InsertRequest; +use crate::metadata::{TableInfoBuilder, TableInfoRef, TableMetaBuilder, TableType}; +use crate::requests::{CreateTableRequest, InsertRequest}; use crate::table::scan::SimpleTableScan; -use crate::Result; -use crate::{ - metadata::{TableMetaBuilder, TableType}, - requests::CreateTableRequest, - Table, -}; +use crate::{Result, Table}; pub struct EmptyTable { info: TableInfoRef, diff --git a/src/table/src/test_util/mock_engine.rs b/src/table/src/test_util/mock_engine.rs index 75c038f356e2..8142ccf0ac3c 100644 --- a/src/table/src/test_util/mock_engine.rs +++ b/src/table/src/test_util/mock_engine.rs @@ -4,12 +4,10 @@ use std::sync::Arc; use async_trait::async_trait; use tokio::sync::Mutex; +use crate::engine::{EngineContext, TableEngine, TableReference}; +use crate::requests::{AlterTableRequest, CreateTableRequest, DropTableRequest, OpenTableRequest}; use crate::test_util::EmptyTable; -use crate::{ - engine::{EngineContext, TableEngine, TableReference}, - requests::{AlterTableRequest, CreateTableRequest, DropTableRequest, OpenTableRequest}, - Result, TableRef, -}; +use crate::{Result, TableRef}; #[derive(Default)] pub struct MockTableEngine {