diff --git a/.github/workflows/typo.yml b/.github/workflows/typo.yml index eb084f2c25008..d0bacf8c08ce5 100644 --- a/.github/workflows/typo.yml +++ b/.github/workflows/typo.yml @@ -10,4 +10,4 @@ jobs: uses: actions/checkout@v4 - name: Check spelling of the entire repository - uses: crate-ci/typos@v1.23.2 + uses: crate-ci/typos@v1.28.2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 78574872d8f01..a6ae5b7da5c71 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: exclude: 'src/frontend/planner_test/tests/testdata/.*' - id: trailing-whitespace - repo: https://github.com/crate-ci/typos - rev: v1.23.1 + rev: v1.28.2 hooks: - id: typos - repo: local diff --git a/Makefile.toml b/Makefile.toml index f772ba27e8bb1..08d9e1fbf7e24 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1158,7 +1158,7 @@ fi private = true category = "RiseDev - Check" description = "Run cargo typos-cli check" -install_crate = { min_version = "1.23.2", crate_name = "typos-cli", binary = "typos", test_arg = [ +install_crate = { min_version = "1.28.2", crate_name = "typos-cli", binary = "typos", test_arg = [ "--help", ], install_command = "binstall" } script = """ diff --git a/src/common/src/config.rs b/src/common/src/config.rs index cd8cd6ea77874..bdd05bbeebf9d 100644 --- a/src/common/src/config.rs +++ b/src/common/src/config.rs @@ -869,7 +869,7 @@ pub struct StorageConfig { #[serde(default = "default::storage::mem_table_spill_threshold")] pub mem_table_spill_threshold: usize, - /// The concurrent uploading number of `SSTables` of buidler + /// The concurrent uploading number of `SSTables` of builder #[serde(default = "default::storage::compactor_concurrent_uploading_sst_count")] pub compactor_concurrent_uploading_sst_count: Option, diff --git a/src/config/docs.md b/src/config/docs.md index 1d373d3b9fda7..43ab00e12cab6 100644 --- a/src/config/docs.md +++ b/src/config/docs.md @@ -120,7 +120,7 @@ This page is automatically generated by `./risedev generate-example-config` | block_cache_capacity_mb | DEPRECATED: This config will be deprecated in the future version, use `storage.cache.block_cache_capacity_mb` instead. | | | check_compaction_result | | false | | compact_iter_recreate_timeout_ms | | 600000 | -| compactor_concurrent_uploading_sst_count | The concurrent uploading number of `SSTables` of buidler | | +| compactor_concurrent_uploading_sst_count | The concurrent uploading number of `SSTables` of builder | | | compactor_fast_max_compact_delete_ratio | | 40 | | compactor_fast_max_compact_task_size | | 2147483648 | | compactor_iter_max_io_retry_times | | 8 | diff --git a/src/connector/src/parser/chunk_builder.rs b/src/connector/src/parser/chunk_builder.rs index d8f7037a73143..8a20245037150 100644 --- a/src/connector/src/parser/chunk_builder.rs +++ b/src/connector/src/parser/chunk_builder.rs @@ -26,7 +26,7 @@ use thiserror_ext::AsReport; use super::MessageMeta; use crate::parser::utils::{ extract_cdc_meta_column, extract_header_inner_from_meta, extract_headers_from_meta, - extreact_timestamp_from_meta, + extract_timestamp_from_meta, }; use crate::source::{SourceColumnDesc, SourceColumnType, SourceMeta}; @@ -224,9 +224,7 @@ impl SourceStreamChunkRowWriter<'_> { } } (_, &Some(AdditionalColumnType::Timestamp(_))) => match self.row_meta { - Some(row_meta) => { - Ok(A::output_for(extreact_timestamp_from_meta(row_meta.meta))) - } + Some(row_meta) => Ok(A::output_for(extract_timestamp_from_meta(row_meta.meta))), None => parse_field(desc), // parse from payload }, (_, &Some(AdditionalColumnType::CollectionName(_))) => { diff --git a/src/connector/src/parser/utils.rs b/src/connector/src/parser/utils.rs index ef748ec0e2eb9..15a79d7df8fd9 100644 --- a/src/connector/src/parser/utils.rs +++ b/src/connector/src/parser/utils.rs @@ -116,7 +116,7 @@ pub(super) async fn bytes_from_url( } } -pub fn extreact_timestamp_from_meta(meta: &SourceMeta) -> DatumRef<'_> { +pub fn extract_timestamp_from_meta(meta: &SourceMeta) -> DatumRef<'_> { match meta { SourceMeta::Kafka(kafka_meta) => kafka_meta.extract_timestamp(), SourceMeta::DebeziumCdc(cdc_meta) => cdc_meta.extract_timestamp(), diff --git a/src/connector/src/source/reader/desc.rs b/src/connector/src/source/reader/desc.rs index d64435ef3a3cc..7e72e23d414f0 100644 --- a/src/connector/src/source/reader/desc.rs +++ b/src/connector/src/source/reader/desc.rs @@ -117,13 +117,13 @@ impl SourceDescBuilder { pub fn build(self) -> ConnectorResult { let columns = self.column_catalogs_to_source_column_descs(); - let psrser_config = SpecificParserConfig::new(&self.source_info, &self.with_properties)?; + let parser_config = SpecificParserConfig::new(&self.source_info, &self.with_properties)?; let source = SourceReader::new( self.with_properties, columns.clone(), self.connector_message_buffer_size, - psrser_config, + parser_config, )?; Ok(SourceDesc {