diff --git a/src/logservice/replayservice/ob_tablet_replay_executor.cpp b/src/logservice/replayservice/ob_tablet_replay_executor.cpp index aa9cf93d28..89c8c65fb1 100644 --- a/src/logservice/replayservice/ob_tablet_replay_executor.cpp +++ b/src/logservice/replayservice/ob_tablet_replay_executor.cpp @@ -128,7 +128,7 @@ int ObTabletReplayExecutor::replay_get_tablet_( } else if (OB_ISNULL(ls = ls_handle.get_ls())) { ret = OB_ERR_UNEXPECTED; CLOG_LOG(WARN, "log stream should not be NULL", KR(ret), K(scn)); - } else if (is_replay_update_user_data_()) { + } else if (is_replay_update_tablet_status_()) { if (OB_FAIL(ls->replay_get_tablet_no_check(tablet_id, scn, tablet_handle))) { CLOG_LOG(WARN, "replay get table failed", KR(ret), "ls_id", ls->get_ls_id()); } @@ -140,7 +140,7 @@ int ObTabletReplayExecutor::replay_get_tablet_( int ObTabletReplayExecutor::replay_check_restore_status_(storage::ObTabletHandle &tablet_handle) { - const bool update_user_data = is_replay_update_user_data_(); + const bool update_user_data = is_replay_update_tablet_status_(); return ObTabletReplayExecutor::replay_check_restore_status(tablet_handle, update_user_data); } @@ -179,7 +179,7 @@ int ObTabletReplayExecutor::check_can_skip_replay_( can_skip = false; ObLS *ls = nullptr; share::SCN tablet_change_scn = share::SCN::min_scn(); - if (!is_replay_update_user_data_()) { + if (!is_replay_update_tablet_status_()) { can_skip = false; } else if (!scn.is_valid()) { ret = OB_INVALID_ARGUMENT; diff --git a/src/logservice/replayservice/ob_tablet_replay_executor.h b/src/logservice/replayservice/ob_tablet_replay_executor.h index def66722fc..aaacd911e5 100644 --- a/src/logservice/replayservice/ob_tablet_replay_executor.h +++ b/src/logservice/replayservice/ob_tablet_replay_executor.h @@ -71,7 +71,7 @@ protected: // 4. TX_START_TRANSFER_OUT // 5. TX_FINISH_TRANSFER_OUT // 6. TX_FINISH_TRANSFER_IN - virtual bool is_replay_update_user_data_() const = 0; // TODO (wenjinyu.wjy) Modify the function name to is_replay_update_tablet_status_ + virtual bool is_replay_update_tablet_status_() const = 0; // replay to the tablet // @return OB_SUCCESS, replay successfully, data has written to tablet. diff --git a/src/share/backup/ob_backup_config.cpp b/src/share/backup/ob_backup_config.cpp index b76dc60794..c86bdcccb9 100644 --- a/src/share/backup/ob_backup_config.cpp +++ b/src/share/backup/ob_backup_config.cpp @@ -897,7 +897,7 @@ int ObLogRestoreSourceLocationConfigParser::check_before_update_inner_config( } //TODO (zbf271370) need supports format check, checks whether the directory exists, and is a log backup - //TODO (wenjinyu.wjy) need support access permission check + //TODO (wenjinyu.wjy) 4.3 need support access permission check // return ret; } diff --git a/src/storage/compaction/ob_medium_compaction_mgr.cpp b/src/storage/compaction/ob_medium_compaction_mgr.cpp index b6eef58cf9..51a3c436a0 100644 --- a/src/storage/compaction/ob_medium_compaction_mgr.cpp +++ b/src/storage/compaction/ob_medium_compaction_mgr.cpp @@ -33,7 +33,7 @@ public: ObTabletMediumClogReplayExecutor(ObMediumCompactionInfo &medium_info); int init(const share::SCN &scn); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return false; } diff --git a/src/storage/ddl/ob_ddl_replay_executor.h b/src/storage/ddl/ob_ddl_replay_executor.h index f9107dcac2..c61d48c8c7 100644 --- a/src/storage/ddl/ob_ddl_replay_executor.h +++ b/src/storage/ddl/ob_ddl_replay_executor.h @@ -33,7 +33,7 @@ public: ObDDLReplayExecutor(); protected: - bool is_replay_update_user_data_() const override final + bool is_replay_update_tablet_status_() const override final { return false; } @@ -136,7 +136,7 @@ public: const share::SCN &scn); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return false; } diff --git a/src/storage/high_availability/ob_tablet_backfill_tx.cpp b/src/storage/high_availability/ob_tablet_backfill_tx.cpp index 9eb386f9c5..123a1b4242 100644 --- a/src/storage/high_availability/ob_tablet_backfill_tx.cpp +++ b/src/storage/high_availability/ob_tablet_backfill_tx.cpp @@ -856,7 +856,6 @@ int ObTabletTableBackfillTXTask::prepare_merge_ctx_() tablet_merge_ctx_.sstable_version_range_.snapshot_version_ = table_handle_.get_table()->is_memtable() ? static_cast(table_handle_.get_table())->get_snapshot_version() : tablet_handle_.get_obj()->get_snapshot_version(); tablet_merge_ctx_.scn_range_ = table_handle_.get_table()->get_key().scn_range_; - // TODO(wenjinyu.wjy) waiting to kill transaction tablet_merge_ctx_.merge_scn_ = table_handle_.get_table()->is_memtable() ? table_handle_.get_table()->get_key().scn_range_.end_scn_ : backfill_tx_ctx_->log_sync_scn_; tablet_merge_ctx_.create_snapshot_version_ = 0; tablet_merge_ctx_.schedule_major_ = false; diff --git a/src/storage/high_availability/ob_transfer_struct.cpp b/src/storage/high_availability/ob_transfer_struct.cpp index 3a4be19632..642cae858e 100644 --- a/src/storage/high_availability/ob_transfer_struct.cpp +++ b/src/storage/high_availability/ob_transfer_struct.cpp @@ -326,7 +326,7 @@ int ObTXTransferUtils::get_tablet_status_( return ret; } -// TODO(wenjinyu.wjy) It needs to be added to trigger the tablet freezing operation +// TODO(wenjinyu.wjy) (4.3)It needs to be added to trigger the tablet freezing operation int ObTXTransferUtils::set_tablet_freeze_flag(const share::ObLSID &ls_id, ObTablet *tablet) { MDS_TG(10_ms); diff --git a/src/storage/ob_storage_table_guard.cpp b/src/storage/ob_storage_table_guard.cpp index 49a9560471..f36cb46a9b 100644 --- a/src/storage/ob_storage_table_guard.cpp +++ b/src/storage/ob_storage_table_guard.cpp @@ -385,7 +385,6 @@ bool ObStorageTableGuard::need_to_refresh_table(ObTableStoreIterator &iter) ObLSID curr_ls_id = store_ctx_.ls_->get_ls_id(); LOG_WARN("table is not data memtable, it does not allow ls_id to be different", K(ret), K(ls_id), K(curr_ls_id), KPC(table)); } else { - // TODO (wenjinyu.wjy) Active memtable is not allowed while ls_id is different need_create_memtable = true; } } diff --git a/src/storage/ob_tablet_autoinc_seq_rpc_handler.h b/src/storage/ob_tablet_autoinc_seq_rpc_handler.h index 87317256c0..9a0a5afcf5 100644 --- a/src/storage/ob_tablet_autoinc_seq_rpc_handler.h +++ b/src/storage/ob_tablet_autoinc_seq_rpc_handler.h @@ -36,7 +36,7 @@ public: K_(scn)); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return false; } diff --git a/src/storage/tablet/ob_tablet.cpp b/src/storage/tablet/ob_tablet.cpp index 1d2b2e05a8..586b4f8513 100755 --- a/src/storage/tablet/ob_tablet.cpp +++ b/src/storage/tablet/ob_tablet.cpp @@ -2189,7 +2189,7 @@ int ObTablet::get_read_tables( return ret; } -// TODO (wenjinyu.wjy) need to be moved to ObLSTableService +// TODO (wenjinyu.wjy) need to be moved to ObLSTableService in 4.3 int ObTablet::get_src_tablet_read_tables_( const int64_t snapshot_version, const bool allow_no_ready_read, @@ -2229,7 +2229,6 @@ int ObTablet::get_src_tablet_read_tables_( ret = OB_ERR_UNEXPECTED; LOG_WARN("tablet should not be NULL", K(ret), KP(tablet), K(user_data)); } - // TODO (wenjinyu.wjy) need to supplement the continuity check of src and dest tables if (OB_SUCC(ret)) { if (OB_ISNULL(iter.table_store_iter_.transfer_src_table_store_handle_)) { void *meta_hdl_buf = ob_malloc(sizeof(ObStorageMetaHandle), ObMemAttr(MTL_ID(), "TransferMetaH")); @@ -2275,8 +2274,6 @@ int ObTablet::auto_get_read_tables( bool allow_not_ready = succ_get_src_tables ? true : allow_no_ready_read; if (OB_FAIL(get_read_tables_(snapshot_version, iter.table_store_iter_, iter.table_store_iter_.table_store_handle_, allow_not_ready))) { LOG_WARN("failed to get read tables from table store", K(ret), K(*this)); - } else if (OB_UNLIKELY(succ_get_src_tables)) { - LOG_DEBUG("succ get read tables", K(iter), K(allow_not_ready), K(snapshot_version), K(tablet_meta_)); // TODO (wenjinyu.wjy) it will be deleted later } } return ret; diff --git a/src/storage/tablet/ob_tablet_binding_replay_executor.h b/src/storage/tablet/ob_tablet_binding_replay_executor.h index deef3a3985..d617936fed 100644 --- a/src/storage/tablet/ob_tablet_binding_replay_executor.h +++ b/src/storage/tablet/ob_tablet_binding_replay_executor.h @@ -34,7 +34,7 @@ public: const share::SCN &scn); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return false; } diff --git a/src/storage/tablet/ob_tablet_create_mds_helper.cpp b/src/storage/tablet/ob_tablet_create_mds_helper.cpp index f277127bb4..ca4c022c4a 100644 --- a/src/storage/tablet/ob_tablet_create_mds_helper.cpp +++ b/src/storage/tablet/ob_tablet_create_mds_helper.cpp @@ -49,7 +49,7 @@ public: const share::SCN &scn); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return true; } diff --git a/src/storage/tablet/ob_tablet_delete_replay_executor.h b/src/storage/tablet/ob_tablet_delete_replay_executor.h index 584fc6bfde..4bc4630975 100644 --- a/src/storage/tablet/ob_tablet_delete_replay_executor.h +++ b/src/storage/tablet/ob_tablet_delete_replay_executor.h @@ -47,7 +47,7 @@ public: int init(mds::BufferCtx &ctx, const share::SCN &scn); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return true; } diff --git a/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp b/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp index eff50db79a..4268701290 100644 --- a/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp +++ b/src/storage/tablet/ob_tablet_finish_transfer_mds_helper.cpp @@ -135,7 +135,7 @@ public: const share::ObTransferTabletInfo &tablet_info, mds::BufferCtx &buffer_ctx); protected: - virtual bool is_replay_update_user_data_() const override + virtual bool is_replay_update_tablet_status_() const override { return true; } @@ -571,7 +571,7 @@ public: const share::ObTransferTabletInfo &tablet_info, mds::BufferCtx &buffer_ctx); protected: - virtual bool is_replay_update_user_data_() const override + virtual bool is_replay_update_tablet_status_() const override { return true; } diff --git a/src/storage/tablet/ob_tablet_service_clog_replay_executor.h b/src/storage/tablet/ob_tablet_service_clog_replay_executor.h index 7ae9136391..523b213f69 100644 --- a/src/storage/tablet/ob_tablet_service_clog_replay_executor.h +++ b/src/storage/tablet/ob_tablet_service_clog_replay_executor.h @@ -41,7 +41,7 @@ public: K_(scn)); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return false; } diff --git a/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp b/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp index 7e358b473d..dc499614bc 100644 --- a/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp +++ b/src/storage/tablet/ob_tablet_start_transfer_mds_helper.cpp @@ -51,7 +51,7 @@ public: const share::ObTransferTabletInfo &tablet_info, mds::BufferCtx &buffer_ctx); protected: - virtual bool is_replay_update_user_data_() const override + virtual bool is_replay_update_tablet_status_() const override { return true; } @@ -569,7 +569,7 @@ public: mds::BufferCtx &user_ctx); protected: - bool is_replay_update_user_data_() const override + bool is_replay_update_tablet_status_() const override { return true; } diff --git a/unittest/logservice/test_tablet_replay_executor.cpp b/unittest/logservice/test_tablet_replay_executor.cpp index 89f90b84a1..e9fed0a37d 100644 --- a/unittest/logservice/test_tablet_replay_executor.cpp +++ b/unittest/logservice/test_tablet_replay_executor.cpp @@ -33,7 +33,7 @@ public: virtual void SetUp() override; virtual void TearDown() override; - virtual bool is_replay_update_user_data_() const override; + virtual bool is_replay_update_tablet_status_() const override; virtual int do_replay_(storage::ObTabletHandle &tablet_handle) override; virtual bool is_replay_update_mds_table_() const override; }; @@ -46,7 +46,7 @@ void TestTabletReplayexecutor::TearDown() { } -bool TestTabletReplayexecutor::is_replay_update_user_data_() const +bool TestTabletReplayexecutor::is_replay_update_tablet_status_() const { return false; }