diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 44642eae6..5a9b8ac12 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -2,9 +2,9 @@ name: Compile on: push: - branches: [ master ] + branches: [ master, develop ] pull_request: - branches: [ master ] + branches: [ master, develop ] jobs: centos-build: diff --git a/src/storage/backup/ob_backup_iterator.cpp b/src/storage/backup/ob_backup_iterator.cpp index 4f1c9d402..4c5a40abe 100644 --- a/src/storage/backup/ob_backup_iterator.cpp +++ b/src/storage/backup/ob_backup_iterator.cpp @@ -570,7 +570,7 @@ int ObBackupMacroBlockIndexIterator::inner_do_fetch_new_(const int64_t file_id) LOG_WARN("file id invalid", K(ret), K(file_id)); } else if (!cur_index_list_.empty() && cur_idx_ < cur_index_list_.count()) { ret = OB_NOT_SUPPORTED; - LOG_WARN("do not support prepare when prev iteartor not end", K(ret), K(cur_idx_), K(cur_index_list_.count())); + LOG_WARN("do not support prepare when prev iterator not end", K(ret), K(cur_idx_), K(cur_index_list_.count())); } else if (FALSE_IT(cur_index_list_.reset())) { } else if (FALSE_IT(block_desc_list_.reset())) { } else if (OB_FAIL(fetch_macro_index_list_(file_id, index_list, block_desc_list))) { diff --git a/src/storage/backup/ob_ls_backup_clean_mgr.cpp b/src/storage/backup/ob_ls_backup_clean_mgr.cpp index 7756e8ae8..91e23e0a2 100644 --- a/src/storage/backup/ob_ls_backup_clean_mgr.cpp +++ b/src/storage/backup/ob_ls_backup_clean_mgr.cpp @@ -174,7 +174,7 @@ int ObLSBackupCleanDagNet::start_running() int tmp_ret = OB_SUCCESS; ObLSBackupCleanDag *clean_dag = nullptr; ObTenantDagScheduler *scheduler = nullptr; - FLOG_INFO("[BACKUP_CLEAN]satrt running ls backup clean dagnet"); + FLOG_INFO("[BACKUP_CLEAN]start running ls backup clean dagnet"); if (!is_inited_) { ret = OB_NOT_INIT; LOG_WARN("backup clean dag net do not init", K(ret)); diff --git a/src/storage/memtable/ob_row_conflict_handler.cpp b/src/storage/memtable/ob_row_conflict_handler.cpp index 01e045d73..80e341c9c 100644 --- a/src/storage/memtable/ob_row_conflict_handler.cpp +++ b/src/storage/memtable/ob_row_conflict_handler.cpp @@ -209,7 +209,7 @@ int ObRowConflictHandler::check_foreign_key_constraint_for_sstable(ObTxTableGuar ObStoreRowLockState &lock_state) { int ret = OB_SUCCESS; // If a transaction is committed, the trans_id of it is 0, which is invalid. - // So we can not use check_row_locekd interface to get the trans_version. + // So we can not use check_row_locked interface to get the trans_version. if (!data_trans_id.is_valid()) { if (trans_version > snapshot_version) { ret = OB_TRANSACTION_SET_VIOLATION; @@ -277,7 +277,7 @@ int ObRowConflictHandler::post_row_read_conflict(ObMvccAccessCtx &acc_ctx, tx_desc->add_conflict_tx(conflict_tx); } // The addr in tx_desc is the scheduler_addr of current trans, - // and GCTX.self_addr() will retrun the addr where the row is stored + // and GCTX.self_addr() will return the addr where the row is stored // (i.e. where the trans is executing) bool remote_tx = tx_desc->get_addr() != GCTX.self_addr(); ObFunction recheck_func([&](bool &locked, bool &wait_on_row) -> int { diff --git a/src/storage/ob_resource_map.h b/src/storage/ob_resource_map.h index 455338a75..b15f16e7e 100644 --- a/src/storage/ob_resource_map.h +++ b/src/storage/ob_resource_map.h @@ -395,7 +395,7 @@ int ObResourceMap::foreach(Callback &callback) common::ObBucketWLockAllGuard guard(bucket_lock_); if (OB_UNLIKELY(!is_inited_)) { ret = common::OB_NOT_INIT; - STORAGE_LOG(WARN, "ObResrouceMap has not been inited", K(ret)); + STORAGE_LOG(WARN, "ObResourceMap has not been inited", K(ret)); } else if (OB_FAIL(map_.foreach_refactored(callback_adpator))) { STORAGE_LOG(WARN, "fail to foreach refactored", K(ret)); } diff --git a/src/storage/ob_storage_rpc.cpp b/src/storage/ob_storage_rpc.cpp index 6ebb10e13..b26e7e25a 100644 --- a/src/storage/ob_storage_rpc.cpp +++ b/src/storage/ob_storage_rpc.cpp @@ -601,7 +601,7 @@ int ObCopySSTableMacroRangeInfoArg::assign(const ObCopySSTableMacroRangeInfoArg ret = OB_INVALID_ARGUMENT; LOG_WARN("copy sstable macro range info arg is invalid", K(ret), K(arg)); } else if (OB_FAIL(copy_table_key_array_.assign(arg.copy_table_key_array_))) { - LOG_WARN("failed to assgin src table array", K(ret), K(arg)); + LOG_WARN("failed to assign src table array", K(ret), K(arg)); } else { tenant_id_ = arg.tenant_id_; ls_id_ = arg.ls_id_; diff --git a/src/storage/ob_storage_rpc.h b/src/storage/ob_storage_rpc.h index 28bb2ca51..114d10a0a 100644 --- a/src/storage/ob_storage_rpc.h +++ b/src/storage/ob_storage_rpc.h @@ -1303,7 +1303,7 @@ public: virtual ~ObStorageStreamRpcReader() {} int init(common::ObInOutBandwidthThrottle &bandwidth_throttle); int fetch_next_buffer_if_need(); - int check_need_fetch_next_buffer(bool &need_fectch); + int check_need_fetch_next_buffer(bool &need_fetch); int fetch_next_buffer(); template int fetch_and_decode(Data &data); diff --git a/src/storage/ob_storage_schema.cpp b/src/storage/ob_storage_schema.cpp index 2f042811a..dac18dc7e 100644 --- a/src/storage/ob_storage_schema.cpp +++ b/src/storage/ob_storage_schema.cpp @@ -1146,7 +1146,7 @@ int ObStorageSchema::generate_column_array(const ObTableSchema &input_schema) if (ob_is_large_text(col->get_data_type())) { col_schema.default_checksum_ = 0; } else if (OB_FAIL(datum.from_obj_enhance(col->get_orig_default_value()))) { - STORAGE_LOG(WARN, "Failed to transefer obj to datum", K(ret)); + STORAGE_LOG(WARN, "Failed to transfer obj to datum", K(ret)); } else { col_schema.default_checksum_ = datum.checksum(0); } @@ -1348,7 +1348,7 @@ int ObStorageSchema::get_encryption_id(int64_t &encrypt_id) const ret = OB_NOT_INIT; STORAGE_LOG(WARN, "not inited", K(ret), K_(is_inited)); } else if (OB_FAIL(share::ObEncryptionUtil::parse_encryption_id(encryption_, encrypt_id))) { - STORAGE_LOG(WARN, "failed to parse_encrytion_id", K(ret), K(encryption_)); + STORAGE_LOG(WARN, "failed to parse_encryption_id", K(ret), K(encryption_)); } return ret; } @@ -1489,7 +1489,7 @@ int ObStorageSchema::get_orig_default_row( ret = OB_ERR_SYS; STORAGE_LOG(WARN, "column id not found", K(ret), K(column_ids.at(i))); } else if (OB_FAIL(default_row.storage_datums_[i].from_obj_enhance(col_schema->get_orig_default_value()))) { - STORAGE_LOG(WARN, "Failed to transefer obj to datum", K(ret)); + STORAGE_LOG(WARN, "Failed to transfer obj to datum", K(ret)); } } } diff --git a/src/storage/ob_storage_schema.h b/src/storage/ob_storage_schema.h index 944cf2c6d..c4b3c221b 100644 --- a/src/storage/ob_storage_schema.h +++ b/src/storage/ob_storage_schema.h @@ -307,7 +307,7 @@ public: // STORAGE_SCHEMA_VERSION is for serde compatibility. // Currently we do not use "standard" serde function macro, - // because we add "allocator" param in deserialize fiunction, + // because we add "allocator" param in deserialize function, // so we should handle compatibility in the specified deserialize function, // thus we add a static variable STORAGE_SCHEMA_VERSION and a class member storage_schema_version_ here. // Compatibility code should be added if new variables occur in future diff --git a/src/storage/ob_storage_table_guard.cpp b/src/storage/ob_storage_table_guard.cpp index 2d0b052d2..6c1a0bae1 100644 --- a/src/storage/ob_storage_table_guard.cpp +++ b/src/storage/ob_storage_table_guard.cpp @@ -180,7 +180,7 @@ int ObStorageTableGuard::refresh_and_protect_table(ObRelativeTable &relative_tab } else { // no worry. iter will hold tablet reference and its life cycle is longer than guard tablet_ = iter.get_tablet(); - // TODO: check if seesion is killed + // TODO: check if session is killed if (store_ctx_.timeout_ > 0) { const int64_t query_left_time = store_ctx_.timeout_ - ObTimeUtility::current_time(); if (query_left_time <= 0) {