From c26e165887f78f46a95d935c8efdc1c04bab209a Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Tue, 8 Apr 2025 19:48:52 +0800 Subject: [PATCH] refactor: check and fix super import (#5846) * refactor: check and fix super import Signed-off-by: Ruihang Xia * add to makefile Signed-off-by: Ruihang Xia * change dir Signed-off-by: Ruihang Xia --------- Signed-off-by: Ruihang Xia --- Makefile | 1 + scripts/check-super-imports.py | 74 +++++++++++++++++++ .../src/system_schema/information_schema.rs | 5 +- .../information_schema/cluster_info.rs | 3 +- .../information_schema/columns.rs | 2 +- .../information_memory_table.rs | 2 +- .../information_schema/key_column_usage.rs | 3 +- .../information_schema/partitions.rs | 3 +- .../information_schema/procedure_info.rs | 3 +- .../information_schema/region_peers.rs | 3 +- .../information_schema/region_statistics.rs | 2 +- .../information_schema/runtime_metrics.rs | 2 +- .../information_schema/schemata.rs | 3 +- .../information_schema/table_constraints.rs | 2 +- .../information_schema/tables.rs | 3 +- .../system_schema/information_schema/views.rs | 3 +- src/catalog/src/system_schema/memory_table.rs | 2 +- src/catalog/src/system_schema/pg_catalog.rs | 6 +- .../pg_catalog/pg_catalog_memory_table.rs | 4 +- .../src/system_schema/pg_catalog/pg_class.rs | 4 +- .../system_schema/pg_catalog/pg_database.rs | 4 +- .../system_schema/pg_catalog/pg_namespace.rs | 4 +- src/common/datasource/src/file_format/csv.rs | 3 +- src/common/datasource/src/file_format/json.rs | 3 +- .../function/src/scalars/geo/encoding.rs | 2 +- src/common/function/src/scalars/geo/h3.rs | 2 +- .../function/src/scalars/geo/measure.rs | 4 +- .../function/src/scalars/geo/relation.rs | 4 +- src/common/function/src/scalars/geo/wkt.rs | 2 +- src/common/meta/src/ddl/alter_database.rs | 2 +- src/common/meta/src/ddl/create_flow.rs | 3 +- .../meta/src/ddl/drop_database/cursor.rs | 7 +- .../meta/src/ddl/drop_database/executor.rs | 5 +- .../meta/src/ddl/drop_database/metadata.rs | 2 +- src/common/meta/src/ddl/drop_flow.rs | 2 +- src/common/meta/src/ddl/drop_view.rs | 2 +- src/common/meta/src/ddl/truncate_table.rs | 3 +- src/common/meta/src/key/datanode_table.rs | 6 +- src/common/meta/src/key/flow.rs | 3 +- src/common/meta/src/key/schema_name.rs | 7 +- src/common/meta/src/key/table_info.rs | 6 +- src/common/meta/src/key/table_name.rs | 2 +- src/common/meta/src/key/view_info.rs | 6 +- src/common/meta/src/kv_backend/etcd.rs | 3 +- src/common/meta/src/kv_backend/memory.rs | 3 +- src/common/meta/src/kv_backend/txn/etcd.rs | 2 +- src/common/procedure/src/local/runner.rs | 2 +- src/common/procedure/src/store/util.rs | 2 +- src/common/wal/src/config/kafka/datanode.rs | 3 +- src/common/wal/src/config/kafka/metasrv.rs | 3 +- src/datanode/src/heartbeat/handler.rs | 2 +- src/datatypes/src/vectors/dictionary.rs | 2 +- src/flow/src/adapter/refill.rs | 3 +- src/flow/src/compute/render.rs | 3 +- src/frontend/src/instance/jaeger.rs | 2 +- src/frontend/src/instance/logs.rs | 2 +- .../bloom_filter/creator/finalize_segment.rs | 2 +- .../src/inverted_index/format/reader/blob.rs | 5 +- src/log-store/src/kafka/consumer.rs | 2 +- src/log-store/src/kafka/index/collector.rs | 3 +- src/log-store/src/kafka/log_store.rs | 5 +- src/log-store/src/kafka/worker/dump_index.rs | 3 +- src/meta-srv/src/metasrv/builder.rs | 4 +- .../downgrade_leader_region.rs | 4 +- src/meta-srv/src/selector/common.rs | 2 +- src/meta-srv/src/service/procedure.rs | 2 +- src/metric-engine/src/engine/close.rs | 2 +- src/metric-engine/src/engine/drop.rs | 2 +- src/metric-engine/src/engine/open.rs | 2 +- src/mito2/src/manifest/manager.rs | 5 +- src/mito2/src/row_converter/dense.rs | 5 +- src/operator/src/statement/ddl.rs | 2 +- src/operator/src/statement/dml.rs | 2 +- src/pipeline/src/etl/processor.rs | 4 +- src/pipeline/src/etl/processor/json_path.rs | 8 +- src/pipeline/src/etl/transform.rs | 8 +- src/pipeline/src/etl/value.rs | 2 +- src/promql/src/extension_plan/planner.rs | 4 +- .../src/extension_plan/scalar_calculate.rs | 2 +- .../fs_puffin_manager/reader.rs | 2 +- .../puffin_manager/stager/bounded_stager.rs | 5 +- src/query/src/range_select/plan_rewrite.rs | 3 +- src/query/src/range_select/planner.rs | 2 +- src/servers/src/grpc/builder.rs | 6 +- src/servers/src/grpc/flight/stream.rs | 2 +- src/servers/src/grpc/prom_query_gateway.rs | 3 +- src/servers/src/http/handler.rs | 2 +- src/servers/src/http/influxdb.rs | 2 +- src/servers/src/http/otlp.rs | 2 +- src/servers/src/http/prom_store.rs | 2 +- src/servers/src/otlp/logs.rs | 4 +- src/servers/src/otlp/trace/span.rs | 2 +- src/servers/src/otlp/trace/v0.rs | 12 +-- src/servers/src/otlp/trace/v1.rs | 14 ++-- src/servers/src/postgres/auth_handler.rs | 2 +- src/servers/src/postgres/handler.rs | 4 +- src/servers/src/postgres/server.rs | 2 +- src/sql/src/parsers/create_parser.rs | 3 +- src/sql/src/parsers/tql_parser.rs | 5 +- src/sql/src/statements/cursor.rs | 2 +- 100 files changed, 234 insertions(+), 173 deletions(-) create mode 100644 scripts/check-super-imports.py diff --git a/Makefile b/Makefile index 81537ae976..a0e4b590aa 100644 --- a/Makefile +++ b/Makefile @@ -193,6 +193,7 @@ fix-clippy: ## Fix clippy violations. fmt-check: ## Check code format. cargo fmt --all -- --check python3 scripts/check-snafu.py + python3 scripts/check-super-imports.py .PHONY: start-etcd start-etcd: ## Start single node etcd for testing purpose. diff --git a/scripts/check-super-imports.py b/scripts/check-super-imports.py new file mode 100644 index 0000000000..11e541d1db --- /dev/null +++ b/scripts/check-super-imports.py @@ -0,0 +1,74 @@ +# Copyright 2023 Greptime Team +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import os +import re +from multiprocessing import Pool + + +def find_rust_files(directory): + rust_files = [] + for root, _, files in os.walk(directory): + # Skip files with "test" in the path + if "test" in root.lower(): + continue + + for file in files: + # Skip files with "test" in the filename + if "test" in file.lower(): + continue + + if file.endswith(".rs"): + rust_files.append(os.path.join(root, file)) + return rust_files + + +def check_file_for_super_import(file_path): + with open(file_path, "r") as file: + lines = file.readlines() + + violations = [] + for line_number, line in enumerate(lines, 1): + # Check for "use super::" without leading tab + if line.startswith("use super::"): + violations.append((line_number, line.strip())) + + if violations: + return file_path, violations + return None + + +def main(): + rust_files = find_rust_files(".") + + with Pool() as pool: + results = pool.map(check_file_for_super_import, rust_files) + + # Filter out None results + violations = [result for result in results if result] + + if violations: + print("Found 'use super::' without leading tab in the following files:") + counter = 1 + for file_path, file_violations in violations: + for line_number, line in file_violations: + print(f"{counter:>5} {file_path}:{line_number} - {line}") + counter += 1 + raise SystemExit(1) + else: + print("No 'use super::' without leading tab found. All files are compliant.") + + +if __name__ == "__main__": + main() diff --git a/src/catalog/src/system_schema/information_schema.rs b/src/catalog/src/system_schema/information_schema.rs index 2af245d4bf..9ae90b3360 100644 --- a/src/catalog/src/system_schema/information_schema.rs +++ b/src/catalog/src/system_schema/information_schema.rs @@ -49,7 +49,6 @@ pub use table_names::*; use views::InformationSchemaViews; use self::columns::InformationSchemaColumns; -use super::{SystemSchemaProviderInner, SystemTable, SystemTableRef}; use crate::error::{Error, Result}; use crate::system_schema::information_schema::cluster_info::InformationSchemaClusterInfo; use crate::system_schema::information_schema::flows::InformationSchemaFlows; @@ -63,7 +62,9 @@ use crate::system_schema::information_schema::table_constraints::InformationSche use crate::system_schema::information_schema::tables::InformationSchemaTables; use crate::system_schema::memory_table::MemoryTable; pub(crate) use crate::system_schema::predicate::Predicates; -use crate::system_schema::SystemSchemaProvider; +use crate::system_schema::{ + SystemSchemaProvider, SystemSchemaProviderInner, SystemTable, SystemTableRef, +}; use crate::CatalogManager; lazy_static! { diff --git a/src/catalog/src/system_schema/information_schema/cluster_info.rs b/src/catalog/src/system_schema/information_schema/cluster_info.rs index bf172b3cf0..7672791df6 100644 --- a/src/catalog/src/system_schema/information_schema/cluster_info.rs +++ b/src/catalog/src/system_schema/information_schema/cluster_info.rs @@ -36,9 +36,8 @@ use datatypes::vectors::{ use snafu::ResultExt; use store_api::storage::{ScanRequest, TableId}; -use super::CLUSTER_INFO; use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result}; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, CLUSTER_INFO}; use crate::system_schema::utils; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/information_schema/columns.rs b/src/catalog/src/system_schema/information_schema/columns.rs index 816ea61b3c..0c866f4841 100644 --- a/src/catalog/src/system_schema/information_schema/columns.rs +++ b/src/catalog/src/system_schema/information_schema/columns.rs @@ -38,11 +38,11 @@ use snafu::{OptionExt, ResultExt}; use sql::statements; use store_api::storage::{ScanRequest, TableId}; -use super::{InformationTable, COLUMNS}; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; use crate::information_schema::Predicates; +use crate::system_schema::information_schema::{InformationTable, COLUMNS}; use crate::CatalogManager; #[derive(Debug)] diff --git a/src/catalog/src/system_schema/information_schema/information_memory_table.rs b/src/catalog/src/system_schema/information_schema/information_memory_table.rs index 7d203087df..0b705fe140 100644 --- a/src/catalog/src/system_schema/information_schema/information_memory_table.rs +++ b/src/catalog/src/system_schema/information_schema/information_memory_table.rs @@ -18,7 +18,7 @@ use common_catalog::consts::{METRIC_ENGINE, MITO_ENGINE}; use datatypes::schema::{Schema, SchemaRef}; use datatypes::vectors::{Int64Vector, StringVector, VectorRef}; -use super::table_names::*; +use crate::system_schema::information_schema::table_names::*; use crate::system_schema::utils::tables::{ bigint_column, string_column, string_columns, timestamp_micro_column, }; diff --git a/src/catalog/src/system_schema/information_schema/key_column_usage.rs b/src/catalog/src/system_schema/information_schema/key_column_usage.rs index 937bd1dbce..9f08839303 100644 --- a/src/catalog/src/system_schema/information_schema/key_column_usage.rs +++ b/src/catalog/src/system_schema/information_schema/key_column_usage.rs @@ -31,11 +31,10 @@ use futures_util::TryStreamExt; use snafu::{OptionExt, ResultExt}; use store_api::storage::{ScanRequest, TableId}; -use super::KEY_COLUMN_USAGE; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, KEY_COLUMN_USAGE}; use crate::CatalogManager; pub const CONSTRAINT_SCHEMA: &str = "constraint_schema"; diff --git a/src/catalog/src/system_schema/information_schema/partitions.rs b/src/catalog/src/system_schema/information_schema/partitions.rs index 31e2e69d29..9b9634cb44 100644 --- a/src/catalog/src/system_schema/information_schema/partitions.rs +++ b/src/catalog/src/system_schema/information_schema/partitions.rs @@ -39,13 +39,12 @@ use snafu::{OptionExt, ResultExt}; use store_api::storage::{ScanRequest, TableId}; use table::metadata::{TableInfo, TableType}; -use super::PARTITIONS; use crate::error::{ CreateRecordBatchSnafu, FindPartitionsSnafu, InternalSnafu, PartitionManagerNotFoundSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; use crate::kvbackend::KvBackendCatalogManager; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, PARTITIONS}; use crate::CatalogManager; const TABLE_CATALOG: &str = "table_catalog"; diff --git a/src/catalog/src/system_schema/information_schema/procedure_info.rs b/src/catalog/src/system_schema/information_schema/procedure_info.rs index 8dd2f32f71..3ae237fdf1 100644 --- a/src/catalog/src/system_schema/information_schema/procedure_info.rs +++ b/src/catalog/src/system_schema/information_schema/procedure_info.rs @@ -33,9 +33,8 @@ use datatypes::vectors::{StringVectorBuilder, TimestampMillisecondVectorBuilder} use snafu::ResultExt; use store_api::storage::{ScanRequest, TableId}; -use super::PROCEDURE_INFO; use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result}; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, PROCEDURE_INFO}; use crate::system_schema::utils; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/information_schema/region_peers.rs b/src/catalog/src/system_schema/information_schema/region_peers.rs index 882cc2d3c4..1d46a9db01 100644 --- a/src/catalog/src/system_schema/information_schema/region_peers.rs +++ b/src/catalog/src/system_schema/information_schema/region_peers.rs @@ -35,13 +35,12 @@ use snafu::{OptionExt, ResultExt}; use store_api::storage::{RegionId, ScanRequest, TableId}; use table::metadata::TableType; -use super::REGION_PEERS; use crate::error::{ CreateRecordBatchSnafu, FindRegionRoutesSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; use crate::kvbackend::KvBackendCatalogManager; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, REGION_PEERS}; use crate::CatalogManager; pub const TABLE_CATALOG: &str = "table_catalog"; diff --git a/src/catalog/src/system_schema/information_schema/region_statistics.rs b/src/catalog/src/system_schema/information_schema/region_statistics.rs index fdd9e59752..8db6b860bf 100644 --- a/src/catalog/src/system_schema/information_schema/region_statistics.rs +++ b/src/catalog/src/system_schema/information_schema/region_statistics.rs @@ -30,9 +30,9 @@ use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, UInt64VectorB use snafu::ResultExt; use store_api::storage::{ScanRequest, TableId}; -use super::{InformationTable, REGION_STATISTICS}; use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result}; use crate::information_schema::Predicates; +use crate::system_schema::information_schema::{InformationTable, REGION_STATISTICS}; use crate::system_schema::utils; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/information_schema/runtime_metrics.rs b/src/catalog/src/system_schema/information_schema/runtime_metrics.rs index d2731b79b5..2af178c7a9 100644 --- a/src/catalog/src/system_schema/information_schema/runtime_metrics.rs +++ b/src/catalog/src/system_schema/information_schema/runtime_metrics.rs @@ -35,8 +35,8 @@ use itertools::Itertools; use snafu::ResultExt; use store_api::storage::{ScanRequest, TableId}; -use super::{InformationTable, RUNTIME_METRICS}; use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result}; +use crate::system_schema::information_schema::{InformationTable, RUNTIME_METRICS}; #[derive(Debug)] pub(super) struct InformationSchemaMetrics { diff --git a/src/catalog/src/system_schema/information_schema/schemata.rs b/src/catalog/src/system_schema/information_schema/schemata.rs index bad9eb5f2b..6738267d3f 100644 --- a/src/catalog/src/system_schema/information_schema/schemata.rs +++ b/src/catalog/src/system_schema/information_schema/schemata.rs @@ -31,12 +31,11 @@ use datatypes::vectors::StringVectorBuilder; use snafu::{OptionExt, ResultExt}; use store_api::storage::{ScanRequest, TableId}; -use super::SCHEMATA; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, TableMetadataManagerSnafu, UpgradeWeakCatalogManagerRefSnafu, }; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, SCHEMATA}; use crate::system_schema::utils; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/information_schema/table_constraints.rs b/src/catalog/src/system_schema/information_schema/table_constraints.rs index a0be49d575..a1f9d899f4 100644 --- a/src/catalog/src/system_schema/information_schema/table_constraints.rs +++ b/src/catalog/src/system_schema/information_schema/table_constraints.rs @@ -32,7 +32,6 @@ use futures::TryStreamExt; use snafu::{OptionExt, ResultExt}; use store_api::storage::{ScanRequest, TableId}; -use super::{InformationTable, TABLE_CONSTRAINTS}; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; @@ -40,6 +39,7 @@ use crate::information_schema::key_column_usage::{ PRI_CONSTRAINT_NAME, TIME_INDEX_CONSTRAINT_NAME, }; use crate::information_schema::Predicates; +use crate::system_schema::information_schema::{InformationTable, TABLE_CONSTRAINTS}; use crate::CatalogManager; /// The `TABLE_CONSTRAINTS` table describes which tables have constraints. diff --git a/src/catalog/src/system_schema/information_schema/tables.rs b/src/catalog/src/system_schema/information_schema/tables.rs index 79c6b59bbd..8c288b8e57 100644 --- a/src/catalog/src/system_schema/information_schema/tables.rs +++ b/src/catalog/src/system_schema/information_schema/tables.rs @@ -38,11 +38,10 @@ use snafu::{OptionExt, ResultExt}; use store_api::storage::{RegionId, ScanRequest, TableId}; use table::metadata::{TableInfo, TableType}; -use super::TABLES; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, TABLES}; use crate::system_schema::utils; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/information_schema/views.rs b/src/catalog/src/system_schema/information_schema/views.rs index 0f913799c7..d0424f528d 100644 --- a/src/catalog/src/system_schema/information_schema/views.rs +++ b/src/catalog/src/system_schema/information_schema/views.rs @@ -32,13 +32,12 @@ use snafu::{OptionExt, ResultExt}; use store_api::storage::{ScanRequest, TableId}; use table::metadata::TableType; -use super::VIEWS; use crate::error::{ CastManagerSnafu, CreateRecordBatchSnafu, GetViewCacheSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, ViewInfoNotFoundSnafu, }; use crate::kvbackend::KvBackendCatalogManager; -use crate::system_schema::information_schema::{InformationTable, Predicates}; +use crate::system_schema::information_schema::{InformationTable, Predicates, VIEWS}; use crate::CatalogManager; const INIT_CAPACITY: usize = 42; diff --git a/src/catalog/src/system_schema/memory_table.rs b/src/catalog/src/system_schema/memory_table.rs index 8d1c56131e..a6ea55ca96 100644 --- a/src/catalog/src/system_schema/memory_table.rs +++ b/src/catalog/src/system_schema/memory_table.rs @@ -29,8 +29,8 @@ use datatypes::vectors::VectorRef; use snafu::ResultExt; use store_api::storage::{ScanRequest, TableId}; -use super::SystemTable; use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result}; +use crate::system_schema::SystemTable; /// A memory table with specified schema and columns. #[derive(Debug)] diff --git a/src/catalog/src/system_schema/pg_catalog.rs b/src/catalog/src/system_schema/pg_catalog.rs index 822dc7571e..61dd47f13e 100644 --- a/src/catalog/src/system_schema/pg_catalog.rs +++ b/src/catalog/src/system_schema/pg_catalog.rs @@ -34,9 +34,9 @@ use table::TableRef; pub use table_names::*; use self::pg_namespace::oid_map::{PGNamespaceOidMap, PGNamespaceOidMapRef}; -use super::memory_table::MemoryTable; -use super::utils::tables::u32_column; -use super::{SystemSchemaProvider, SystemSchemaProviderInner, SystemTableRef}; +use crate::system_schema::memory_table::MemoryTable; +use crate::system_schema::utils::tables::u32_column; +use crate::system_schema::{SystemSchemaProvider, SystemSchemaProviderInner, SystemTableRef}; use crate::CatalogManager; lazy_static! { diff --git a/src/catalog/src/system_schema/pg_catalog/pg_catalog_memory_table.rs b/src/catalog/src/system_schema/pg_catalog/pg_catalog_memory_table.rs index cdc15329c1..aadbb5893d 100644 --- a/src/catalog/src/system_schema/pg_catalog/pg_catalog_memory_table.rs +++ b/src/catalog/src/system_schema/pg_catalog/pg_catalog_memory_table.rs @@ -17,9 +17,9 @@ use std::sync::Arc; use datatypes::schema::{ColumnSchema, Schema, SchemaRef}; use datatypes::vectors::{Int16Vector, StringVector, UInt32Vector, VectorRef}; -use super::oid_column; -use super::table_names::PG_TYPE; use crate::memory_table_cols; +use crate::system_schema::pg_catalog::oid_column; +use crate::system_schema::pg_catalog::table_names::PG_TYPE; use crate::system_schema::utils::tables::{i16_column, string_column}; fn pg_type_schema_columns() -> (Vec, Vec) { diff --git a/src/catalog/src/system_schema/pg_catalog/pg_class.rs b/src/catalog/src/system_schema/pg_catalog/pg_class.rs index 80e69eccee..57f8db882c 100644 --- a/src/catalog/src/system_schema/pg_catalog/pg_class.rs +++ b/src/catalog/src/system_schema/pg_catalog/pg_class.rs @@ -32,12 +32,12 @@ use snafu::{OptionExt, ResultExt}; use store_api::storage::ScanRequest; use table::metadata::TableType; -use super::pg_namespace::oid_map::PGNamespaceOidMapRef; -use super::{query_ctx, OID_COLUMN_NAME, PG_CLASS}; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; use crate::information_schema::Predicates; +use crate::system_schema::pg_catalog::pg_namespace::oid_map::PGNamespaceOidMapRef; +use crate::system_schema::pg_catalog::{query_ctx, OID_COLUMN_NAME, PG_CLASS}; use crate::system_schema::utils::tables::{string_column, u32_column}; use crate::system_schema::SystemTable; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/pg_catalog/pg_database.rs b/src/catalog/src/system_schema/pg_catalog/pg_database.rs index 1881c47ff3..8a788a25da 100644 --- a/src/catalog/src/system_schema/pg_catalog/pg_database.rs +++ b/src/catalog/src/system_schema/pg_catalog/pg_database.rs @@ -29,12 +29,12 @@ use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, VectorRef}; use snafu::{OptionExt, ResultExt}; use store_api::storage::ScanRequest; -use super::pg_namespace::oid_map::PGNamespaceOidMapRef; -use super::{query_ctx, OID_COLUMN_NAME, PG_DATABASE}; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; use crate::information_schema::Predicates; +use crate::system_schema::pg_catalog::pg_namespace::oid_map::PGNamespaceOidMapRef; +use crate::system_schema::pg_catalog::{query_ctx, OID_COLUMN_NAME, PG_DATABASE}; use crate::system_schema::utils::tables::{string_column, u32_column}; use crate::system_schema::SystemTable; use crate::CatalogManager; diff --git a/src/catalog/src/system_schema/pg_catalog/pg_namespace.rs b/src/catalog/src/system_schema/pg_catalog/pg_namespace.rs index b485447ac1..f8fc3e09c4 100644 --- a/src/catalog/src/system_schema/pg_catalog/pg_namespace.rs +++ b/src/catalog/src/system_schema/pg_catalog/pg_namespace.rs @@ -35,11 +35,13 @@ use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, VectorRef}; use snafu::{OptionExt, ResultExt}; use store_api::storage::ScanRequest; -use super::{query_ctx, PGNamespaceOidMapRef, OID_COLUMN_NAME, PG_NAMESPACE}; use crate::error::{ CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu, }; use crate::information_schema::Predicates; +use crate::system_schema::pg_catalog::{ + query_ctx, PGNamespaceOidMapRef, OID_COLUMN_NAME, PG_NAMESPACE, +}; use crate::system_schema::utils::tables::{string_column, u32_column}; use crate::system_schema::SystemTable; use crate::CatalogManager; diff --git a/src/common/datasource/src/file_format/csv.rs b/src/common/datasource/src/file_format/csv.rs index 85399684cf..c62f442a78 100644 --- a/src/common/datasource/src/file_format/csv.rs +++ b/src/common/datasource/src/file_format/csv.rs @@ -31,11 +31,10 @@ use snafu::ResultExt; use tokio_util::compat::FuturesAsyncReadCompatExt; use tokio_util::io::SyncIoBridge; -use super::stream_to_file; use crate::buffered_writer::DfRecordBatchEncoder; use crate::compression::CompressionType; use crate::error::{self, Result}; -use crate::file_format::{self, open_with_decoder, FileFormat}; +use crate::file_format::{self, open_with_decoder, stream_to_file, FileFormat}; use crate::share_buffer::SharedBuffer; #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/common/datasource/src/file_format/json.rs b/src/common/datasource/src/file_format/json.rs index 464b4b033e..977d9e7d65 100644 --- a/src/common/datasource/src/file_format/json.rs +++ b/src/common/datasource/src/file_format/json.rs @@ -33,11 +33,10 @@ use snafu::ResultExt; use tokio_util::compat::FuturesAsyncReadCompatExt; use tokio_util::io::SyncIoBridge; -use super::stream_to_file; use crate::buffered_writer::DfRecordBatchEncoder; use crate::compression::CompressionType; use crate::error::{self, Result}; -use crate::file_format::{self, open_with_decoder, FileFormat}; +use crate::file_format::{self, open_with_decoder, stream_to_file, FileFormat}; use crate::share_buffer::SharedBuffer; #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/src/common/function/src/scalars/geo/encoding.rs b/src/common/function/src/scalars/geo/encoding.rs index 145cd24bff..10a2df97be 100644 --- a/src/common/function/src/scalars/geo/encoding.rs +++ b/src/common/function/src/scalars/geo/encoding.rs @@ -27,7 +27,7 @@ use datatypes::value::{ListValue, Value}; use datatypes::vectors::VectorRef; use snafu::{ensure, ResultExt}; -use super::helpers::{ensure_columns_len, ensure_columns_n}; +use crate::scalars::geo::helpers::{ensure_columns_len, ensure_columns_n}; /// Accumulator of lat, lng, timestamp tuples #[derive(Debug)] diff --git a/src/common/function/src/scalars/geo/h3.rs b/src/common/function/src/scalars/geo/h3.rs index b04f386967..a6161701f7 100644 --- a/src/common/function/src/scalars/geo/h3.rs +++ b/src/common/function/src/scalars/geo/h3.rs @@ -31,8 +31,8 @@ use h3o::{CellIndex, LatLng, Resolution}; use once_cell::sync::Lazy; use snafu::ResultExt; -use super::helpers::{ensure_and_coerce, ensure_columns_len, ensure_columns_n}; use crate::function::{Function, FunctionContext}; +use crate::scalars::geo::helpers::{ensure_and_coerce, ensure_columns_len, ensure_columns_n}; static CELL_TYPES: Lazy> = Lazy::new(|| { vec![ diff --git a/src/common/function/src/scalars/geo/measure.rs b/src/common/function/src/scalars/geo/measure.rs index c95959a4a7..9ef16b7a76 100644 --- a/src/common/function/src/scalars/geo/measure.rs +++ b/src/common/function/src/scalars/geo/measure.rs @@ -26,9 +26,9 @@ use geo::{Area, Distance, Haversine}; use geo_types::Geometry; use snafu::ResultExt; -use super::helpers::{ensure_columns_len, ensure_columns_n}; -use super::wkt::parse_wkt; use crate::function::{Function, FunctionContext}; +use crate::scalars::geo::helpers::{ensure_columns_len, ensure_columns_n}; +use crate::scalars::geo::wkt::parse_wkt; /// Return WGS84(SRID: 4326) euclidean distance between two geometry object, in degree #[derive(Clone, Debug, Default, Display)] diff --git a/src/common/function/src/scalars/geo/relation.rs b/src/common/function/src/scalars/geo/relation.rs index 45e99888ac..a8c731d0e9 100644 --- a/src/common/function/src/scalars/geo/relation.rs +++ b/src/common/function/src/scalars/geo/relation.rs @@ -23,9 +23,9 @@ use geo::algorithm::contains::Contains; use geo::algorithm::intersects::Intersects; use geo::algorithm::within::Within; -use super::helpers::{ensure_columns_len, ensure_columns_n}; -use super::wkt::parse_wkt; use crate::function::{Function, FunctionContext}; +use crate::scalars::geo::helpers::{ensure_columns_len, ensure_columns_n}; +use crate::scalars::geo::wkt::parse_wkt; /// Test if spatial relationship: contains #[derive(Clone, Debug, Default, Display)] diff --git a/src/common/function/src/scalars/geo/wkt.rs b/src/common/function/src/scalars/geo/wkt.rs index 2a43ee31c0..a318b1dd7e 100644 --- a/src/common/function/src/scalars/geo/wkt.rs +++ b/src/common/function/src/scalars/geo/wkt.rs @@ -26,8 +26,8 @@ use once_cell::sync::Lazy; use snafu::ResultExt; use wkt::{ToWkt, TryFromWkt}; -use super::helpers::{ensure_columns_len, ensure_columns_n}; use crate::function::{Function, FunctionContext}; +use crate::scalars::geo::helpers::{ensure_columns_len, ensure_columns_n}; static COORDINATE_TYPES: Lazy> = Lazy::new(|| { vec![ diff --git a/src/common/meta/src/ddl/alter_database.rs b/src/common/meta/src/ddl/alter_database.rs index 983222144c..57987da4f4 100644 --- a/src/common/meta/src/ddl/alter_database.rs +++ b/src/common/meta/src/ddl/alter_database.rs @@ -20,8 +20,8 @@ use serde::{Deserialize, Serialize}; use snafu::{ensure, ResultExt}; use strum::AsRefStr; -use super::utils::handle_retry_error; use crate::cache_invalidator::Context; +use crate::ddl::utils::handle_retry_error; use crate::ddl::DdlContext; use crate::error::{Result, SchemaNotFoundSnafu}; use crate::instruction::CacheIdent; diff --git a/src/common/meta/src/ddl/create_flow.rs b/src/common/meta/src/ddl/create_flow.rs index 0c1aee35f2..d38f1e7fa0 100644 --- a/src/common/meta/src/ddl/create_flow.rs +++ b/src/common/meta/src/ddl/create_flow.rs @@ -35,9 +35,8 @@ use snafu::{ensure, ResultExt}; use strum::AsRefStr; use table::metadata::TableId; -use super::utils::add_peer_context_if_needed; use crate::cache_invalidator::Context; -use crate::ddl::utils::handle_retry_error; +use crate::ddl::utils::{add_peer_context_if_needed, handle_retry_error}; use crate::ddl::DdlContext; use crate::error::{self, Result}; use crate::instruction::{CacheIdent, CreateFlow}; diff --git a/src/common/meta/src/ddl/drop_database/cursor.rs b/src/common/meta/src/ddl/drop_database/cursor.rs index fcfe41f5ff..4df007bda8 100644 --- a/src/common/meta/src/ddl/drop_database/cursor.rs +++ b/src/common/meta/src/ddl/drop_database/cursor.rs @@ -22,11 +22,10 @@ use snafu::OptionExt; use table::metadata::{TableId, TableType}; use table::table_name::TableName; -use super::executor::DropDatabaseExecutor; -use super::metadata::DropDatabaseRemoveMetadata; -use super::DropTableTarget; use crate::cache_invalidator::Context; -use crate::ddl::drop_database::{DropDatabaseContext, State}; +use crate::ddl::drop_database::executor::DropDatabaseExecutor; +use crate::ddl::drop_database::metadata::DropDatabaseRemoveMetadata; +use crate::ddl::drop_database::{DropDatabaseContext, DropTableTarget, State}; use crate::ddl::DdlContext; use crate::error::{Result, TableInfoNotFoundSnafu}; use crate::instruction::CacheIdent; diff --git a/src/common/meta/src/ddl/drop_database/executor.rs b/src/common/meta/src/ddl/drop_database/executor.rs index f662e826e7..21b185c189 100644 --- a/src/common/meta/src/ddl/drop_database/executor.rs +++ b/src/common/meta/src/ddl/drop_database/executor.rs @@ -22,9 +22,8 @@ use snafu::OptionExt; use table::metadata::TableId; use table::table_name::TableName; -use super::cursor::DropDatabaseCursor; -use super::{DropDatabaseContext, DropTableTarget}; -use crate::ddl::drop_database::State; +use crate::ddl::drop_database::cursor::DropDatabaseCursor; +use crate::ddl::drop_database::{DropDatabaseContext, DropTableTarget, State}; use crate::ddl::drop_table::executor::DropTableExecutor; use crate::ddl::utils::extract_region_wal_options; use crate::ddl::DdlContext; diff --git a/src/common/meta/src/ddl/drop_database/metadata.rs b/src/common/meta/src/ddl/drop_database/metadata.rs index 0058061460..61a30360b5 100644 --- a/src/common/meta/src/ddl/drop_database/metadata.rs +++ b/src/common/meta/src/ddl/drop_database/metadata.rs @@ -17,8 +17,8 @@ use std::any::Any; use common_procedure::Status; use serde::{Deserialize, Serialize}; -use super::end::DropDatabaseEnd; use crate::cache_invalidator::Context; +use crate::ddl::drop_database::end::DropDatabaseEnd; use crate::ddl::drop_database::{DropDatabaseContext, State}; use crate::ddl::DdlContext; use crate::error::Result; diff --git a/src/common/meta/src/ddl/drop_flow.rs b/src/common/meta/src/ddl/drop_flow.rs index 38a4622aad..d1c73c06d0 100644 --- a/src/common/meta/src/ddl/drop_flow.rs +++ b/src/common/meta/src/ddl/drop_flow.rs @@ -28,8 +28,8 @@ use serde::{Deserialize, Serialize}; use snafu::{ensure, ResultExt}; use strum::AsRefStr; -use super::utils::{add_peer_context_if_needed, handle_retry_error}; use crate::cache_invalidator::Context; +use crate::ddl::utils::{add_peer_context_if_needed, handle_retry_error}; use crate::ddl::DdlContext; use crate::error::{self, Result}; use crate::flow_name::FlowName; diff --git a/src/common/meta/src/ddl/drop_view.rs b/src/common/meta/src/ddl/drop_view.rs index d803bf68e5..e0b3f8b561 100644 --- a/src/common/meta/src/ddl/drop_view.rs +++ b/src/common/meta/src/ddl/drop_view.rs @@ -24,8 +24,8 @@ use strum::AsRefStr; use table::metadata::{RawTableInfo, TableId, TableType}; use table::table_reference::TableReference; -use super::utils::handle_retry_error; use crate::cache_invalidator::Context; +use crate::ddl::utils::handle_retry_error; use crate::ddl::DdlContext; use crate::error::{self, Result}; use crate::instruction::CacheIdent; diff --git a/src/common/meta/src/ddl/truncate_table.rs b/src/common/meta/src/ddl/truncate_table.rs index c0608dc3b3..531dd36fb7 100644 --- a/src/common/meta/src/ddl/truncate_table.rs +++ b/src/common/meta/src/ddl/truncate_table.rs @@ -31,8 +31,7 @@ use table::metadata::{RawTableInfo, TableId}; use table::table_name::TableName; use table::table_reference::TableReference; -use super::utils::handle_retry_error; -use crate::ddl::utils::add_peer_context_if_needed; +use crate::ddl::utils::{add_peer_context_if_needed, handle_retry_error}; use crate::ddl::DdlContext; use crate::error::{Result, TableNotFoundSnafu}; use crate::key::table_info::TableInfoValue; diff --git a/src/common/meta/src/key/datanode_table.rs b/src/common/meta/src/key/datanode_table.rs index c64ee89b85..012a08fbe3 100644 --- a/src/common/meta/src/key/datanode_table.rs +++ b/src/common/meta/src/key/datanode_table.rs @@ -21,11 +21,11 @@ use snafu::OptionExt; use store_api::storage::RegionNumber; use table::metadata::TableId; -use super::table_route::PhysicalTableRouteValue; -use super::MetadataKey; use crate::error::{DatanodeTableInfoNotFoundSnafu, InvalidMetadataSnafu, Result}; +use crate::key::table_route::PhysicalTableRouteValue; use crate::key::{ - MetadataValue, RegionDistribution, DATANODE_TABLE_KEY_PATTERN, DATANODE_TABLE_KEY_PREFIX, + MetadataKey, MetadataValue, RegionDistribution, DATANODE_TABLE_KEY_PATTERN, + DATANODE_TABLE_KEY_PREFIX, }; use crate::kv_backend::txn::{Txn, TxnOp}; use crate::kv_backend::KvBackendRef; diff --git a/src/common/meta/src/key/flow.rs b/src/common/meta/src/key/flow.rs index 894cf10b76..6af910b2fc 100644 --- a/src/common/meta/src/key/flow.rs +++ b/src/common/meta/src/key/flow.rs @@ -31,7 +31,6 @@ use self::flow_info::{FlowInfoKey, FlowInfoValue}; use self::flow_name::FlowNameKey; use self::flownode_flow::FlownodeFlowKey; use self::table_flow::TableFlowKey; -use super::FlowPartitionId; use crate::ensure_values; use crate::error::{self, Result}; use crate::key::flow::flow_info::FlowInfoManager; @@ -40,7 +39,7 @@ use crate::key::flow::flow_state::FlowStateManager; use crate::key::flow::flownode_flow::FlownodeFlowManager; pub use crate::key::flow::table_flow::{TableFlowManager, TableFlowManagerRef}; use crate::key::txn_helper::TxnOpGetResponseSet; -use crate::key::{DeserializedValueWithBytes, FlowId, MetadataKey}; +use crate::key::{DeserializedValueWithBytes, FlowId, FlowPartitionId, MetadataKey}; use crate::kv_backend::txn::Txn; use crate::kv_backend::KvBackendRef; use crate::rpc::store::BatchDeleteRequest; diff --git a/src/common/meta/src/key/schema_name.rs b/src/common/meta/src/key/schema_name.rs index 41d4f503b1..dadb920a2a 100644 --- a/src/common/meta/src/key/schema_name.rs +++ b/src/common/meta/src/key/schema_name.rs @@ -22,11 +22,12 @@ use humantime_serde::re::humantime; use serde::{Deserialize, Serialize}; use snafu::{ensure, OptionExt, ResultExt}; -use super::txn_helper::TxnOpGetResponseSet; -use super::DeserializedValueWithBytes; use crate::ensure_values; use crate::error::{self, Error, InvalidMetadataSnafu, ParseOptionSnafu, Result}; -use crate::key::{MetadataKey, SCHEMA_NAME_KEY_PATTERN, SCHEMA_NAME_KEY_PREFIX}; +use crate::key::txn_helper::TxnOpGetResponseSet; +use crate::key::{ + DeserializedValueWithBytes, MetadataKey, SCHEMA_NAME_KEY_PATTERN, SCHEMA_NAME_KEY_PREFIX, +}; use crate::kv_backend::txn::Txn; use crate::kv_backend::KvBackendRef; use crate::range_stream::{PaginationStream, DEFAULT_PAGE_SIZE}; diff --git a/src/common/meta/src/key/table_info.rs b/src/common/meta/src/key/table_info.rs index 0a25a60899..3249bf686b 100644 --- a/src/common/meta/src/key/table_info.rs +++ b/src/common/meta/src/key/table_info.rs @@ -22,11 +22,13 @@ use table::metadata::{RawTableInfo, TableId}; use table::table_name::TableName; use table::table_reference::TableReference; -use super::TABLE_INFO_KEY_PATTERN; use crate::ddl::utils::region_storage_path; use crate::error::{InvalidMetadataSnafu, Result}; use crate::key::txn_helper::TxnOpGetResponseSet; -use crate::key::{DeserializedValueWithBytes, MetadataKey, MetadataValue, TABLE_INFO_KEY_PREFIX}; +use crate::key::{ + DeserializedValueWithBytes, MetadataKey, MetadataValue, TABLE_INFO_KEY_PATTERN, + TABLE_INFO_KEY_PREFIX, +}; use crate::kv_backend::txn::Txn; use crate::kv_backend::KvBackendRef; use crate::rpc::store::BatchGetRequest; diff --git a/src/common/meta/src/key/table_name.rs b/src/common/meta/src/key/table_name.rs index a504c4a0b8..9dbe405aec 100644 --- a/src/common/meta/src/key/table_name.rs +++ b/src/common/meta/src/key/table_name.rs @@ -23,8 +23,8 @@ use table::metadata::TableId; use table::table_name::TableName; use table::table_reference::TableReference; -use super::{MetadataKey, MetadataValue, TABLE_NAME_KEY_PATTERN, TABLE_NAME_KEY_PREFIX}; use crate::error::{Error, InvalidMetadataSnafu, Result}; +use crate::key::{MetadataKey, MetadataValue, TABLE_NAME_KEY_PATTERN, TABLE_NAME_KEY_PREFIX}; use crate::kv_backend::memory::MemoryKvBackend; use crate::kv_backend::txn::{Txn, TxnOp}; use crate::kv_backend::KvBackendRef; diff --git a/src/common/meta/src/key/view_info.rs b/src/common/meta/src/key/view_info.rs index e5b5950e52..9f4f574c27 100644 --- a/src/common/meta/src/key/view_info.rs +++ b/src/common/meta/src/key/view_info.rs @@ -21,10 +21,12 @@ use snafu::OptionExt; use table::metadata::TableId; use table::table_name::TableName; -use super::VIEW_INFO_KEY_PATTERN; use crate::error::{InvalidViewInfoSnafu, Result}; use crate::key::txn_helper::TxnOpGetResponseSet; -use crate::key::{DeserializedValueWithBytes, MetadataKey, MetadataValue, VIEW_INFO_KEY_PREFIX}; +use crate::key::{ + DeserializedValueWithBytes, MetadataKey, MetadataValue, VIEW_INFO_KEY_PATTERN, + VIEW_INFO_KEY_PREFIX, +}; use crate::kv_backend::txn::Txn; use crate::kv_backend::KvBackendRef; use crate::rpc::store::BatchGetRequest; diff --git a/src/common/meta/src/kv_backend/etcd.rs b/src/common/meta/src/kv_backend/etcd.rs index 17c4b7db71..f326984cca 100644 --- a/src/common/meta/src/kv_backend/etcd.rs +++ b/src/common/meta/src/kv_backend/etcd.rs @@ -21,10 +21,9 @@ use etcd_client::{ }; use snafu::{ensure, ResultExt}; -use super::KvBackendRef; use crate::error::{self, Error, Result}; use crate::kv_backend::txn::{Txn as KvTxn, TxnResponse as KvTxnResponse}; -use crate::kv_backend::{KvBackend, TxnService}; +use crate::kv_backend::{KvBackend, KvBackendRef, TxnService}; use crate::metrics::METRIC_META_TXN_REQUEST; use crate::rpc::store::{ BatchDeleteRequest, BatchDeleteResponse, BatchGetRequest, BatchGetResponse, BatchPutRequest, diff --git a/src/common/meta/src/kv_backend/memory.rs b/src/common/meta/src/kv_backend/memory.rs index 54e82130d3..948992388c 100644 --- a/src/common/meta/src/kv_backend/memory.rs +++ b/src/common/meta/src/kv_backend/memory.rs @@ -20,9 +20,8 @@ use std::sync::{Arc, RwLock}; use async_trait::async_trait; use common_error::ext::ErrorExt; -use super::{KvBackendRef, ResettableKvBackend}; use crate::kv_backend::txn::{Txn, TxnOp, TxnOpResponse, TxnRequest, TxnResponse}; -use crate::kv_backend::{KvBackend, TxnService}; +use crate::kv_backend::{KvBackend, KvBackendRef, ResettableKvBackend, TxnService}; use crate::metrics::METRIC_META_TXN_REQUEST; use crate::rpc::store::{ BatchDeleteRequest, BatchDeleteResponse, BatchGetRequest, BatchGetResponse, BatchPutRequest, diff --git a/src/common/meta/src/kv_backend/txn/etcd.rs b/src/common/meta/src/kv_backend/txn/etcd.rs index cb516ed51a..339920a4eb 100644 --- a/src/common/meta/src/kv_backend/txn/etcd.rs +++ b/src/common/meta/src/kv_backend/txn/etcd.rs @@ -17,8 +17,8 @@ use etcd_client::{ TxnOpResponse as EtcdTxnOpResponse, TxnResponse as EtcdTxnResponse, }; -use super::{Compare, CompareOp, Txn, TxnOp, TxnOpResponse, TxnResponse}; use crate::error::{self, Result}; +use crate::kv_backend::txn::{Compare, CompareOp, Txn, TxnOp, TxnOpResponse, TxnResponse}; use crate::rpc::store::{DeleteRangeResponse, PutResponse, RangeResponse}; use crate::rpc::KeyValue; diff --git a/src/common/procedure/src/local/runner.rs b/src/common/procedure/src/local/runner.rs index 441ef2d94d..41067b5e01 100644 --- a/src/common/procedure/src/local/runner.rs +++ b/src/common/procedure/src/local/runner.rs @@ -22,8 +22,8 @@ use rand::Rng; use snafu::ResultExt; use tokio::time; -use super::rwlock::OwnedKeyRwLockGuard; use crate::error::{self, ProcedurePanicSnafu, Result, RollbackTimesExceededSnafu}; +use crate::local::rwlock::OwnedKeyRwLockGuard; use crate::local::{ManagerContext, ProcedureMeta, ProcedureMetaRef}; use crate::procedure::{Output, StringKey}; use crate::store::{ProcedureMessage, ProcedureStore}; diff --git a/src/common/procedure/src/store/util.rs b/src/common/procedure/src/store/util.rs index c8ed3bf50f..a03ac9f983 100644 --- a/src/common/procedure/src/store/util.rs +++ b/src/common/procedure/src/store/util.rs @@ -18,9 +18,9 @@ use async_stream::try_stream; use futures::{Stream, TryStreamExt}; use snafu::{ensure, ResultExt}; -use super::state_store::KeySet; use crate::error; use crate::error::Result; +use crate::store::state_store::KeySet; struct CollectingState { pairs: Vec<(String, Vec)>, diff --git a/src/common/wal/src/config/kafka/datanode.rs b/src/common/wal/src/config/kafka/datanode.rs index 4892b6d809..77cf05397d 100644 --- a/src/common/wal/src/config/kafka/datanode.rs +++ b/src/common/wal/src/config/kafka/datanode.rs @@ -17,8 +17,7 @@ use std::time::Duration; use common_base::readable_size::ReadableSize; use serde::{Deserialize, Serialize}; -use super::common::KafkaConnectionConfig; -use crate::config::kafka::common::KafkaTopicConfig; +use crate::config::kafka::common::{KafkaConnectionConfig, KafkaTopicConfig}; /// Kafka wal configurations for datanode. #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)] diff --git a/src/common/wal/src/config/kafka/metasrv.rs b/src/common/wal/src/config/kafka/metasrv.rs index 9a30d08a59..27df3569b8 100644 --- a/src/common/wal/src/config/kafka/metasrv.rs +++ b/src/common/wal/src/config/kafka/metasrv.rs @@ -14,8 +14,7 @@ use serde::{Deserialize, Serialize}; -use super::common::KafkaConnectionConfig; -use crate::config::kafka::common::KafkaTopicConfig; +use crate::config::kafka::common::{KafkaConnectionConfig, KafkaTopicConfig}; /// Kafka wal configurations for metasrv. #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/src/datanode/src/heartbeat/handler.rs b/src/datanode/src/heartbeat/handler.rs index 319caf3c57..bf93d15128 100644 --- a/src/datanode/src/heartbeat/handler.rs +++ b/src/datanode/src/heartbeat/handler.rs @@ -30,7 +30,7 @@ mod flush_region; mod open_region; mod upgrade_region; -use super::task_tracker::TaskTracker; +use crate::heartbeat::task_tracker::TaskTracker; use crate::region_server::RegionServer; /// Handler for [Instruction::OpenRegion] and [Instruction::CloseRegion]. diff --git a/src/datatypes/src/vectors/dictionary.rs b/src/datatypes/src/vectors/dictionary.rs index c2974592f6..e6831d2ed7 100644 --- a/src/datatypes/src/vectors/dictionary.rs +++ b/src/datatypes/src/vectors/dictionary.rs @@ -21,12 +21,12 @@ use arrow_array::{ArrayRef, DictionaryArray, Int32Array}; use serde_json::Value as JsonValue; use snafu::ResultExt; -use super::operations::VectorOp; use crate::data_type::ConcreteDataType; use crate::error::{self, Result}; use crate::serialize::Serializable; use crate::types::DictionaryType; use crate::value::{Value, ValueRef}; +use crate::vectors::operations::VectorOp; use crate::vectors::{self, Helper, Validity, Vector, VectorRef}; /// Vector of dictionaries, basically backed by Arrow's `DictionaryArray`. diff --git a/src/flow/src/adapter/refill.rs b/src/flow/src/adapter/refill.rs index 1b5f58b47d..25287df62b 100644 --- a/src/flow/src/adapter/refill.rs +++ b/src/flow/src/adapter/refill.rs @@ -30,9 +30,8 @@ use session::context::QueryContextBuilder; use snafu::{ensure, OptionExt, ResultExt}; use table::metadata::TableId; -use super::{FlowId, FlowWorkerManager}; use crate::adapter::table_source::ManagedTableSource; -use crate::adapter::FlowWorkerManagerRef; +use crate::adapter::{FlowId, FlowWorkerManager, FlowWorkerManagerRef}; use crate::error::{FlowNotFoundSnafu, JoinTaskSnafu, UnexpectedSnafu}; use crate::expr::error::ExternalSnafu; use crate::expr::utils::find_plan_time_window_expr_lower_bound; diff --git a/src/flow/src/compute/render.rs b/src/flow/src/compute/render.rs index b992872c60..b2d0c0c12d 100644 --- a/src/flow/src/compute/render.rs +++ b/src/flow/src/compute/render.rs @@ -24,8 +24,7 @@ use hydroflow::scheduled::port::{PortCtx, SEND}; use itertools::Itertools; use snafu::OptionExt; -use super::state::Scheduler; -use crate::compute::state::DataflowState; +use crate::compute::state::{DataflowState, Scheduler}; use crate::compute::types::{Collection, CollectionBundle, ErrCollector, Toff}; use crate::error::{Error, InvalidQuerySnafu, NotImplementedSnafu}; use crate::expr::{self, Batch, GlobalId, LocalId}; diff --git a/src/frontend/src/instance/jaeger.rs b/src/frontend/src/instance/jaeger.rs index d1d7fbaf5d..a742dd69d4 100644 --- a/src/frontend/src/instance/jaeger.rs +++ b/src/frontend/src/instance/jaeger.rs @@ -47,7 +47,7 @@ use snafu::{OptionExt, ResultExt}; use table::requests::{TABLE_DATA_MODEL, TABLE_DATA_MODEL_TRACE_V1}; use table::table::adapter::DfTableProviderAdapter; -use super::Instance; +use crate::instance::Instance; const DEFAULT_LIMIT: usize = 2000; diff --git a/src/frontend/src/instance/logs.rs b/src/frontend/src/instance/logs.rs index a1abd434cc..8aacb86f5d 100644 --- a/src/frontend/src/instance/logs.rs +++ b/src/frontend/src/instance/logs.rs @@ -26,7 +26,7 @@ use session::context::{QueryContext, QueryContextRef}; use snafu::ResultExt; use tonic::async_trait; -use super::Instance; +use crate::instance::Instance; #[async_trait] impl LogQueryHandler for Instance { diff --git a/src/index/src/bloom_filter/creator/finalize_segment.rs b/src/index/src/bloom_filter/creator/finalize_segment.rs index 84f358f053..1ba848a74d 100644 --- a/src/index/src/bloom_filter/creator/finalize_segment.rs +++ b/src/index/src/bloom_filter/creator/finalize_segment.rs @@ -22,7 +22,7 @@ use futures::stream::StreamExt; use futures::{stream, AsyncWriteExt, Stream}; use snafu::ResultExt; -use super::intermediate_codec::IntermediateBloomFilterCodecV1; +use crate::bloom_filter::creator::intermediate_codec::IntermediateBloomFilterCodecV1; use crate::bloom_filter::creator::{FALSE_POSITIVE_RATE, SEED}; use crate::bloom_filter::error::{IntermediateSnafu, IoSnafu, Result}; use crate::external_provider::ExternalTempFileProvider; diff --git a/src/index/src/inverted_index/format/reader/blob.rs b/src/index/src/inverted_index/format/reader/blob.rs index 786447e0f0..2db0388cef 100644 --- a/src/index/src/inverted_index/format/reader/blob.rs +++ b/src/index/src/inverted_index/format/reader/blob.rs @@ -21,9 +21,10 @@ use common_base::range_read::RangeReader; use greptime_proto::v1::index::InvertedIndexMetas; use snafu::{ensure, ResultExt}; -use super::footer::DEFAULT_PREFETCH_SIZE; use crate::inverted_index::error::{CommonIoSnafu, Result, UnexpectedBlobSizeSnafu}; -use crate::inverted_index::format::reader::footer::InvertedIndexFooterReader; +use crate::inverted_index::format::reader::footer::{ + InvertedIndexFooterReader, DEFAULT_PREFETCH_SIZE, +}; use crate::inverted_index::format::reader::InvertedIndexReader; use crate::inverted_index::format::MIN_BLOB_SIZE; diff --git a/src/log-store/src/kafka/consumer.rs b/src/log-store/src/kafka/consumer.rs index 4afde1a116..c018d69997 100644 --- a/src/log-store/src/kafka/consumer.rs +++ b/src/log-store/src/kafka/consumer.rs @@ -26,7 +26,7 @@ use pin_project::pin_project; use rskafka::client::partition::PartitionClient; use rskafka::record::RecordAndOffset; -use super::index::{NextBatchHint, RegionWalIndexIterator}; +use crate::kafka::index::{NextBatchHint, RegionWalIndexIterator}; #[async_trait::async_trait] pub trait FetchClient: std::fmt::Debug + Send + Sync { diff --git a/src/log-store/src/kafka/index/collector.rs b/src/log-store/src/kafka/index/collector.rs index 22f1da7cf8..95e909a2ec 100644 --- a/src/log-store/src/kafka/index/collector.rs +++ b/src/log-store/src/kafka/index/collector.rs @@ -29,10 +29,9 @@ use tokio::select; use tokio::sync::mpsc::Sender; use tokio::sync::Mutex as TokioMutex; -use super::default_index_file; use crate::error::{self, Result}; use crate::kafka::index::encoder::{DatanodeWalIndexes, IndexEncoder}; -use crate::kafka::index::JsonIndexEncoder; +use crate::kafka::index::{default_index_file, JsonIndexEncoder}; use crate::kafka::worker::{DumpIndexRequest, TruncateIndexRequest, WorkerRequest}; /// The [`IndexCollector`] trait defines the operations for managing and collecting index entries. diff --git a/src/log-store/src/kafka/log_store.rs b/src/log-store/src/kafka/log_store.rs index 5e9a3c3a38..3cc728a998 100644 --- a/src/log-store/src/kafka/log_store.rs +++ b/src/log-store/src/kafka/log_store.rs @@ -29,11 +29,12 @@ use store_api::logstore::provider::{KafkaProvider, Provider}; use store_api::logstore::{AppendBatchResponse, LogStore, SendableEntryStream, WalIndex}; use store_api::storage::RegionId; -use super::index::build_region_wal_index_iterator; use crate::error::{self, ConsumeRecordSnafu, Error, GetOffsetSnafu, InvalidProviderSnafu, Result}; use crate::kafka::client_manager::{ClientManager, ClientManagerRef}; use crate::kafka::consumer::{ConsumerBuilder, RecordsBuffer}; -use crate::kafka::index::{GlobalIndexCollector, MIN_BATCH_WINDOW_SIZE}; +use crate::kafka::index::{ + build_region_wal_index_iterator, GlobalIndexCollector, MIN_BATCH_WINDOW_SIZE, +}; use crate::kafka::producer::OrderedBatchProducerRef; use crate::kafka::util::record::{ convert_to_kafka_records, maybe_emit_entry, remaining_entries, Record, ESTIMATED_META_SIZE, diff --git a/src/log-store/src/kafka/worker/dump_index.rs b/src/log-store/src/kafka/worker/dump_index.rs index 92b1d34650..0de02c5c9e 100644 --- a/src/log-store/src/kafka/worker/dump_index.rs +++ b/src/log-store/src/kafka/worker/dump_index.rs @@ -16,9 +16,8 @@ use common_telemetry::error; use rskafka::client::partition::OffsetAt; use snafu::ResultExt; -use super::DumpIndexRequest; use crate::error; -use crate::kafka::worker::BackgroundProducerWorker; +use crate::kafka::worker::{BackgroundProducerWorker, DumpIndexRequest}; impl BackgroundProducerWorker { pub(crate) async fn dump_index(&mut self, req: DumpIndexRequest) { diff --git a/src/meta-srv/src/metasrv/builder.rs b/src/meta-srv/src/metasrv/builder.rs index e3c1f58749..0f1a04e47b 100644 --- a/src/meta-srv/src/metasrv/builder.rs +++ b/src/meta-srv/src/metasrv/builder.rs @@ -42,7 +42,6 @@ use common_procedure::local::{LocalManager, ManagerConfig}; use common_procedure::ProcedureManagerRef; use snafu::ResultExt; -use super::{SelectTarget, FLOW_ID_SEQ}; use crate::cache_invalidator::MetasrvCacheInvalidator; use crate::cluster::{MetaPeerClientBuilder, MetaPeerClientRef}; use crate::error::{self, BuildWalOptionsAllocatorSnafu, Result}; @@ -54,7 +53,8 @@ use crate::handler::region_lease_handler::{CustomizedRegionLeaseRenewerRef, Regi use crate::handler::{HeartbeatHandlerGroupBuilder, HeartbeatMailbox, Pushers}; use crate::lease::MetaPeerLookupService; use crate::metasrv::{ - ElectionRef, Metasrv, MetasrvInfo, MetasrvOptions, SelectorContext, SelectorRef, TABLE_ID_SEQ, + ElectionRef, Metasrv, MetasrvInfo, MetasrvOptions, SelectTarget, SelectorContext, SelectorRef, + FLOW_ID_SEQ, TABLE_ID_SEQ, }; use crate::procedure::region_migration::manager::RegionMigrationManager; use crate::procedure::region_migration::DefaultContextFactory; diff --git a/src/meta-srv/src/procedure/region_migration/downgrade_leader_region.rs b/src/meta-srv/src/procedure/region_migration/downgrade_leader_region.rs index e93c787e17..41d437d466 100644 --- a/src/meta-srv/src/procedure/region_migration/downgrade_leader_region.rs +++ b/src/meta-srv/src/procedure/region_migration/downgrade_leader_region.rs @@ -28,10 +28,10 @@ use snafu::{OptionExt, ResultExt}; use store_api::storage::RegionId; use tokio::time::{sleep, Instant}; -use super::update_metadata::UpdateMetadata; -use super::upgrade_candidate_region::UpgradeCandidateRegion; use crate::error::{self, Result}; use crate::handler::HeartbeatMailbox; +use crate::procedure::region_migration::update_metadata::UpdateMetadata; +use crate::procedure::region_migration::upgrade_candidate_region::UpgradeCandidateRegion; use crate::procedure::region_migration::{Context, State}; use crate::service::mailbox::Channel; diff --git a/src/meta-srv/src/selector/common.rs b/src/meta-srv/src/selector/common.rs index 85abcdfca2..24352c14c2 100644 --- a/src/meta-srv/src/selector/common.rs +++ b/src/meta-srv/src/selector/common.rs @@ -15,10 +15,10 @@ use common_meta::peer::Peer; use snafu::ensure; -use super::weighted_choose::WeightedChoose; use crate::error; use crate::error::Result; use crate::metasrv::SelectTarget; +use crate::selector::weighted_choose::WeightedChoose; use crate::selector::SelectorOptions; /// According to the `opts`, choose peers from the `weight_array` through `weighted_choose`. diff --git a/src/meta-srv/src/service/procedure.rs b/src/meta-srv/src/service/procedure.rs index bb41dd3ba9..f9881b7f9b 100644 --- a/src/meta-srv/src/service/procedure.rs +++ b/src/meta-srv/src/service/procedure.rs @@ -28,10 +28,10 @@ use common_telemetry::warn; use snafu::{OptionExt, ResultExt}; use tonic::{Request, Response}; -use super::GrpcResult; use crate::error; use crate::metasrv::Metasrv; use crate::procedure::region_migration::manager::RegionMigrationProcedureTask; +use crate::service::GrpcResult; #[async_trait::async_trait] impl procedure_service_server::ProcedureService for Metasrv { diff --git a/src/metric-engine/src/engine/close.rs b/src/metric-engine/src/engine/close.rs index cbda26ec59..78c45fc453 100644 --- a/src/metric-engine/src/engine/close.rs +++ b/src/metric-engine/src/engine/close.rs @@ -20,7 +20,7 @@ use store_api::region_engine::RegionEngine; use store_api::region_request::{AffectedRows, RegionCloseRequest, RegionRequest}; use store_api::storage::RegionId; -use super::MetricEngineInner; +use crate::engine::MetricEngineInner; use crate::error::{CloseMitoRegionSnafu, Result}; use crate::metrics::PHYSICAL_REGION_COUNT; use crate::utils; diff --git a/src/metric-engine/src/engine/drop.rs b/src/metric-engine/src/engine/drop.rs index beefd86e46..2bdb61c70c 100644 --- a/src/metric-engine/src/engine/drop.rs +++ b/src/metric-engine/src/engine/drop.rs @@ -19,7 +19,7 @@ use store_api::region_engine::RegionEngine; use store_api::region_request::{AffectedRows, RegionDropRequest, RegionRequest}; use store_api::storage::RegionId; -use super::MetricEngineInner; +use crate::engine::MetricEngineInner; use crate::error::{ CloseMitoRegionSnafu, LogicalRegionNotFoundSnafu, PhysicalRegionBusySnafu, Result, }; diff --git a/src/metric-engine/src/engine/open.rs b/src/metric-engine/src/engine/open.rs index 37c2f881af..eb9f266be2 100644 --- a/src/metric-engine/src/engine/open.rs +++ b/src/metric-engine/src/engine/open.rs @@ -24,9 +24,9 @@ use store_api::region_engine::RegionEngine; use store_api::region_request::{AffectedRows, RegionOpenRequest, RegionRequest}; use store_api::storage::RegionId; -use super::MetricEngineInner; use crate::engine::create::region_options_for_metadata_region; use crate::engine::options::{set_data_region_options, PhysicalRegionOptions}; +use crate::engine::MetricEngineInner; use crate::error::{OpenMitoRegionSnafu, PhysicalRegionNotFoundSnafu, Result}; use crate::metrics::{LOGICAL_REGION_COUNT, PHYSICAL_REGION_COUNT}; use crate::utils; diff --git a/src/mito2/src/manifest/manager.rs b/src/mito2/src/manifest/manager.rs index 6afe0a3874..d60f018b4e 100644 --- a/src/mito2/src/manifest/manager.rs +++ b/src/mito2/src/manifest/manager.rs @@ -23,7 +23,6 @@ use snafu::{ensure, OptionExt, ResultExt}; use store_api::manifest::{ManifestVersion, MAX_VERSION, MIN_VERSION}; use store_api::metadata::RegionMetadataRef; -use super::storage::is_checkpoint_file; use crate::error::{ self, InstallManifestToSnafu, NoCheckpointSnafu, NoManifestsSnafu, RegionStoppedSnafu, Result, }; @@ -32,7 +31,9 @@ use crate::manifest::action::{ RegionMetaActionList, }; use crate::manifest::checkpointer::Checkpointer; -use crate::manifest::storage::{file_version, is_delta_file, ManifestObjectStore}; +use crate::manifest::storage::{ + file_version, is_checkpoint_file, is_delta_file, ManifestObjectStore, +}; use crate::metrics::MANIFEST_OP_ELAPSED; /// Options for [RegionManifestManager]. diff --git a/src/mito2/src/row_converter/dense.rs b/src/mito2/src/row_converter/dense.rs index 757690ce2d..d032c782e7 100644 --- a/src/mito2/src/row_converter/dense.rs +++ b/src/mito2/src/row_converter/dense.rs @@ -32,13 +32,14 @@ use store_api::codec::PrimaryKeyEncoding; use store_api::metadata::{RegionMetadata, RegionMetadataRef}; use store_api::storage::ColumnId; -use super::{CompositeValues, PrimaryKeyFilter}; use crate::error::{ self, FieldTypeMismatchSnafu, NotSupportedFieldSnafu, Result, SerializeFieldSnafu, }; use crate::memtable::key_values::KeyValue; use crate::memtable::partition_tree::DensePrimaryKeyFilter; -use crate::row_converter::{PrimaryKeyCodec, PrimaryKeyCodecExt}; +use crate::row_converter::{ + CompositeValues, PrimaryKeyCodec, PrimaryKeyCodecExt, PrimaryKeyFilter, +}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct SortField { diff --git a/src/operator/src/statement/ddl.rs b/src/operator/src/statement/ddl.rs index 0cd7ccd591..8450c73c4d 100644 --- a/src/operator/src/statement/ddl.rs +++ b/src/operator/src/statement/ddl.rs @@ -68,7 +68,6 @@ use table::requests::{AlterKind, AlterTableRequest, TableOptions, COMMENT_KEY}; use table::table_name::TableName; use table::TableRef; -use super::StatementExecutor; use crate::error::{ self, AlterExprToRequestSnafu, CatalogSnafu, ColumnDataTypeSnafu, ColumnNotFoundSnafu, ConvertSchemaSnafu, CreateLogicalTablesSnafu, CreateTableInfoSnafu, DeserializePartitionSnafu, @@ -80,6 +79,7 @@ use crate::error::{ }; use crate::expr_helper; use crate::statement::show::create_partitions_stmt; +use crate::statement::StatementExecutor; lazy_static! { static ref NAME_PATTERN_REG: Regex = Regex::new(&format!("^{NAME_PATTERN}$")).unwrap(); diff --git a/src/operator/src/statement/dml.rs b/src/operator/src/statement/dml.rs index 69ada96c80..827bfd8b66 100644 --- a/src/operator/src/statement/dml.rs +++ b/src/operator/src/statement/dml.rs @@ -19,8 +19,8 @@ use session::context::QueryContextRef; use sql::statements::insert::Insert; use sql::statements::statement::Statement; -use super::StatementExecutor; use crate::error::Result; +use crate::statement::StatementExecutor; impl StatementExecutor { #[tracing::instrument(skip_all)] diff --git a/src/pipeline/src/etl/processor.rs b/src/pipeline/src/etl/processor.rs index 6753d0ee8a..240b477efd 100644 --- a/src/pipeline/src/etl/processor.rs +++ b/src/pipeline/src/etl/processor.rs @@ -45,13 +45,13 @@ use snafu::{OptionExt, ResultExt}; use timestamp::TimestampProcessor; use urlencoding::UrlEncodingProcessor; -use super::field::{Field, Fields}; -use super::PipelineMap; use crate::error::{ Error, FailedParseFieldFromStringSnafu, FieldMustBeTypeSnafu, ProcessorKeyMustBeStringSnafu, ProcessorMustBeMapSnafu, ProcessorMustHaveStringKeySnafu, Result, UnsupportedProcessorSnafu, }; +use crate::etl::field::{Field, Fields}; use crate::etl::processor::simple_extract::SimpleExtractProcessor; +use crate::etl::PipelineMap; const FIELD_NAME: &str = "field"; const FIELDS_NAME: &str = "fields"; diff --git a/src/pipeline/src/etl/processor/json_path.rs b/src/pipeline/src/etl/processor/json_path.rs index 436408f9a3..b403a132fa 100644 --- a/src/pipeline/src/etl/processor/json_path.rs +++ b/src/pipeline/src/etl/processor/json_path.rs @@ -15,15 +15,15 @@ use jsonpath_rust::JsonPath; use snafu::{OptionExt, ResultExt}; -use super::{ - yaml_bool, yaml_new_field, yaml_new_fields, yaml_string, PipelineMap, Processor, FIELDS_NAME, - FIELD_NAME, IGNORE_MISSING_NAME, JSON_PATH_NAME, JSON_PATH_RESULT_INDEX_NAME, -}; use crate::error::{ Error, JsonPathParseResultIndexSnafu, JsonPathParseSnafu, KeyMustBeStringSnafu, ProcessorMissingFieldSnafu, Result, }; use crate::etl::field::Fields; +use crate::etl::processor::{ + yaml_bool, yaml_new_field, yaml_new_fields, yaml_string, PipelineMap, Processor, FIELDS_NAME, + FIELD_NAME, IGNORE_MISSING_NAME, JSON_PATH_NAME, JSON_PATH_RESULT_INDEX_NAME, +}; use crate::Value; pub(crate) const PROCESSOR_JSON_PATH: &str = "json_path"; diff --git a/src/pipeline/src/etl/transform.rs b/src/pipeline/src/etl/transform.rs index 99ef1ba6e3..2eba270b8d 100644 --- a/src/pipeline/src/etl/transform.rs +++ b/src/pipeline/src/etl/transform.rs @@ -17,16 +17,14 @@ pub mod transformer; use snafu::OptionExt; -use super::field::Fields; -use super::processor::{yaml_new_field, yaml_new_fields, yaml_string}; -use super::value::Timestamp; use crate::error::{ Error, KeyMustBeStringSnafu, Result, TransformElementMustBeMapSnafu, TransformOnFailureInvalidValueSnafu, TransformTypeMustBeSetSnafu, }; -use crate::etl::processor::yaml_bool; +use crate::etl::field::Fields; +use crate::etl::processor::{yaml_bool, yaml_new_field, yaml_new_fields, yaml_string}; use crate::etl::transform::index::Index; -use crate::etl::value::Value; +use crate::etl::value::{Timestamp, Value}; const TRANSFORM_FIELD: &str = "field"; const TRANSFORM_FIELDS: &str = "fields"; diff --git a/src/pipeline/src/etl/value.rs b/src/pipeline/src/etl/value.rs index 09faa78737..5f44b264b3 100644 --- a/src/pipeline/src/etl/value.rs +++ b/src/pipeline/src/etl/value.rs @@ -28,12 +28,12 @@ use regex::Regex; use snafu::{OptionExt, ResultExt}; pub use time::Timestamp; -use super::PipelineMap; use crate::error::{ Error, Result, ValueDefaultValueUnsupportedSnafu, ValueInvalidResolutionSnafu, ValueParseBooleanSnafu, ValueParseFloatSnafu, ValueParseIntSnafu, ValueParseTypeSnafu, ValueUnsupportedNumberTypeSnafu, ValueUnsupportedYamlTypeSnafu, ValueYamlKeyMustBeStringSnafu, }; +use crate::etl::PipelineMap; /// Value can be used as type /// acts as value: the enclosed value is the actual value diff --git a/src/promql/src/extension_plan/planner.rs b/src/promql/src/extension_plan/planner.rs index 10b6efd438..c1af9b4731 100644 --- a/src/promql/src/extension_plan/planner.rs +++ b/src/promql/src/extension_plan/planner.rs @@ -21,9 +21,9 @@ use datafusion::logical_expr::{LogicalPlan, UserDefinedLogicalNode}; use datafusion::physical_plan::ExecutionPlan; use datafusion::physical_planner::{ExtensionPlanner, PhysicalPlanner}; -use super::{HistogramFold, ScalarCalculate, UnionDistinctOn}; use crate::extension_plan::{ - EmptyMetric, InstantManipulate, RangeManipulate, SeriesDivide, SeriesNormalize, + EmptyMetric, HistogramFold, InstantManipulate, RangeManipulate, ScalarCalculate, SeriesDivide, + SeriesNormalize, UnionDistinctOn, }; pub struct PromExtensionPlanner; diff --git a/src/promql/src/extension_plan/scalar_calculate.rs b/src/promql/src/extension_plan/scalar_calculate.rs index 117c37a726..5634fbdf44 100644 --- a/src/promql/src/extension_plan/scalar_calculate.rs +++ b/src/promql/src/extension_plan/scalar_calculate.rs @@ -40,8 +40,8 @@ use greptime_proto::substrait_extension as pb; use prost::Message; use snafu::ResultExt; -use super::Millisecond; use crate::error::{ColumnNotFoundSnafu, DataFusionPlanningSnafu, DeserializeSnafu, Result}; +use crate::extension_plan::Millisecond; /// `ScalarCalculate` is the custom logical plan to calculate /// [`scalar`](https://prometheus.io/docs/prometheus/latest/querying/functions/#scalar) diff --git a/src/puffin/src/puffin_manager/fs_puffin_manager/reader.rs b/src/puffin/src/puffin_manager/fs_puffin_manager/reader.rs index 2722990b84..5d2033e2e9 100644 --- a/src/puffin/src/puffin_manager/fs_puffin_manager/reader.rs +++ b/src/puffin/src/puffin_manager/fs_puffin_manager/reader.rs @@ -24,7 +24,6 @@ use futures::io::BufReader; use futures::{AsyncRead, AsyncWrite}; use snafu::{ensure, OptionExt, ResultExt}; -use super::PuffinMetadataCacheRef; use crate::blob_metadata::{BlobMetadata, CompressionCodec}; use crate::error::{ BlobIndexOutOfBoundSnafu, BlobNotFoundSnafu, DeserializeJsonSnafu, FileKeyNotMatchSnafu, @@ -35,6 +34,7 @@ use crate::file_metadata::FileMetadata; use crate::partial_reader::PartialReader; use crate::puffin_manager::file_accessor::PuffinFileAccessor; use crate::puffin_manager::fs_puffin_manager::dir_meta::DirMetadata; +use crate::puffin_manager::fs_puffin_manager::PuffinMetadataCacheRef; use crate::puffin_manager::stager::{BoxWriter, DirWriterProviderRef, Stager}; use crate::puffin_manager::{BlobGuard, BlobWithMetadata, PuffinReader}; diff --git a/src/puffin/src/puffin_manager/stager/bounded_stager.rs b/src/puffin/src/puffin_manager/stager/bounded_stager.rs index 63f4c9d537..939987217e 100644 --- a/src/puffin/src/puffin_manager/stager/bounded_stager.rs +++ b/src/puffin/src/puffin_manager/stager/bounded_stager.rs @@ -34,12 +34,13 @@ use tokio::sync::mpsc::error::TrySendError; use tokio::sync::mpsc::{Receiver, Sender}; use tokio_util::compat::TokioAsyncWriteCompatExt; -use super::StagerNotifier; use crate::error::{ CacheGetSnafu, CreateSnafu, MetadataSnafu, OpenSnafu, ReadSnafu, RemoveSnafu, RenameSnafu, Result, WalkDirSnafu, }; -use crate::puffin_manager::stager::{BoxWriter, DirWriterProvider, InitBlobFn, InitDirFn, Stager}; +use crate::puffin_manager::stager::{ + BoxWriter, DirWriterProvider, InitBlobFn, InitDirFn, Stager, StagerNotifier, +}; use crate::puffin_manager::{BlobGuard, DirGuard}; const DELETE_QUEUE_SIZE: usize = 10240; diff --git a/src/query/src/range_select/plan_rewrite.rs b/src/query/src/range_select/plan_rewrite.rs index 85b220ced0..9e826e337d 100644 --- a/src/query/src/range_select/plan_rewrite.rs +++ b/src/query/src/range_select/plan_rewrite.rs @@ -42,13 +42,12 @@ use session::context::QueryContextRef; use snafu::{ensure, OptionExt, ResultExt}; use table::table::adapter::DfTableProviderAdapter; -use super::plan::Fill; use crate::error::{ CatalogSnafu, DataFusionSnafu, RangeQuerySnafu, Result, TimeIndexNotFoundSnafu, UnknownTableSnafu, }; use crate::plan::ExtractExpr; -use crate::range_select::plan::{RangeFn, RangeSelect}; +use crate::range_select::plan::{Fill, RangeFn, RangeSelect}; /// `RangeExprRewriter` will recursively search certain `Expr`, find all `range_fn` scalar udf contained in `Expr`, /// and collect the information required by the RangeSelect query, diff --git a/src/query/src/range_select/planner.rs b/src/query/src/range_select/planner.rs index 549a867e52..73b3bfb4ef 100644 --- a/src/query/src/range_select/planner.rs +++ b/src/query/src/range_select/planner.rs @@ -21,7 +21,7 @@ use datafusion::logical_expr::{LogicalPlan, UserDefinedLogicalNode}; use datafusion::physical_plan::ExecutionPlan; use datafusion::physical_planner::{ExtensionPlanner, PhysicalPlanner}; -use super::plan::RangeSelect; +use crate::range_select::plan::RangeSelect; pub struct RangeSelectPlanner; diff --git a/src/servers/src/grpc/builder.rs b/src/servers/src/grpc/builder.rs index b19cc280c6..fc6bbba7ec 100644 --- a/src/servers/src/grpc/builder.rs +++ b/src/servers/src/grpc/builder.rs @@ -24,12 +24,12 @@ use tokio::sync::Mutex; use tonic::service::RoutesBuilder; use tonic::transport::{Identity, ServerTlsConfig}; -use super::flight::{FlightCraftRef, FlightCraftWrapper}; -use super::region_server::{RegionServerHandlerRef, RegionServerRequestHandler}; -use super::{GrpcServer, GrpcServerConfig}; use crate::grpc::database::DatabaseService; +use crate::grpc::flight::{FlightCraftRef, FlightCraftWrapper}; use crate::grpc::greptime_handler::GreptimeRequestHandler; use crate::grpc::prom_query_gateway::PrometheusGatewayService; +use crate::grpc::region_server::{RegionServerHandlerRef, RegionServerRequestHandler}; +use crate::grpc::{GrpcServer, GrpcServerConfig}; use crate::prometheus_handler::PrometheusHandlerRef; use crate::tls::TlsOption; diff --git a/src/servers/src/grpc/flight/stream.rs b/src/servers/src/grpc/flight/stream.rs index c49a79f291..f5b8811dcf 100644 --- a/src/servers/src/grpc/flight/stream.rs +++ b/src/servers/src/grpc/flight/stream.rs @@ -28,8 +28,8 @@ use pin_project::{pin_project, pinned_drop}; use snafu::ResultExt; use tokio::task::JoinHandle; -use super::TonicResult; use crate::error; +use crate::grpc::flight::TonicResult; #[pin_project(PinnedDrop)] pub struct FlightRecordBatchStream { diff --git a/src/servers/src/grpc/prom_query_gateway.rs b/src/servers/src/grpc/prom_query_gateway.rs index fd22831b12..f813459774 100644 --- a/src/servers/src/grpc/prom_query_gateway.rs +++ b/src/servers/src/grpc/prom_query_gateway.rs @@ -31,9 +31,8 @@ use session::context::QueryContext; use snafu::OptionExt; use tonic::{Request, Response}; -use super::greptime_handler::create_query_context; use crate::error::InvalidQuerySnafu; -use crate::grpc::greptime_handler::auth; +use crate::grpc::greptime_handler::{auth, create_query_context}; use crate::grpc::TonicResult; use crate::http::prometheus::{retrieve_metric_name_and_result_type, PrometheusJsonResponse}; use crate::prometheus_handler::PrometheusHandlerRef; diff --git a/src/servers/src/http/handler.rs b/src/servers/src/http/handler.rs index 153b824d6e..fe4d1aa034 100644 --- a/src/servers/src/http/handler.rs +++ b/src/servers/src/http/handler.rs @@ -35,8 +35,8 @@ use sql::dialect::GreptimeDbDialect; use sql::parser::{ParseOptions, ParserContext}; use sql::statements::statement::Statement; -use super::header::collect_plan_metrics; use crate::error::{FailedToParseQuerySnafu, InvalidQuerySnafu, Result}; +use crate::http::header::collect_plan_metrics; use crate::http::result::arrow_result::ArrowResponse; use crate::http::result::csv_result::CsvResponse; use crate::http::result::error_result::ErrorResponse; diff --git a/src/servers/src/http/influxdb.rs b/src/servers/src/http/influxdb.rs index 0e27a772f6..bd428f4289 100644 --- a/src/servers/src/http/influxdb.rs +++ b/src/servers/src/http/influxdb.rs @@ -24,8 +24,8 @@ use common_grpc::precision::Precision; use common_telemetry::tracing; use session::context::{Channel, QueryContext, QueryContextRef}; -use super::header::write_cost_header_map; use crate::error::{Result, TimePrecisionSnafu}; +use crate::http::header::write_cost_header_map; use crate::influxdb::InfluxdbRequest; use crate::query_handler::InfluxdbLineProtocolHandlerRef; diff --git a/src/servers/src/http/otlp.rs b/src/servers/src/http/otlp.rs index a5bc0c6410..402313fb64 100644 --- a/src/servers/src/http/otlp.rs +++ b/src/servers/src/http/otlp.rs @@ -35,9 +35,9 @@ use prost::Message; use session::context::{Channel, QueryContext}; use snafu::prelude::*; -use super::header::{write_cost_header_map, CONTENT_TYPE_PROTOBUF}; use crate::error::{self, PipelineSnafu, Result}; use crate::http::extractor::{LogTableName, PipelineInfo, SelectInfoWrapper, TraceTableName}; +use crate::http::header::{write_cost_header_map, CONTENT_TYPE_PROTOBUF}; use crate::metrics::METRIC_HTTP_OPENTELEMETRY_LOGS_ELAPSED; use crate::query_handler::{OpenTelemetryProtocolHandlerRef, PipelineHandler}; diff --git a/src/servers/src/http/prom_store.rs b/src/servers/src/http/prom_store.rs index 82a0b93243..caafd0f1f3 100644 --- a/src/servers/src/http/prom_store.rs +++ b/src/servers/src/http/prom_store.rs @@ -33,8 +33,8 @@ use serde::{Deserialize, Serialize}; use session::context::{Channel, QueryContext}; use snafu::prelude::*; -use super::header::{write_cost_header_map, GREPTIME_DB_HEADER_METRICS}; use crate::error::{self, Result}; +use crate::http::header::{write_cost_header_map, GREPTIME_DB_HEADER_METRICS}; use crate::prom_store::{snappy_decompress, zstd_decompress}; use crate::proto::PromWriteRequest; use crate::query_handler::{PromStoreProtocolHandlerRef, PromStoreResponse}; diff --git a/src/servers/src/otlp/logs.rs b/src/servers/src/otlp/logs.rs index afaf289fcb..95b3b21e99 100644 --- a/src/servers/src/otlp/logs.rs +++ b/src/servers/src/otlp/logs.rs @@ -29,12 +29,12 @@ use serde_json::{Map, Value}; use session::context::QueryContextRef; use snafu::{ensure, ResultExt}; -use super::trace::attributes::OtlpAnyValue; -use super::utils::{bytes_to_hex_string, key_value_to_jsonb}; use crate::error::{ IncompatibleSchemaSnafu, NotSupportedSnafu, PipelineSnafu, Result, UnsupportedJsonDataTypeForTagSnafu, }; +use crate::otlp::trace::attributes::OtlpAnyValue; +use crate::otlp::utils::{bytes_to_hex_string, key_value_to_jsonb}; use crate::pipeline::run_pipeline; use crate::query_handler::PipelineHandlerRef; diff --git a/src/servers/src/otlp/trace/span.rs b/src/servers/src/otlp/trace/span.rs index 65a2c87ca8..0163cbbdcc 100644 --- a/src/servers/src/otlp/trace/span.rs +++ b/src/servers/src/otlp/trace/span.rs @@ -22,7 +22,7 @@ use opentelemetry_proto::tonic::trace::v1::span::{Event, Link}; use opentelemetry_proto::tonic::trace::v1::{Span, Status}; use serde::Serialize; -use super::attributes::Attributes; +use crate::otlp::trace::attributes::Attributes; use crate::otlp::trace::KEY_SERVICE_NAME; use crate::otlp::utils::bytes_to_hex_string; diff --git a/src/servers/src/otlp/trace/v0.rs b/src/servers/src/otlp/trace/v0.rs index 12db06635e..9e3e69227a 100644 --- a/src/servers/src/otlp/trace/v0.rs +++ b/src/servers/src/otlp/trace/v0.rs @@ -22,13 +22,13 @@ use opentelemetry_proto::tonic::collector::trace::v1::ExportTraceServiceRequest; use pipeline::{GreptimePipelineParams, PipelineWay}; use session::context::QueryContextRef; -use super::span::{parse, TraceSpan}; -use super::{ - DURATION_NANO_COLUMN, PARENT_SPAN_ID_COLUMN, SERVICE_NAME_COLUMN, SPAN_ATTRIBUTES_COLUMN, - SPAN_ID_COLUMN, SPAN_KIND_COLUMN, SPAN_NAME_COLUMN, TIMESTAMP_COLUMN, TRACE_ID_COLUMN, -}; use crate::error::Result; -use crate::otlp::trace::SPAN_EVENTS_COLUMN; +use crate::otlp::trace::span::{parse, TraceSpan}; +use crate::otlp::trace::{ + DURATION_NANO_COLUMN, PARENT_SPAN_ID_COLUMN, SERVICE_NAME_COLUMN, SPAN_ATTRIBUTES_COLUMN, + SPAN_EVENTS_COLUMN, SPAN_ID_COLUMN, SPAN_KIND_COLUMN, SPAN_NAME_COLUMN, TIMESTAMP_COLUMN, + TRACE_ID_COLUMN, +}; use crate::otlp::utils::{make_column_data, make_string_column_data}; use crate::query_handler::PipelineHandlerRef; use crate::row_writer::{self, MultiTableData, TableData}; diff --git a/src/servers/src/otlp/trace/v1.rs b/src/servers/src/otlp/trace/v1.rs index 2118083c65..86d4112807 100644 --- a/src/servers/src/otlp/trace/v1.rs +++ b/src/servers/src/otlp/trace/v1.rs @@ -23,14 +23,14 @@ use opentelemetry_proto::tonic::common::v1::any_value::Value as OtlpValue; use pipeline::{GreptimePipelineParams, PipelineWay}; use session::context::QueryContextRef; -use super::attributes::Attributes; -use super::span::{parse, TraceSpan}; -use super::{ - DURATION_NANO_COLUMN, PARENT_SPAN_ID_COLUMN, SERVICE_NAME_COLUMN, SPAN_ID_COLUMN, - SPAN_KIND_COLUMN, SPAN_NAME_COLUMN, TIMESTAMP_COLUMN, TRACE_ID_COLUMN, -}; use crate::error::Result; -use crate::otlp::trace::{KEY_SERVICE_NAME, SPAN_EVENTS_COLUMN}; +use crate::otlp::trace::attributes::Attributes; +use crate::otlp::trace::span::{parse, TraceSpan}; +use crate::otlp::trace::{ + DURATION_NANO_COLUMN, KEY_SERVICE_NAME, PARENT_SPAN_ID_COLUMN, SERVICE_NAME_COLUMN, + SPAN_EVENTS_COLUMN, SPAN_ID_COLUMN, SPAN_KIND_COLUMN, SPAN_NAME_COLUMN, TIMESTAMP_COLUMN, + TRACE_ID_COLUMN, +}; use crate::otlp::utils::{any_value_to_jsonb, make_column_data, make_string_column_data}; use crate::query_handler::PipelineHandlerRef; use crate::row_writer::{self, MultiTableData, TableData}; diff --git a/src/servers/src/postgres/auth_handler.rs b/src/servers/src/postgres/auth_handler.rs index 12553c44cf..c682a208a8 100644 --- a/src/servers/src/postgres/auth_handler.rs +++ b/src/servers/src/postgres/auth_handler.rs @@ -29,10 +29,10 @@ use pgwire::messages::{PgWireBackendMessage, PgWireFrontendMessage}; use session::Session; use snafu::IntoError; -use super::PostgresServerHandlerInner; use crate::error::{AuthSnafu, Result}; use crate::metrics::METRIC_AUTH_FAILURE; use crate::postgres::types::PgErrorCode; +use crate::postgres::PostgresServerHandlerInner; use crate::query_handler::sql::ServerSqlQueryHandlerRef; pub(crate) struct PgLoginVerifier { diff --git a/src/servers/src/postgres/handler.rs b/src/servers/src/postgres/handler.rs index 6a2862000b..a5c68bcfaf 100644 --- a/src/servers/src/postgres/handler.rs +++ b/src/servers/src/postgres/handler.rs @@ -40,9 +40,9 @@ use session::Session; use sql::dialect::PostgreSqlDialect; use sql::parser::{ParseOptions, ParserContext}; -use super::types::*; -use super::{fixtures, PostgresServerHandlerInner}; use crate::error::Result; +use crate::postgres::types::*; +use crate::postgres::{fixtures, PostgresServerHandlerInner}; use crate::query_handler::sql::ServerSqlQueryHandlerRef; use crate::SqlPlan; diff --git a/src/servers/src/postgres/server.rs b/src/servers/src/postgres/server.rs index 4ffb3ce2c0..06f7b0ef06 100644 --- a/src/servers/src/postgres/server.rs +++ b/src/servers/src/postgres/server.rs @@ -25,8 +25,8 @@ use futures::StreamExt; use pgwire::tokio::process_socket; use tokio_rustls::TlsAcceptor; -use super::{MakePostgresServerHandler, MakePostgresServerHandlerBuilder}; use crate::error::Result; +use crate::postgres::{MakePostgresServerHandler, MakePostgresServerHandlerBuilder}; use crate::query_handler::sql::ServerSqlQueryHandlerRef; use crate::server::{AbortableStream, BaseTcpServer, Server}; use crate::tls::ReloadableTlsServerConfig; diff --git a/src/sql/src/parsers/create_parser.rs b/src/sql/src/parsers/create_parser.rs index b99b88b721..d0f5ceef8e 100644 --- a/src/sql/src/parsers/create_parser.rs +++ b/src/sql/src/parsers/create_parser.rs @@ -28,7 +28,6 @@ use sqlparser::parser::{Parser, ParserError}; use sqlparser::tokenizer::{Token, TokenWithLocation, Word}; use table::requests::validate_table_option; -use super::utils; use crate::ast::{ColumnDef, Ident}; use crate::error::{ self, InvalidColumnOptionSnafu, InvalidDatabaseOptionSnafu, InvalidIntervalSnafu, @@ -37,7 +36,7 @@ use crate::error::{ }; use crate::parser::{ParserContext, FLOW}; use crate::parsers::utils::{ - validate_column_fulltext_create_option, validate_column_skipping_index_create_option, + self, validate_column_fulltext_create_option, validate_column_skipping_index_create_option, }; use crate::statements::create::{ Column, ColumnExtensions, CreateDatabase, CreateExternalTable, CreateFlow, CreateTable, diff --git a/src/sql/src/parsers/tql_parser.rs b/src/sql/src/parsers/tql_parser.rs index 2533fe1ef6..67651d9561 100644 --- a/src/sql/src/parsers/tql_parser.rs +++ b/src/sql/src/parsers/tql_parser.rs @@ -31,9 +31,10 @@ const VERBOSE: &str = "VERBOSE"; use sqlparser::parser::Parser; -use super::error::ConvertToLogicalExpressionSnafu; use crate::dialect::GreptimeDbDialect; -use crate::parsers::error::{EvaluationSnafu, ParserSnafu, TQLError}; +use crate::parsers::error::{ + ConvertToLogicalExpressionSnafu, EvaluationSnafu, ParserSnafu, TQLError, +}; /// TQL extension parser, including: /// - `TQL EVAL ` diff --git a/src/sql/src/statements/cursor.rs b/src/sql/src/statements/cursor.rs index 4381cc5e7b..4feed526dd 100644 --- a/src/sql/src/statements/cursor.rs +++ b/src/sql/src/statements/cursor.rs @@ -18,7 +18,7 @@ use serde::Serialize; use sqlparser::ast::ObjectName; use sqlparser_derive::{Visit, VisitMut}; -use super::query::Query; +use crate::statements::query::Query; /// Represents a DECLARE CURSOR statement ///