From 24f22138ca1466dc8b180ee35008ab631c42bbd6 Mon Sep 17 00:00:00 2001 From: oceanbase-ce-game-test <106143027+oceanbase-ce-game-test@users.noreply.github.com> Date: Fri, 1 Dec 2023 15:00:39 +0800 Subject: [PATCH 01/11] test compile on develop branch (#1702) Add compiling test on develop branch --- .github/workflows/compile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 44642eae67..5a9b8ac12b 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: From eb6c8342a3a628c40203993ce02f374a98602689 Mon Sep 17 00:00:00 2001 From: oceanbase-ce-game-test <106143027+oceanbase-ce-game-test@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:09:56 +0800 Subject: [PATCH 02/11] fix typo (#1713) fix typo seesion -> session --- src/storage/ob_storage_table_guard.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/ob_storage_table_guard.cpp b/src/storage/ob_storage_table_guard.cpp index 2d0b052d27..6c1a0bae16 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) { From 58a80186c742a772565fd4fae1201846d38d3fbe Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Mon, 4 Dec 2023 18:15:53 +0800 Subject: [PATCH 03/11] fix typo in ob_resource_map.h (#1714) fix ObResrouceMap to ObResourceMap --- src/storage/ob_resource_map.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/ob_resource_map.h b/src/storage/ob_resource_map.h index 455338a755..b15f16e7e4 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)); } From 13e097c74d577bbed0884f677fe01f7dc77a0d01 Mon Sep 17 00:00:00 2001 From: daiym <87817895+risingstar213@users.noreply.github.com> Date: Mon, 4 Dec 2023 19:20:24 +0800 Subject: [PATCH 04/11] Fix Typo. (#1716) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix encrytion to encryption. （Spell Mistake） Fix transefer to transfer. （Spell Mistake） --- src/storage/ob_storage_schema.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/storage/ob_storage_schema.cpp b/src/storage/ob_storage_schema.cpp index 2f042811a6..dac18dc7e7 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)); } } } From f18aa18f8722975959cf49e121ee04476f0a6467 Mon Sep 17 00:00:00 2001 From: Reminisce66 <48374839+Reminisce66@users.noreply.github.com> Date: Mon, 4 Dec 2023 19:56:36 +0800 Subject: [PATCH 05/11] Fix Typo. (#1715) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix need_fectch to need_fetch. （Spell Mistake） --- src/storage/ob_storage_rpc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/ob_storage_rpc.h b/src/storage/ob_storage_rpc.h index d1214f29e4..41ffb763fb 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); From 646d4aa7f7e1ae62b6fdb7adc239b009ceee37d0 Mon Sep 17 00:00:00 2001 From: Qiang Wei <43490415+richardweii@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:26:23 +0800 Subject: [PATCH 06/11] fix typo in ob_storage_rpc.cpp (#1717) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix 'assgin' to 'assign'. （Spell Mistake） --- src/storage/ob_storage_rpc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/ob_storage_rpc.cpp b/src/storage/ob_storage_rpc.cpp index 9fd9c4dd1d..696495f7e9 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_; From 0f256b2e2dafc5462c58fbf75a9d0952418551b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=89=BF=E7=A6=B9=20Yang=20Chengyu?= <108976904+ycy2536410317@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:26:40 +0800 Subject: [PATCH 07/11] =?UTF-8?q?Fix=20satrt=20to=20start.=20=EF=BC=88Spel?= =?UTF-8?q?l=20Mistake=EF=BC=89=20(#1718)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix 'satrt' to 'start'. （Spell Mistake） --- src/storage/backup/ob_ls_backup_clean_mgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/backup/ob_ls_backup_clean_mgr.cpp b/src/storage/backup/ob_ls_backup_clean_mgr.cpp index 7756e8ae8d..91e23e0a2c 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)); From eebdd3006e1cb77c93b706c53042d737ba5e1b2b Mon Sep 17 00:00:00 2001 From: XJTU-WJH <51690980+XJTU-WJH@users.noreply.github.com> Date: Tue, 5 Dec 2023 13:53:17 +0800 Subject: [PATCH 08/11] Fix iteartor to iterator (Spell Mistake) (#1722) --- src/storage/backup/ob_backup_iterator.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/backup/ob_backup_iterator.cpp b/src/storage/backup/ob_backup_iterator.cpp index 4f1c9d402e..4c5a40abe7 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))) { From 6a1b08a048706d945b78a299c179341b92a5031f Mon Sep 17 00:00:00 2001 From: yanghy <93068857+yanghy233@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:26:26 +0800 Subject: [PATCH 09/11] fix ob_storage_schema.h typo (#1720) ob_storage_schema.h --- src/storage/ob_storage_schema.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/ob_storage_schema.h b/src/storage/ob_storage_schema.h index 944cf2c6d2..c4b3c221b8 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 From 4d744c40bb014fa3093aad689832d7ce9764a35f Mon Sep 17 00:00:00 2001 From: oldcb <37439985+OnlyDescribe@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:28:41 +0800 Subject: [PATCH 10/11] fix typo in ob_row_conflict_handler.cpp (#1723) --- src/storage/memtable/ob_row_conflict_handler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/memtable/ob_row_conflict_handler.cpp b/src/storage/memtable/ob_row_conflict_handler.cpp index 01e045d73e..80e341c9c4 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 { From 4c15ec86c40ce2b6bb37ae62864012d605ed2505 Mon Sep 17 00:00:00 2001 From: ZhangHongYin <46039728+SpriCoder@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:42:19 +0800 Subject: [PATCH 11/11] fix typo (#1724) --- src/storage/memtable/mvcc/ob_keybtree_deps.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/memtable/mvcc/ob_keybtree_deps.h b/src/storage/memtable/mvcc/ob_keybtree_deps.h index 9b7afe6851..2c8c7926dc 100644 --- a/src/storage/memtable/mvcc/ob_keybtree_deps.h +++ b/src/storage/memtable/mvcc/ob_keybtree_deps.h @@ -274,7 +274,7 @@ protected: int start = 0; int end = 0; int ret = OB_SUCCESS; - // Only leaf node try append directly, other scence do nothign with index. + // Only leaf node try append directly, other scence do nothing with index. if (is_leaf()) { index->load(index_); end = index->size();