diff --git a/deps/oblib/src/lib/json/ob_json_print_utils.cpp b/deps/oblib/src/lib/json/ob_json_print_utils.cpp index 7bc1d0183015fab20255915d3154e7e75e3f2116..30003c59f206595d364d4e8ef5215da401a19db9 100644 --- a/deps/oblib/src/lib/json/ob_json_print_utils.cpp +++ b/deps/oblib/src/lib/json/ob_json_print_utils.cpp @@ -26,7 +26,7 @@ int ObStdJsonConvertor::init(const char* json, char* buf, const int64_t buf_size int ret = OB_SUCCESS; if (OB_ISNULL(json) || OB_ISNULL(buf) || OB_UNLIKELY(0 == buf_size)) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("invalid arugment", K(json), K(buf), K(buf_size)); + LOG_WARN("invalid argument", K(json), K(buf), K(buf_size)); } else { json_ = json; buf_ = buf; diff --git a/deps/oblib/src/rpc/obmysql/ob_mysql_compress_protocol_processor.cpp b/deps/oblib/src/rpc/obmysql/ob_mysql_compress_protocol_processor.cpp index ce65591900928e7229166637d36b9ef5b6097bf8..d08a8fc99d1c32e91d0c8bb148faa8a7887a641e 100644 --- a/deps/oblib/src/rpc/obmysql/ob_mysql_compress_protocol_processor.cpp +++ b/deps/oblib/src/rpc/obmysql/ob_mysql_compress_protocol_processor.cpp @@ -53,7 +53,7 @@ int ObMysqlCompressProtocolProcessor::decode(easy_message_t* m, rpc::ObPacket*& if (0 == pktlen) { ret = OB_INVALID_ARGUMENT; - LOG_ERROR("invalid arugment", K(sessid), K(pktlen), K(pktlen_before_compress), K(ret)); + LOG_ERROR("invalid argument", K(sessid), K(pktlen), K(pktlen_before_compress), K(ret)); } else if (pktlen > rpktlen) { // one packet was not received complete int64_t delta_len = pktlen - rpktlen; // valid packet, but not sufficient data received by easy, tell easy read more. diff --git a/deps/oblib/src/rpc/obrpc/ob_virtual_rpc_protocol_processor.cpp b/deps/oblib/src/rpc/obrpc/ob_virtual_rpc_protocol_processor.cpp index 471fbe29af278b089d5b36d54a4c07dc7d2dc4bc..a388c95c6b8f76abf5af653a78cc7df1406e1ea0 100644 --- a/deps/oblib/src/rpc/obrpc/ob_virtual_rpc_protocol_processor.cpp +++ b/deps/oblib/src/rpc/obrpc/ob_virtual_rpc_protocol_processor.cpp @@ -646,7 +646,7 @@ int ObVirtualRpcProtocolProcessor::decode_raw_net_rpc_packet( ObRpcProxy::PCodeGuard pcode_guard(OB_RPC_STREAM_TEST_DECODE_RAW_PCODE); if (OB_ISNULL(ms) || OB_UNLIKELY(preceding_data_len < 0)) { ret = OB_INVALID_ARGUMENT; - LOG_ERROR("invalid arugment", KP(ms), K(preceding_data_len), K(ret)); + LOG_ERROR("invalid argument", KP(ms), K(preceding_data_len), K(ret)); } else if (OB_ISNULL(ms->input) || OB_ISNULL(ms->pool)) { ret = OB_INVALID_ARGUMENT; LOG_ERROR("invalid argument", "input", ms->input, "pool", ms->pool, K(ret)); diff --git a/src/observer/virtual_table/ob_virtual_sql_monitor.cpp b/src/observer/virtual_table/ob_virtual_sql_monitor.cpp index 903cde023c2c661796f89786e4d1ffdb68a6676c..294f3b48610588329ad8e6e14b6b412ebb82c7a3 100644 --- a/src/observer/virtual_table/ob_virtual_sql_monitor.cpp +++ b/src/observer/virtual_table/ob_virtual_sql_monitor.cpp @@ -166,7 +166,7 @@ int ObVirtualSqlMonitor::inner_get_next_row(common::ObNewRow*& row) ret = OB_ITER_END; } else if (OB_ISNULL(cells) || OB_ISNULL(allocator_)) { ret = OB_NOT_INIT; - SERVER_LOG(WARN, "invalid arugment", K(ret), K(cells), K(allocator_), K(monitor_manager_)); + SERVER_LOG(WARN, "invalid argument", K(ret), K(cells), K(allocator_), K(monitor_manager_)); } else { while (OB_SUCC(get_next_monitor_info())) { // take care of the possible "holes" if (NULL != plan_info_) { diff --git a/src/rootserver/backup/ob_backup_backupset.cpp b/src/rootserver/backup/ob_backup_backupset.cpp index c1b02a5f8e30b0e74144ada968c3828e76ce0448..2939a560b0fe21d01781d90465b86a5f87214825 100644 --- a/src/rootserver/backup/ob_backup_backupset.cpp +++ b/src/rootserver/backup/ob_backup_backupset.cpp @@ -2141,7 +2141,7 @@ int ObBackupBackupset::calc_backup_set_copy_id( LOG_WARN("backup backupset do not init", KR(ret)); } else if (backup_set_id < 1) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("get tenant backup backup task copy id get invalid arugment", KR(ret), K(job_info), K(backup_set_id)); + LOG_WARN("get tenant backup backup task copy id get invalid argument", KR(ret), K(job_info), K(backup_set_id)); } else if (OB_FAIL(get_job_copy_id_level(job_info, copy_id_level))) { LOG_WARN("failed to get job copy id level", KR(ret), K(job_info)); } else if (OB_FAIL(ObBackupSetFilesOperator::get_backup_set_file_info_copy_list( diff --git a/src/rootserver/ob_ddl_service.cpp b/src/rootserver/ob_ddl_service.cpp index 126ed0f77818781dff5d9403661ca5e01002e34d..eed9ec1697294ed1078eb896d3a8d78184865523 100755 --- a/src/rootserver/ob_ddl_service.cpp +++ b/src/rootserver/ob_ddl_service.cpp @@ -9850,7 +9850,7 @@ int ObDDLService::force_drop_schema(const obrpc::ObForceDropSchemaArg &arg) LOG_WARN("variable is not init"); } else if (OB_INVALID_ID == schema_id) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("invalid arugment", K(schema_id)); + LOG_WARN("invalid argument", K(schema_id)); } else if (OB_FAIL(get_tenant_schema_guard_with_version_in_inner_table(tenant_id, schema_guard))) { LOG_WARN("fail to get schema guard with version in inner table", K(ret), K(tenant_id)); } else if (OB_FAIL(trans.start(sql_proxy_))) { @@ -10263,7 +10263,7 @@ int ObDDLService::update_index_status(const obrpc::ObUpdateIndexStatusArg &arg, } else if (OB_INVALID_ID == table_id || create_mem_version <= 0 || new_status <= INDEX_STATUS_NOT_FOUND || new_status >= INDEX_STATUS_MAX) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("invalid arugment", KT(table_id), K(new_status), K(create_mem_version)); + LOG_WARN("invalid argument", KT(table_id), K(new_status), K(create_mem_version)); } else if (OB_FAIL(get_tenant_schema_guard_with_version_in_inner_table(tenant_id, schema_guard))) { LOG_WARN("fail to get schema guard with version in inner table", KR(ret), K(tenant_id)); } else if (OB_FAIL(schema_guard.get_table_schema(table_id, table))) { diff --git a/src/share/scheduler/ob_dag_scheduler.cpp b/src/share/scheduler/ob_dag_scheduler.cpp index 9420ac3f19145766b10a5d2309b21cd6bf4085fc..6c7d085979fe904e4b0829ec26278a23343a2f07 100644 --- a/src/share/scheduler/ob_dag_scheduler.cpp +++ b/src/share/scheduler/ob_dag_scheduler.cpp @@ -1109,7 +1109,7 @@ int ObDagScheduler::add_dag(ObIDag* dag, const bool emergency) COMMON_LOG(WARN, "ObDagScheduler is not inited", K(ret)); } else if (OB_ISNULL(dag)) { ret = OB_INVALID_ARGUMENT; - COMMON_LOG(WARN, "invalid arugment", KP(dag)); + COMMON_LOG(WARN, "invalid argument", KP(dag)); } else if (OB_UNLIKELY(!dag->is_valid())) { ret = OB_INVALID_ARGUMENT; COMMON_LOG(WARN, "invalid argument", K(ret), K(*dag)); @@ -1914,7 +1914,7 @@ int ObDagScheduler::check_dag_exist(const ObIDag* dag, bool& exist) COMMON_LOG(WARN, "ObDagScheduler is not inited", K(ret)); } else if (OB_ISNULL(dag)) { ret = OB_INVALID_ARGUMENT; - COMMON_LOG(WARN, "invalid arugment", KP(dag)); + COMMON_LOG(WARN, "invalid argument", KP(dag)); } else { ObThreadCondGuard guard(scheduler_sync_); ObIDag* stored_dag = nullptr; @@ -1944,7 +1944,7 @@ int ObDagScheduler::cancel_dag(const ObIDag* dag) COMMON_LOG(WARN, "ObDagScheduler is not inited", K(ret)); } else if (OB_ISNULL(dag)) { ret = OB_INVALID_ARGUMENT; - COMMON_LOG(WARN, "invalid arugment", KP(dag)); + COMMON_LOG(WARN, "invalid argument", KP(dag)); } else { { ObThreadCondGuard guard(scheduler_sync_); diff --git a/src/sql/optimizer/ob_skyline_prunning.cpp b/src/sql/optimizer/ob_skyline_prunning.cpp index 809f0ef0e3afd3bfe75511cf5acf5bb8e614bff9..f5d0f307d2ede16d49c5439f7c9c21bc3bcb2278 100644 --- a/src/sql/optimizer/ob_skyline_prunning.cpp +++ b/src/sql/optimizer/ob_skyline_prunning.cpp @@ -184,7 +184,7 @@ int KeyPrefixComp::operator()(const uint64_t* left, const bool* left_const, cons int ret = OB_SUCCESS; if (left_cnt < 0 || right_cnt < 0) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("invalid arugment", K(ret), K(left_cnt), K(right_cnt), K(ret)); + LOG_WARN("invalid argument", K(ret), K(left_cnt), K(right_cnt), K(ret)); } else if (0 == left_cnt && 0 == right_cnt) { status_ = ObSkylineDim::EQUAL; } else if (left_cnt == 0 || right_cnt == 0) { diff --git a/src/storage/ob_partition_range_spliter.cpp b/src/storage/ob_partition_range_spliter.cpp index 6fa1640910d3680aa753d2ac069e41e47cafc6a7..073e4875df0a02bbd731fd1248a5c04a75d5b3be 100644 --- a/src/storage/ob_partition_range_spliter.cpp +++ b/src/storage/ob_partition_range_spliter.cpp @@ -152,7 +152,7 @@ int ObPartitionParallelRanger::init( } else if (OB_UNLIKELY(!range.is_valid() || range_paras.empty() || parallel_target_count <= 0)) { ret = OB_INVALID_ARGUMENT; STORAGE_LOG(WARN, - "Invalid arugment to init ObPartitionParallelRanger", + "Invalid argument to init ObPartitionParallelRanger", K(ret), K(range), K(range_paras), @@ -946,7 +946,7 @@ int ObPartitionMultiRangeSpliter::merge_and_push_range_array(const RangeSplitArr if (OB_UNLIKELY(src_range_split_array.empty())) { ret = OB_INVALID_ARGUMENT; - STORAGE_LOG(WARN, "Invalid arugment to merge range array", K(ret), K(src_range_split_array)); + STORAGE_LOG(WARN, "Invalid argument to merge range array", K(ret), K(src_range_split_array)); } else { const ObStoreRange* last_range = nullptr; RangeSplitArray dst_range_array; @@ -1032,7 +1032,7 @@ int ObPartitionMultiRangeSpliter::build_single_range_array(const ObIArray::update_header(const int64_t data_size int ret = OB_SUCCESS; if (data_size <= 0) { ret = OB_INVALID_ARGUMENT; - LOG_WARN("update header get invalid arugment", K(ret), K(data_size)); + LOG_WARN("update header get invalid argument", K(ret), K(data_size)); } else { rpc_header_.data_size_ += static_cast(data_size); ++rpc_header_.object_count_; diff --git a/src/storage/transaction/ob_trans_version_mgr.cpp b/src/storage/transaction/ob_trans_version_mgr.cpp index fc49fa5de96153de47702dc930a9de87997fb0de..129b0baf67f94622b686ddb1294c9c5d1a895e62 100644 --- a/src/storage/transaction/ob_trans_version_mgr.cpp +++ b/src/storage/transaction/ob_trans_version_mgr.cpp @@ -85,7 +85,7 @@ int ObTransVersionMgr::update_publish_version(const int64_t publish_version) int ret = OB_SUCCESS; if (!ObTransVersion::is_valid(publish_version)) { - TRANS_LOG(WARN, "invalid arugment", K(publish_version)); + TRANS_LOG(WARN, "invalid argument", K(publish_version)); ret = OB_INVALID_ARGUMENT; } else if (OB_FAIL(update_local_trans_version_(publish_version))) { TRANS_LOG(WARN, "update local transaction version error", KR(ret), K(publish_version));