From 801b0c9d58abc50523e7fe7522211912524f0408 Mon Sep 17 00:00:00 2001 From: WeiXiang Date: Wed, 8 Jul 2026 17:23:40 +0800 Subject: [PATCH] [fix](typo) fix spelling typos in BE and cloud comments and messages Fix common spelling mistakes (e.g. funciton -> function, seperate -> separate, unkown -> unknown, invaild -> invalid, avaliable -> available, sucess -> success) in code comments and in a few user-facing log/error messages under be/src and cloud/src. Also rename a locally misspelled variable `colunm` -> `column` in segment_iterator.cpp. Comments and string literals only; no functional change. Verified that none of the corrected message strings are asserted by unit or regression tests. Co-Authored-By: Claude Opus 4.8 (1M context) --- be/src/common/config.cpp | 2 +- be/src/common/config.h | 4 ++-- be/src/core/column/column.h | 2 +- be/src/core/value/vdatetime_value.h | 4 ++-- be/src/exec/pipeline/pipeline_fragment_context.cpp | 4 ++-- be/src/exec/sink/writer/async_result_writer.cpp | 2 +- be/src/exec/sink/writer/vtablet_writer.cpp | 2 +- be/src/exprs/aggregate/aggregate_function_rpc.h | 2 +- be/src/exprs/function/function_bitmap.cpp | 4 ++-- be/src/exprs/function/function_convert_tz.cpp | 2 +- be/src/exprs/function/function_datetime_string_to_string.h | 2 +- be/src/exprs/function/function_dict_get.cpp | 4 ++-- be/src/exprs/function/function_dict_get_many.cpp | 4 ++-- be/src/exprs/function/function_string_concat.h | 2 +- be/src/exprs/function/in.h | 2 +- be/src/format/orc/vorc_reader.cpp | 2 +- be/src/io/fs/s3_file_reader.cpp | 2 +- be/src/runtime/fragment_mgr.cpp | 2 +- be/src/runtime/memory/mem_tracker_limiter.h | 2 +- be/src/runtime/memory/thread_mem_tracker_mgr.h | 2 +- be/src/service/point_query_executor.cpp | 2 +- be/src/storage/cache/page_cache.h | 2 +- be/src/storage/compaction/compaction.cpp | 4 ++-- be/src/storage/index/zone_map/zone_map_index.h | 2 +- be/src/storage/partial_update_info.cpp | 4 ++-- be/src/storage/segment/segment.cpp | 2 +- be/src/storage/segment/segment_iterator.cpp | 6 +++--- be/src/storage/segment/vertical_segment_writer.h | 2 +- be/src/storage/storage_engine.cpp | 2 +- be/src/util/cpu_info.cpp | 2 +- cloud/src/common/http_helper.cpp | 2 +- cloud/src/meta-service/meta_service_helper.h | 2 +- cloud/src/meta-service/meta_service_resource.cpp | 6 +++--- cloud/src/recycler/hdfs_accessor.cpp | 2 +- 34 files changed, 46 insertions(+), 46 deletions(-) diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index 9ec587bd100ec5..16565ad1c05e0b 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -1378,7 +1378,7 @@ DEFINE_mInt64(auto_inc_fetch_thread_num, "3"); // default max to 2048 connections DEFINE_mInt64(lookup_connection_cache_capacity, "2048"); -// level of compression when using LZ4_HC, whose defalut value is LZ4HC_CLEVEL_DEFAULT +// level of compression when using LZ4_HC, whose default value is LZ4HC_CLEVEL_DEFAULT DEFINE_mInt64(LZ4_HC_compression_level, "9"); DEFINE_mBool(enable_merge_on_write_correctness_check, "true"); diff --git a/be/src/common/config.h b/be/src/common/config.h index 012f09a735c0cd..5457c1f1f1b117 100644 --- a/be/src/common/config.h +++ b/be/src/common/config.h @@ -489,7 +489,7 @@ DECLARE_Bool(enable_parquet_cache_compressed_pages); // whether to disable pk page cache feature in storage DECLARE_Bool(disable_pk_storage_page_cache); -// Cache for mow primary key storage page size, it's seperated from +// Cache for mow primary key storage page size, it's separated from // storage_page_cache_limit DECLARE_String(pk_storage_page_cache_limit); // data page size for primary key index @@ -1435,7 +1435,7 @@ DECLARE_mInt64(auto_inc_fetch_thread_num); // Max connection cache num for point lookup queries DECLARE_mInt64(lookup_connection_cache_capacity); -// level of compression when using LZ4_HC, whose defalut value is LZ4HC_CLEVEL_DEFAULT +// level of compression when using LZ4_HC, whose default value is LZ4HC_CLEVEL_DEFAULT DECLARE_mInt64(LZ4_HC_compression_level); // Max json key length in bytes when parsing json into variant subcolumns/jsonb. DECLARE_mInt32(variant_max_json_key_length); diff --git a/be/src/core/column/column.h b/be/src/core/column/column.h index f27cbd1646ed8e..376931a39d1ee5 100644 --- a/be/src/core/column/column.h +++ b/be/src/core/column/column.h @@ -181,7 +181,7 @@ class IColumn : public COW { "Method erase is not supported for " + get_name()); } - /// cut or expand inplace. `this` would be moved, only the return value is avaliable. + /// cut or expand inplace. `this` would be moved, only the return value is available. virtual Ptr shrink(size_t length) const final { // NOLINTBEGIN(performance-move-const-arg) MutablePtr res = std::move(*this).mutate(); diff --git a/be/src/core/value/vdatetime_value.h b/be/src/core/value/vdatetime_value.h index 7419b02175575b..9f001f0acb2e88 100644 --- a/be/src/core/value/vdatetime_value.h +++ b/be/src/core/value/vdatetime_value.h @@ -599,7 +599,7 @@ class VecDateTimeValue { // Now this type is a temp solution with little changes void unix_timestamp(int64_t* timestamp, const cctz::time_zone& ctz) const; //construct datetime_value from timestamp and timezone - //timestamp is an internal timestamp value representing seconds since '1970-01-01 00:00:00' UTC. negative avaliable. + //timestamp is an internal timestamp value representing seconds since '1970-01-01 00:00:00' UTC. negative available. //we don't do any check in it because it's hot path. any usage want ensure the time legality should check itself. bool from_unixtime(int64_t, const std::string& timezone); void from_unixtime(int64_t, const cctz::time_zone& ctz); @@ -1102,7 +1102,7 @@ class DateV2Value { void unix_timestamp(std::pair* timestamp, const cctz::time_zone& ctz) const; //construct datetime_value from timestamp and timezone - //timestamp is an internal timestamp value representing seconds since '1970-01-01 00:00:00' UTC. negative avaliable. + //timestamp is an internal timestamp value representing seconds since '1970-01-01 00:00:00' UTC. negative available. //we don't do any check in it because it's hot path. any usage want ensure the time legality should check itself. bool from_unixtime(int64_t, const std::string& timezone); void from_unixtime(int64_t, const cctz::time_zone& ctz); diff --git a/be/src/exec/pipeline/pipeline_fragment_context.cpp b/be/src/exec/pipeline/pipeline_fragment_context.cpp index f8bd3120846a80..c1cdc7e66406b3 100644 --- a/be/src/exec/pipeline/pipeline_fragment_context.cpp +++ b/be/src/exec/pipeline/pipeline_fragment_context.cpp @@ -2675,7 +2675,7 @@ PipelineFragmentContext::collect_realtime_profile() const { std::vector> res; // we do not have mutex to protect pipeline_id_to_profile - // so we need to make sure this funciton is invoked after fragment context + // so we need to make sure this function is invoked after fragment context // has already been prepared. if (!_prepared) { std::string msg = @@ -2703,7 +2703,7 @@ PipelineFragmentContext::collect_realtime_profile() const { std::shared_ptr PipelineFragmentContext::collect_realtime_load_channel_profile() const { // we do not have mutex to protect pipeline_id_to_profile - // so we need to make sure this funciton is invoked after fragment context + // so we need to make sure this function is invoked after fragment context // has already been prepared. if (!_prepared) { std::string msg = diff --git a/be/src/exec/sink/writer/async_result_writer.cpp b/be/src/exec/sink/writer/async_result_writer.cpp index 2fa2f6f92a7418..8340d7d2d9e650 100644 --- a/be/src/exec/sink/writer/async_result_writer.cpp +++ b/be/src/exec/sink/writer/async_result_writer.cpp @@ -180,7 +180,7 @@ void AsyncResultWriter::process_block(RuntimeState* state, RuntimeProfile* opera bool need_finish = false; { - // If the last block is sent successfuly, then call finish to clear the buffer or commit + // If the last block is sent successfully, then call finish to clear the buffer or commit // transactions. // Using lock to make sure the writer status is not modified // There is a unique ptr err_msg in Status, if it is modified, the unique ptr diff --git a/be/src/exec/sink/writer/vtablet_writer.cpp b/be/src/exec/sink/writer/vtablet_writer.cpp index 4159ee08b51447..698f9c7099a056 100644 --- a/be/src/exec/sink/writer/vtablet_writer.cpp +++ b/be/src/exec/sink/writer/vtablet_writer.cpp @@ -1562,7 +1562,7 @@ void VTabletWriter::_send_batch_process() { } // for auto partition tables, there's a situation: we haven't open any node channel but decide to cancel the task. - // then the judge in front will never be true because opened_nodes won't increase. so we have to specially check wether we called close. + // then the judge in front will never be true because opened_nodes won't increase. so we have to specially check whether we called close. // we must RECHECK opened_nodes below, after got closed signal, because it may changed. Think of this: // checked opened_nodes = 0 ---> new block arrived ---> task finished, close() was called ---> we got _try_close here // if we don't check again, we may lose the last package. diff --git a/be/src/exprs/aggregate/aggregate_function_rpc.h b/be/src/exprs/aggregate/aggregate_function_rpc.h index b083d81bf430a9..f0097ac10be76e 100644 --- a/be/src/exprs/aggregate/aggregate_function_rpc.h +++ b/be/src/exprs/aggregate/aggregate_function_rpc.h @@ -326,7 +326,7 @@ struct AggregateRpcUdafData { break; } default: - LOG(ERROR) << "failed to get result cause unkown return type"; + LOG(ERROR) << "failed to get result cause unknown return type"; to.insert_default(); } return Status::OK(); diff --git a/be/src/exprs/function/function_bitmap.cpp b/be/src/exprs/function/function_bitmap.cpp index 35341f297640b0..eaaac6d2982858 100644 --- a/be/src/exprs/function/function_bitmap.cpp +++ b/be/src/exprs/function/function_bitmap.cpp @@ -167,7 +167,7 @@ struct ToBitmapWithCheck { continue; } else { const char* raw_str = reinterpret_cast(&data[offsets[i - 1]]); - // The string lenght is less than 2G, so that cast the str size to int, not use size_t + // The string length is less than 2G, so that cast the str size to int, not use size_t int str_size = cast_set(offsets[i] - offsets[i - 1]); StringParser::ParseResult parse_result = StringParser::PARSE_SUCCESS; uint64_t int_value = StringParser::string_to_unsigned_int( @@ -329,7 +329,7 @@ struct BitmapFromArray { auto prev_offset = offset_column_data[i - 1]; for (auto j = prev_offset; j < curr_offset; ++j) { auto data = nested_column_data[j]; - // invaild value + // invalid value if (UNLIKELY(data < 0) || UNLIKELY(nested_null_map[j])) { res.emplace_back(); null_map[i] = 1; diff --git a/be/src/exprs/function/function_convert_tz.cpp b/be/src/exprs/function/function_convert_tz.cpp index aa2966cbc3fd44..ee02dd27f9c16a 100644 --- a/be/src/exprs/function/function_convert_tz.cpp +++ b/be/src/exprs/function/function_convert_tz.cpp @@ -139,7 +139,7 @@ class FunctionConvertTZ : public IFunction { context->get_function_state(FunctionContext::FRAGMENT_LOCAL)); if (!convert_tz_state) { return Status::RuntimeError( - "funciton context for function '{}' must have ConvertTzState;", get_name()); + "function context for function '{}' must have ConvertTzState;", get_name()); } auto result_null_map_column = ColumnUInt8::create(input_rows_count, 0); diff --git a/be/src/exprs/function/function_datetime_string_to_string.h b/be/src/exprs/function/function_datetime_string_to_string.h index f927389ac261d5..4faf223c98f545 100644 --- a/be/src/exprs/function/function_datetime_string_to_string.h +++ b/be/src/exprs/function/function_datetime_string_to_string.h @@ -162,7 +162,7 @@ class FunctionDateTimeStringToString : public IFunction { auto* format_state = reinterpret_cast( context->get_function_state(FunctionContext::FRAGMENT_LOCAL)); if (!format_state) { - return Status::RuntimeError("funciton context for function '{}' must have FormatState;", + return Status::RuntimeError("function context for function '{}' must have FormatState;", get_name()); } diff --git a/be/src/exprs/function/function_dict_get.cpp b/be/src/exprs/function/function_dict_get.cpp index e3e75566320290..5bea15abcd7f37 100644 --- a/be/src/exprs/function/function_dict_get.cpp +++ b/be/src/exprs/function/function_dict_get.cpp @@ -33,7 +33,7 @@ namespace doris { struct DictGetState { std::shared_ptr dict; ///TODO: - // 1. we do not need to check dict every time(shoud only check in open) + // 1. we do not need to check dict every time(should only check in open) // 2. for some dict, will init some struct each time, we should cache it }; @@ -85,7 +85,7 @@ class FunctionDictGet : public IFunction { auto* dict_state = reinterpret_cast( context->get_function_state(FunctionContext::FRAGMENT_LOCAL)); if (!dict_state) { - return Status::RuntimeError("funciton context for function '{}' must have dict_state;", + return Status::RuntimeError("function context for function '{}' must have dict_state;", get_name()); } diff --git a/be/src/exprs/function/function_dict_get_many.cpp b/be/src/exprs/function/function_dict_get_many.cpp index 93e1f9fae5d9a6..9b6dae20fa1c49 100644 --- a/be/src/exprs/function/function_dict_get_many.cpp +++ b/be/src/exprs/function/function_dict_get_many.cpp @@ -38,7 +38,7 @@ namespace doris { struct DictGetState { std::shared_ptr dict; ///TODO: - // 1. we do not need to check dict every time(shoud only check in open) + // 1. we do not need to check dict every time(should only check in open) // 2. for some dict, will init some struct each time, we should cache it }; @@ -90,7 +90,7 @@ class FunctionDictGetMany : public IFunction { auto* dict_state = reinterpret_cast( context->get_function_state(FunctionContext::FRAGMENT_LOCAL)); if (!dict_state) { - return Status::RuntimeError("funciton context for function '{}' must have dict_state;", + return Status::RuntimeError("function context for function '{}' must have dict_state;", get_name()); } diff --git a/be/src/exprs/function/function_string_concat.h b/be/src/exprs/function/function_string_concat.h index 4cac63b662666a..fc616bc55d8400 100644 --- a/be/src/exprs/function/function_string_concat.h +++ b/be/src/exprs/function/function_string_concat.h @@ -114,7 +114,7 @@ class FunctionStringConcat : public IFunction { auto* concat_state = reinterpret_cast( context->get_function_state(FunctionContext::FRAGMENT_LOCAL)); if (!concat_state) { - return Status::RuntimeError("funciton context for function '{}' must have ConcatState;", + return Status::RuntimeError("function context for function '{}' must have ConcatState;", get_name()); } if (concat_state->use_state) { diff --git a/be/src/exprs/function/in.h b/be/src/exprs/function/in.h index 9075415e6365cb..0a1ccbc6dcb761 100644 --- a/be/src/exprs/function/in.h +++ b/be/src/exprs/function/in.h @@ -198,7 +198,7 @@ class FunctionIn : public IFunction { auto* in_state = reinterpret_cast( context->get_function_state(FunctionContext::FRAGMENT_LOCAL)); if (!in_state) { - return Status::RuntimeError("funciton context for function '{}' must have Set;", + return Status::RuntimeError("function context for function '{}' must have Set;", get_name()); } auto res = ColumnUInt8::create(); diff --git a/be/src/format/orc/vorc_reader.cpp b/be/src/format/orc/vorc_reader.cpp index 0b8b55cd2bab64..e04389d49b700e 100644 --- a/be/src/format/orc/vorc_reader.cpp +++ b/be/src/format/orc/vorc_reader.cpp @@ -1041,7 +1041,7 @@ bool OrcReader::_check_expr_can_push_down(const VExprSPtr& expr) { if (fn_name == "is_null_pred" || fn_name == "is_not_null_pred") { return _check_slot_can_push_down(expr); } - VLOG_CRITICAL << "Unsupported function [funciton=" << fn_name << "]"; + VLOG_CRITICAL << "Unsupported function [function=" << fn_name << "]"; } return false; default: diff --git a/be/src/io/fs/s3_file_reader.cpp b/be/src/io/fs/s3_file_reader.cpp index 4eaa10f3311e06..07449bd137ea4f 100644 --- a/be/src/io/fs/s3_file_reader.cpp +++ b/be/src/io/fs/s3_file_reader.cpp @@ -56,7 +56,7 @@ bvar::LatencyRecorder s3_bytes_per_read("s3_file_reader", "bytes_per_read"); // bvar::PerSecond> s3_read_througthput("s3_file_reader", "s3_read_throughput", &s3_bytes_read_total); // Although we can get QPS from s3_bytes_per_read, but s3_bytes_per_read only -// record successfull request, and s3_get_request_qps will record all request. +// record successful request, and s3_get_request_qps will record all request. bvar::PerSecond> s3_get_request_qps("s3_file_reader", "s3_get_request", &s3_file_reader_read_counter); bvar::LatencyRecorder s3_file_reader_latency("s3_file_reader", "s3_latency"); diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp index 76bbf3a2e65782..417270870b74eb 100644 --- a/be/src/runtime/fragment_mgr.cpp +++ b/be/src/runtime/fragment_mgr.cpp @@ -632,7 +632,7 @@ Status FragmentMgr::exec_plan_fragment(const TPipelineFragmentParams& params, VLOG_ROW << "Query: " << print_id(params.query_id) << " exec_plan_fragment params is " << apache::thrift::ThriftDebugString(params).c_str(); // sometimes TPipelineFragmentParams debug string is too long and glog - // will truncate the log line, so print query options seperately for debuggin purpose + // will truncate the log line, so print query options separately for debuggin purpose VLOG_ROW << "Query: " << print_id(params.query_id) << "query options is " << apache::thrift::ThriftDebugString(params.query_options).c_str(); diff --git a/be/src/runtime/memory/mem_tracker_limiter.h b/be/src/runtime/memory/mem_tracker_limiter.h index 0a68b659036f91..e185cb9f065c74 100644 --- a/be/src/runtime/memory/mem_tracker_limiter.h +++ b/be/src/runtime/memory/mem_tracker_limiter.h @@ -301,7 +301,7 @@ inline Status MemTrackerLimiter::check_limit(int64_t bytes) { } // If reserve not enabled, then should check limit here to kill the query when limit exceed. - // For insert into select or pure load job, its memtable is accounted in a seperate memtracker limiter, + // For insert into select or pure load job, its memtable is accounted in a separate memtracker limiter, // and its reserve is set to true. So that it will not reach this logic. // Only query and load job has exec_mem_limit and the _limit > 0, other memtracker limiter's _limit is -1 so // it will not take effect. diff --git a/be/src/runtime/memory/thread_mem_tracker_mgr.h b/be/src/runtime/memory/thread_mem_tracker_mgr.h index a24e32b205abe7..412c16fc0a9a1b 100644 --- a/be/src/runtime/memory/thread_mem_tracker_mgr.h +++ b/be/src/runtime/memory/thread_mem_tracker_mgr.h @@ -352,7 +352,7 @@ inline doris::Status ThreadMemTrackerMgr::try_reserve(int64_t size, TryReserveCh if (process_limit_checker) { if (!doris::GlobalMemoryArbitrator::try_reserve_process_memory(size)) { auto err_msg = fmt::format( - "reserve memory failed, size: {}, because proccess memory exceeded, {}", + "reserve memory failed, size: {}, because process memory exceeded, {}", PrettyPrinter::print_bytes(size), GlobalMemoryArbitrator::process_mem_log_str()); _limiter_tracker->release(size); // rollback diff --git a/be/src/service/point_query_executor.cpp b/be/src/service/point_query_executor.cpp index 8b9e36f08db255..bf494a3e806913 100644 --- a/be/src/service/point_query_executor.cpp +++ b/be/src/service/point_query_executor.cpp @@ -497,7 +497,7 @@ Status PointQueryExecutor::_lookup_row_key() { _row_read_ctxs[i]._row_location = location; // acquire and wrap this rowset (*rowset_ptr)->acquire(); - VLOG_DEBUG << "aquire rowset " << (*rowset_ptr)->rowset_id(); + VLOG_DEBUG << "acquire rowset " << (*rowset_ptr)->rowset_id(); _row_read_ctxs[i]._rowset_ptr = std::unique_ptr( rowset_ptr.release(), &release_rowset); _row_hits++; diff --git a/be/src/storage/cache/page_cache.h b/be/src/storage/cache/page_cache.h index 1cc98c5cb49997..b4e29a20aa122d 100644 --- a/be/src/storage/cache/page_cache.h +++ b/be/src/storage/cache/page_cache.h @@ -206,7 +206,7 @@ class StoragePageCache { int32_t _index_cache_percentage = 0; std::unique_ptr _data_page_cache; std::unique_ptr _index_page_cache; - // Cache data for primary key index data page, seperated from data + // Cache data for primary key index data page, separated from data // page cache to make it for flexible. we need this cache When construct // delete bitmap in unique key with mow std::unique_ptr _pk_index_page_cache; diff --git a/be/src/storage/compaction/compaction.cpp b/be/src/storage/compaction/compaction.cpp index f27f55d309661d..99f5b94dde0b3b 100644 --- a/be/src/storage/compaction/compaction.cpp +++ b/be/src/storage/compaction/compaction.cpp @@ -527,7 +527,7 @@ Status CompactionMixin::build_basic_info(bool is_ordered_compaction) { [](const RowsetSharedPtr& rowset) { return rowset->rowset_meta(); }); _cur_tablet_schema = _tablet->tablet_schema_with_merged_max_schema_version(rowset_metas); - // if enable_vertical_compact_variant_subcolumns is true, we need to compact the variant subcolumns in seperate column groups + // if enable_vertical_compact_variant_subcolumns is true, we need to compact the variant subcolumns in separate column groups // so get_extended_compaction_schema will extended the schema for variant columns // for ordered compaction, we don't need to extend the schema for variant columns if (_enable_vertical_compact_variant_subcolumns && !is_ordered_compaction) { @@ -1685,7 +1685,7 @@ Status CloudCompactionMixin::build_basic_info() { _cur_tablet_schema = _tablet->tablet_schema_with_merged_max_schema_version(rowset_metas); } - // if enable_vertical_compact_variant_subcolumns is true, we need to compact the variant subcolumns in seperate column groups + // if enable_vertical_compact_variant_subcolumns is true, we need to compact the variant subcolumns in separate column groups // so get_extended_compaction_schema will extended the schema for variant columns if (_enable_vertical_compact_variant_subcolumns) { RETURN_IF_ERROR(variant_util::VariantCompactionUtil::get_extended_compaction_schema( diff --git a/be/src/storage/index/zone_map/zone_map_index.h b/be/src/storage/index/zone_map/zone_map_index.h index 80c6928f60bb07..084ffdaf80a358 100644 --- a/be/src/storage/index/zone_map/zone_map_index.h +++ b/be/src/storage/index/zone_map/zone_map_index.h @@ -198,7 +198,7 @@ class ZoneMapIndexReader : public MetadataAdder { private: DorisCallOnce _load_once; - // TODO: yyq, we shoud remove file_reader from here. + // TODO: yyq, we should remove file_reader from here. io::FileReaderSPtr _file_reader; std::unique_ptr _page_zone_maps_meta; std::vector _page_zone_maps; diff --git a/be/src/storage/partial_update_info.cpp b/be/src/storage/partial_update_info.cpp index 4adbd834251a42..aa123b8e4fd229 100644 --- a/be/src/storage/partial_update_info.cpp +++ b/be/src/storage/partial_update_info.cpp @@ -640,7 +640,7 @@ static void fill_non_primary_key_cell_for_column_store( } else if (tablet_column.is_auto_increment()) { // In flexible partial update, the skip bitmap indicates whether a cell // is specified in the original load, so the generated auto-increment value is filled - // in current block in place if needed rather than using a seperate column to + // in current block in place if needed rather than using a separate column to // store the generated auto-increment value in fixed partial update new_col->insert_from(cur_col, block_pos); } else { @@ -747,7 +747,7 @@ static void fill_non_primary_key_cell_for_row_store( } else if (tablet_column.is_auto_increment()) { // In flexible partial update, the skip bitmap indicates whether a cell // is specified in the original load, so the generated auto-increment value is filled - // in current block in place if needed rather than using a seperate column to + // in current block in place if needed rather than using a separate column to // store the generated auto-increment value in fixed partial update new_col->insert_from(cur_col, block_pos); } else { diff --git a/be/src/storage/segment/segment.cpp b/be/src/storage/segment/segment.cpp index 251452babe5a1b..1b9f471abc067e 100644 --- a/be/src/storage/segment/segment.cpp +++ b/be/src/storage/segment/segment.cpp @@ -280,7 +280,7 @@ Status Segment::_open(OlapReaderStatistics* stats) { _num_rows = footer_pb_shared->num_rows(); // An estimated memory usage of a segment - // Footer is seperated to StoragePageCache so we don't need to add it to _meta_mem_usage + // Footer is separated to StoragePageCache so we don't need to add it to _meta_mem_usage // _meta_mem_usage += footer_pb_shared->ByteSizeLong(); if (_pk_index_meta != nullptr) { _meta_mem_usage += _pk_index_meta->ByteSizeLong(); diff --git a/be/src/storage/segment/segment_iterator.cpp b/be/src/storage/segment/segment_iterator.cpp index f667efc0db14cc..8b0e9d4a29ac6c 100644 --- a/be/src/storage/segment/segment_iterator.cpp +++ b/be/src/storage/segment/segment_iterator.cpp @@ -2732,11 +2732,11 @@ Status SegmentIterator::_read_columns_by_rowids(std::vector& read_colu } for (auto cid : read_column_ids) { - auto& colunm = (*mutable_columns)[cid]; - if (_no_need_read_key_data(cid, colunm, select_size)) { + auto& column = (*mutable_columns)[cid]; + if (_no_need_read_key_data(cid, column, select_size)) { continue; } - if (_prune_column(cid, colunm, select_size)) { + if (_prune_column(cid, column, select_size)) { continue; } diff --git a/be/src/storage/segment/vertical_segment_writer.h b/be/src/storage/segment/vertical_segment_writer.h index 1398cce94fdda7..a1aa091402211f 100644 --- a/be/src/storage/segment/vertical_segment_writer.h +++ b/be/src/storage/segment/vertical_segment_writer.h @@ -90,7 +90,7 @@ class VerticalSegmentWriter { // Add one block to batch, memory is owned by the caller. // The batched blocks will be flushed in write_batch. - // Once write_batch is called, no more blocks shoud be added. + // Once write_batch is called, no more blocks should be added. Status batch_block(const Block* block, size_t row_pos, size_t num_rows); Status write_batch(); diff --git a/be/src/storage/storage_engine.cpp b/be/src/storage/storage_engine.cpp index 2616742465a5a3..bee98a2d31d8ca 100644 --- a/be/src/storage/storage_engine.cpp +++ b/be/src/storage/storage_engine.cpp @@ -1411,7 +1411,7 @@ void StorageEngine::add_unused_delete_bitmap_key_ranges(int64_t tablet_id, _unused_delete_bitmap.push_back(std::make_tuple(tablet_id, rowsets, key_ranges)); } -// TODO(zc): refactor this funciton +// TODO(zc): refactor this function Status StorageEngine::create_tablet(const TCreateTabletReq& request, RuntimeProfile* profile) { // Get all available stores, use ref_root_path if the caller specified std::vector stores; diff --git a/be/src/util/cpu_info.cpp b/be/src/util/cpu_info.cpp index 400c8f9381b77c..6c38e0bff14151 100644 --- a/be/src/util/cpu_info.cpp +++ b/be/src/util/cpu_info.cpp @@ -331,7 +331,7 @@ int CpuInfo::get_current_core() { } if (cpu >= max_num_cores_) { LOG_FIRST_N(WARNING, 5) << "sched_getcpu() return value " << cpu - << ", which is greater than get_nprocs_conf() retrun value " + << ", which is greater than get_nprocs_conf() return value " << max_num_cores_ << ", now is " << get_nprocs_conf(); cpu %= max_num_cores_; } diff --git a/cloud/src/common/http_helper.cpp b/cloud/src/common/http_helper.cpp index e0ea14eb26850b..e75b82acac9532 100644 --- a/cloud/src/common/http_helper.cpp +++ b/cloud/src/common/http_helper.cpp @@ -615,7 +615,7 @@ HttpResponse process_adjust_rate_limit(MetaServiceImpl* service, brpc::Controlle "`qps_limit` should not be less than 0"); } if (cb(qps_limit)) { - return http_json_reply(MetaServiceCode::OK, "sucess to adjust rate limit"); + return http_json_reply(MetaServiceCode::OK, "success to adjust rate limit"); } return http_json_reply(MetaServiceCode::INVALID_ARGUMENT, fmt::format("failed to adjust rate limit for qps_limit={}, " diff --git a/cloud/src/meta-service/meta_service_helper.h b/cloud/src/meta-service/meta_service_helper.h index 3ee903e3dfda75..a9e014f7b0d4e2 100644 --- a/cloud/src/meta-service/meta_service_helper.h +++ b/cloud/src/meta-service/meta_service_helper.h @@ -295,7 +295,7 @@ inline MetaServiceCode cast_as(TxnErrorCode code) { // input func_name, count type(get, put, del), make sure the counter is exist // about defer_count: // which means that these bvars will only be counted after stats has finished counting. -// why not cancle KVStats, count directly? +// why not cancel KVStats, count directly? // 1. some RPC operations call functions and function reset txn it also need to be counted // 2. some function such as `scan_tmp_rowset` it used by RPC(commit_txn) and non rpc // maybe we can add a bool variable to judge weather we need count, but if have more complex situation diff --git a/cloud/src/meta-service/meta_service_resource.cpp b/cloud/src/meta-service/meta_service_resource.cpp index 2e19ebbb8a3bff..278519517457cc 100644 --- a/cloud/src/meta-service/meta_service_resource.cpp +++ b/cloud/src/meta-service/meta_service_resource.cpp @@ -376,7 +376,7 @@ static int alter_instance_obj_store_info_by_id(InstanceInfoPB& instance, } else { if (!ak.empty() || !sk.empty()) { code = MetaServiceCode::INVALID_ARGUMENT; - msg = "invaild argument, both set ak/sk and role_arn is not allowed"; + msg = "invalid argument, both set ak/sk and role_arn is not allowed"; LOG(INFO) << msg; return -1; } @@ -1133,7 +1133,7 @@ static int alter_s3_storage_vault_by_id(InstanceInfoPB& instance, std::unique_pt if (obj_info.has_role_arn() && (obj_info.has_ak() || obj_info.has_sk())) { code = MetaServiceCode::INVALID_ARGUMENT; - msg = "invaild argument, both set ak/sk and role_arn is not allowed"; + msg = "invalid argument, both set ak/sk and role_arn is not allowed"; LOG(WARNING) << msg; return -1; } @@ -1281,7 +1281,7 @@ static int extract_object_storage_info(const AlterObjStoreInfoRequest* request, } else { if (obj.has_ak() || obj.has_sk()) { code = MetaServiceCode::INVALID_ARGUMENT; - msg = "invaild argument, both set ak/sk and role_arn is not allowed"; + msg = "invalid argument, both set ak/sk and role_arn is not allowed"; return -1; } diff --git a/cloud/src/recycler/hdfs_accessor.cpp b/cloud/src/recycler/hdfs_accessor.cpp index 8de638f81d8e14..638198a7c18296 100644 --- a/cloud/src/recycler/hdfs_accessor.cpp +++ b/cloud/src/recycler/hdfs_accessor.cpp @@ -301,7 +301,7 @@ class HdfsListIterator final : public ListIterator { } private: - // Return null if error occured, return emtpy DirEntries if dir is empty or doesn't exist. + // Return null if error occurred, return emtpy DirEntries if dir is empty or doesn't exist. std::optional list_directory(const char* dir_path) { int num_entries = 0; SCOPED_BVAR_LATENCY(hdfs_list_dir);