placeholder for newly add with_cs_replica_ filed in ddl start log and redo info, for column store replica feature

This commit is contained in:
Tsunaou
2024-07-29 04:13:02 +00:00
committed by ob-robot
parent ba05a9378e
commit bd2c509291
5 changed files with 14 additions and 6 deletions

View File

@ -397,7 +397,7 @@ DEFINE_GET_SERIALIZE_SIZE(ObDDLClogHeader)
ObDDLStartLog::ObDDLStartLog()
: table_key_(), data_format_version_(0), execution_id_(-1), direct_load_type_(ObDirectLoadType::DIRECT_LOAD_DDL) /*for compatibility*/,
lob_meta_tablet_id_(ObDDLClog::COMPATIBLE_LOB_META_TABLET_ID)
lob_meta_tablet_id_(ObDDLClog::COMPATIBLE_LOB_META_TABLET_ID), with_cs_replica_(false)
{
}
@ -419,11 +419,12 @@ int ObDDLStartLog::init(
execution_id_ = execution_id;
direct_load_type_ = direct_load_type;
lob_meta_tablet_id_ = lob_meta_tablet_id;
with_cs_replica_ = false; // TODO(chengkong): placeholder for column store replica feature
}
return ret;
}
OB_SERIALIZE_MEMBER(ObDDLStartLog, table_key_, data_format_version_, execution_id_, direct_load_type_, lob_meta_tablet_id_);
OB_SERIALIZE_MEMBER(ObDDLStartLog, table_key_, data_format_version_, execution_id_, direct_load_type_, lob_meta_tablet_id_, with_cs_replica_);
ObDDLRedoLog::ObDDLRedoLog()
: redo_info_()

View File

@ -203,13 +203,14 @@ public:
int64_t get_execution_id() const { return execution_id_; }
ObDirectLoadType get_direct_load_type() const { return direct_load_type_; }
const ObTabletID &get_lob_meta_tablet_id() const { return lob_meta_tablet_id_; }
TO_STRING_KV(K_(table_key), K_(data_format_version), K_(execution_id), K_(direct_load_type), K_(lob_meta_tablet_id));
TO_STRING_KV(K_(table_key), K_(data_format_version), K_(execution_id), K_(direct_load_type), K_(lob_meta_tablet_id), K_(with_cs_replica));
private:
ObITable::TableKey table_key_; // use table type to distinguish column store, column group id is valid
uint64_t data_format_version_; // used for compatibility
int64_t execution_id_;
ObDirectLoadType direct_load_type_;
ObTabletID lob_meta_tablet_id_; // avoid replay get newest mds data
bool with_cs_replica_;
};
class ObDDLRedoLog final

View File

@ -738,6 +738,7 @@ int ObDDLIncRedoLogWriterCallback::write(
redo_info_.data_format_version_ = data_format_version_;
redo_info_.type_ = direct_load_type_;
redo_info_.trans_id_ = trans_id_;
redo_info_.with_cs_replica_ = false; // TODO(chengkong): placeholder for column store replica feature
if (OB_FAIL(ddl_inc_writer_.write_inc_redo_log_with_retry(redo_info_, macro_block_id_, task_id_, tx_desc_))) {
LOG_WARN("write ddl inc redo log fail", K(ret));
}

View File

@ -321,7 +321,8 @@ ObDDLMacroBlockRedoInfo::ObDDLMacroBlockRedoInfo()
data_format_version_(0/*for compatibility*/),
end_row_id_(-1),
type_(ObDirectLoadType::DIRECT_LOAD_INVALID),
trans_id_()
trans_id_(),
with_cs_replica_(false)
{
}
@ -336,6 +337,7 @@ void ObDDLMacroBlockRedoInfo::reset()
end_row_id_ = -1;
type_ = ObDirectLoadType::DIRECT_LOAD_INVALID;
trans_id_.reset();
with_cs_replica_ = false;
}
bool ObDDLMacroBlockRedoInfo::is_valid() const
@ -360,7 +362,8 @@ OB_SERIALIZE_MEMBER(ObDDLMacroBlockRedoInfo,
data_format_version_,
end_row_id_,
type_,
trans_id_);
trans_id_,
with_cs_replica_);
ObTabletDirectLoadMgrHandle::ObTabletDirectLoadMgrHandle()
: tablet_mgr_(nullptr)

View File

@ -185,7 +185,8 @@ public:
K_(data_format_version),
K_(end_row_id),
K_(type),
K_(trans_id));
K_(trans_id),
K_(with_cs_replica));
public:
storage::ObITable::TableKey table_key_;
ObString data_buffer_;
@ -196,6 +197,7 @@ public:
int64_t end_row_id_;
storage::ObDirectLoadType type_;
transaction::ObTransID trans_id_; // for incremental direct load only
bool with_cs_replica_;
};
class ObTabletDirectLoadMgr;