This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new edd77da43d4 [feature](merge-cloud) Remove deprecated `temporary` in
`CreateRowsetRequest` (#2766) (#31903)
edd77da43d4 is described below
commit edd77da43d49b74e14cb218250d6b72f9c0d6dee
Author: walter <[email protected]>
AuthorDate: Tue Mar 12 20:15:39 2024 +0800
[feature](merge-cloud) Remove deprecated `temporary` in
`CreateRowsetRequest` (#2766) (#31903)
Co-authored-by: plat1ko <[email protected]>
---
be/src/cloud/cloud_delete_task.cpp | 2 +-
be/src/cloud/cloud_delta_writer.cpp | 2 +-
be/src/cloud/cloud_meta_mgr.cpp | 10 ++-
be/src/cloud/cloud_meta_mgr.h | 4 +-
be/src/cloud/cloud_rowset_builder.cpp | 2 +-
be/src/cloud/cloud_schema_change_job.cpp | 4 +-
be/src/io/fs/local_file_writer.cpp | 2 +-
be/src/olap/compaction.cpp | 7 +-
cloud/src/meta-service/meta_service.cpp | 109 +++++++++----------------------
cloud/test/fdb_injection_test.cpp | 2 -
cloud/test/meta_service_http_test.cpp | 2 -
cloud/test/meta_service_job_test.cpp | 1 -
cloud/test/meta_service_test.cpp | 2 -
cloud/test/schema_kv_test.cpp | 2 -
14 files changed, 45 insertions(+), 106 deletions(-)
diff --git a/be/src/cloud/cloud_delete_task.cpp
b/be/src/cloud/cloud_delete_task.cpp
index 7895799f9be..825ead331ed 100644
--- a/be/src/cloud/cloud_delete_task.cpp
+++ b/be/src/cloud/cloud_delete_task.cpp
@@ -77,7 +77,7 @@ Status CloudDeleteTask::execute(CloudStorageEngine& engine,
const TPushReq& requ
RETURN_IF_ERROR(rowset_writer->build(rowset));
rowset->rowset_meta()->set_delete_predicate(std::move(del_pred));
- auto st = engine.meta_mgr().commit_rowset(*rowset->rowset_meta(), true);
+ auto st = engine.meta_mgr().commit_rowset(*rowset->rowset_meta());
// Update tablet stats
tablet->fetch_add_approximate_num_rowsets(1);
diff --git a/be/src/cloud/cloud_delta_writer.cpp
b/be/src/cloud/cloud_delta_writer.cpp
index f0b148448f7..1d5bf0b1739 100644
--- a/be/src/cloud/cloud_delta_writer.cpp
+++ b/be/src/cloud/cloud_delta_writer.cpp
@@ -111,7 +111,7 @@ Status CloudDeltaWriter::commit_rowset() {
RETURN_IF_ERROR(_rowset_builder->init());
RETURN_IF_ERROR(_rowset_builder->build_rowset());
}
- return _engine.meta_mgr().commit_rowset(*rowset_meta(), true);
+ return _engine.meta_mgr().commit_rowset(*rowset_meta());
}
Status CloudDeltaWriter::set_txn_related_delete_bitmap() {
diff --git a/be/src/cloud/cloud_meta_mgr.cpp b/be/src/cloud/cloud_meta_mgr.cpp
index a5a952ca5d2..99c092e4340 100644
--- a/be/src/cloud/cloud_meta_mgr.cpp
+++ b/be/src/cloud/cloud_meta_mgr.cpp
@@ -618,15 +618,14 @@ Status CloudMetaMgr::sync_tablet_delete_bitmap(
return Status::OK();
}
-Status CloudMetaMgr::prepare_rowset(const RowsetMeta& rs_meta, bool is_tmp,
+Status CloudMetaMgr::prepare_rowset(const RowsetMeta& rs_meta,
RowsetMetaSharedPtr* existed_rs_meta) {
VLOG_DEBUG << "prepare rowset, tablet_id: " << rs_meta.tablet_id()
- << ", rowset_id: " << rs_meta.rowset_id() << ", is_tmp: " <<
is_tmp;
+ << ", rowset_id: " << rs_meta.rowset_id();
CreateRowsetRequest req;
CreateRowsetResponse resp;
req.set_cloud_unique_id(config::cloud_unique_id);
- req.set_temporary(is_tmp);
RowsetMetaPB doris_rs_meta = rs_meta.get_rowset_pb(/*skip_schema=*/true);
doris_rowset_meta_to_cloud(req.mutable_rowset_meta(),
std::move(doris_rs_meta));
@@ -644,14 +643,13 @@ Status CloudMetaMgr::prepare_rowset(const RowsetMeta&
rs_meta, bool is_tmp,
return st;
}
-Status CloudMetaMgr::commit_rowset(const RowsetMeta& rs_meta, bool is_tmp,
+Status CloudMetaMgr::commit_rowset(const RowsetMeta& rs_meta,
RowsetMetaSharedPtr* existed_rs_meta) {
VLOG_DEBUG << "commit rowset, tablet_id: " << rs_meta.tablet_id()
- << ", rowset_id: " << rs_meta.rowset_id() << ", is_tmp: " <<
is_tmp;
+ << ", rowset_id: " << rs_meta.rowset_id();
CreateRowsetRequest req;
CreateRowsetResponse resp;
req.set_cloud_unique_id(config::cloud_unique_id);
- req.set_temporary(is_tmp);
RowsetMetaPB rs_meta_pb = rs_meta.get_rowset_pb();
doris_rowset_meta_to_cloud(req.mutable_rowset_meta(),
std::move(rs_meta_pb));
diff --git a/be/src/cloud/cloud_meta_mgr.h b/be/src/cloud/cloud_meta_mgr.h
index e0fdc85b167..53220fd7fe1 100644
--- a/be/src/cloud/cloud_meta_mgr.h
+++ b/be/src/cloud/cloud_meta_mgr.h
@@ -56,10 +56,10 @@ public:
Status sync_tablet_rowsets(CloudTablet* tablet, bool warmup_delta_data =
false);
- Status prepare_rowset(const RowsetMeta& rs_meta, bool is_tmp,
+ Status prepare_rowset(const RowsetMeta& rs_meta,
std::shared_ptr<RowsetMeta>* existed_rs_meta =
nullptr);
- Status commit_rowset(const RowsetMeta& rs_meta, bool is_tmp,
+ Status commit_rowset(const RowsetMeta& rs_meta,
std::shared_ptr<RowsetMeta>* existed_rs_meta =
nullptr);
Status update_tmp_rowset(const RowsetMeta& rs_meta);
diff --git a/be/src/cloud/cloud_rowset_builder.cpp
b/be/src/cloud/cloud_rowset_builder.cpp
index 3849cdee2c0..547160b6abd 100644
--- a/be/src/cloud/cloud_rowset_builder.cpp
+++ b/be/src/cloud/cloud_rowset_builder.cpp
@@ -76,7 +76,7 @@ Status CloudRowsetBuilder::init() {
_calc_delete_bitmap_token =
_engine.calc_delete_bitmap_executor()->create_token();
-
RETURN_IF_ERROR(_engine.meta_mgr().prepare_rowset(*_rowset_writer->rowset_meta(),
true));
+
RETURN_IF_ERROR(_engine.meta_mgr().prepare_rowset(*_rowset_writer->rowset_meta()));
_is_init = true;
return Status::OK();
diff --git a/be/src/cloud/cloud_schema_change_job.cpp
b/be/src/cloud/cloud_schema_change_job.cpp
index cd7e0744324..a768ad4756e 100644
--- a/be/src/cloud/cloud_schema_change_job.cpp
+++ b/be/src/cloud/cloud_schema_change_job.cpp
@@ -254,7 +254,7 @@ Status
CloudSchemaChangeJob::_convert_historical_rowsets(const SchemaChangeParam
RowsetMetaSharedPtr existed_rs_meta;
auto st =
_cloud_storage_engine.meta_mgr().prepare_rowset(*rowset_writer->rowset_meta(),
- true,
&existed_rs_meta);
+
&existed_rs_meta);
if (!st.ok()) {
if (st.is<ALREADY_EXIST>()) {
LOG(INFO) << "Rowset " << rs_reader->version() << " has
already existed in tablet "
@@ -285,7 +285,7 @@ Status
CloudSchemaChangeJob::_convert_historical_rowsets(const SchemaChangeParam
st.to_string());
}
- st =
_cloud_storage_engine.meta_mgr().commit_rowset(*rowset_writer->rowset_meta(),
true,
+ st =
_cloud_storage_engine.meta_mgr().commit_rowset(*rowset_writer->rowset_meta(),
&existed_rs_meta);
if (!st.ok()) {
if (st.is<ALREADY_EXIST>()) {
diff --git a/be/src/io/fs/local_file_writer.cpp
b/be/src/io/fs/local_file_writer.cpp
index 78ea87cf3f2..dffeff6b1d7 100644
--- a/be/src/io/fs/local_file_writer.cpp
+++ b/be/src/io/fs/local_file_writer.cpp
@@ -106,7 +106,7 @@ void LocalFileWriter::_abort() {
Status LocalFileWriter::appendv(const Slice* data, size_t data_cnt) {
if (_closed) [[unlikely]] {
- return Status::InternalError("append to closed file: ",
_path.native());
+ return Status::InternalError("append to closed file: {}",
_path.native());
}
_dirty = true;
diff --git a/be/src/olap/compaction.cpp b/be/src/olap/compaction.cpp
index 619120fac5f..637d67812cf 100644
--- a/be/src/olap/compaction.cpp
+++ b/be/src/olap/compaction.cpp
@@ -181,7 +181,7 @@ Status Compaction::merge_input_rowsets() {
fmt::format("rowset writer build failed.
output_version: {}",
_output_version.to_string()));
-
//RETURN_IF_ERROR(_engine.meta_mgr().commit_rowset(*_output_rowset->rowset_meta().get(),
true));
+
//RETURN_IF_ERROR(_engine.meta_mgr().commit_rowset(*_output_rowset->rowset_meta().get()));
// Now we support delete in cumu compaction, to make all data in rowsets
whose version
// is below output_version to be delete in the future base compaction, we
should carry
@@ -885,7 +885,7 @@ Status CloudCompactionMixin::execute_compact_impl(int64_t
permits) {
RETURN_IF_ERROR(merge_input_rowsets());
-
RETURN_IF_ERROR(_engine.meta_mgr().commit_rowset(*_output_rowset->rowset_meta().get(),
true));
+
RETURN_IF_ERROR(_engine.meta_mgr().commit_rowset(*_output_rowset->rowset_meta().get()));
// 4. modify rowsets in memory
RETURN_IF_ERROR(modify_rowsets());
@@ -922,8 +922,7 @@ Status
CloudCompactionMixin::construct_output_rowset_writer(RowsetWriterContext&
ctx.newest_write_timestamp = _newest_write_timestamp;
ctx.write_type = DataWriteType::TYPE_COMPACTION;
_output_rs_writer = DORIS_TRY(_tablet->create_rowset_writer(ctx,
_is_vertical));
- RETURN_IF_ERROR(
-
_engine.meta_mgr().prepare_rowset(*_output_rs_writer->rowset_meta().get(),
true));
+
RETURN_IF_ERROR(_engine.meta_mgr().prepare_rowset(*_output_rs_writer->rowset_meta().get()));
return Status::OK();
}
diff --git a/cloud/src/meta-service/meta_service.cpp
b/cloud/src/meta-service/meta_service.cpp
index 2a6b1447124..7e8ac19b7af 100644
--- a/cloud/src/meta-service/meta_service.cpp
+++ b/cloud/src/meta-service/meta_service.cpp
@@ -771,10 +771,7 @@ static void set_schema_in_existed_rowset(MetaServiceCode&
code, std::string& msg
}
/**
- * 0. Construct the corresponding rowset commit_key according to the info in
request
- * 1. Check whether this rowset has already been committed through commit_key
- * a. if has been committed, abort prepare_rowset
- * b. else, goto 2
+ * 1. Check and confirm tmp rowset kv does not exist
* 2. Construct recycle rowset kv which contains object path
* 3. Put recycle rowset kv
*/
@@ -801,26 +798,12 @@ void
MetaServiceImpl::prepare_rowset(::google::protobuf::RpcController* controll
msg = "rowset_meta must have either schema or schema_version";
return;
}
+
RPC_RATE_LIMIT(prepare_rowset)
- // temporary == true is for load txn, schema change, compaction
- // temporary == false currently no such situation
- bool temporary = request->has_temporary() ? request->temporary() : false;
+
int64_t tablet_id = rowset_meta.tablet_id();
- int64_t end_version = rowset_meta.end_version();
const auto& rowset_id = rowset_meta.rowset_id_v2();
-
- std::string commit_key;
- std::string commit_val;
-
- if (temporary) { // load txn, schema change, compaction
- int64_t txn_id = rowset_meta.txn_id();
- MetaRowsetTmpKeyInfo key_info {instance_id, txn_id, tablet_id};
- meta_rowset_tmp_key(key_info, &commit_key);
- } else { // ?
- MetaRowsetKeyInfo key_info {instance_id, tablet_id, end_version};
- meta_rowset_key(key_info, &commit_key);
- }
-
+ auto tmp_rs_key = meta_rowset_tmp_key({instance_id, rowset_meta.txn_id(),
tablet_id});
std::unique_ptr<Transaction> txn;
TxnErrorCode err = txn_kv_->create_txn(&txn);
if (err != TxnErrorCode::TXN_OK) {
@@ -830,12 +813,13 @@ void
MetaServiceImpl::prepare_rowset(::google::protobuf::RpcController* controll
}
// Check if commit key already exists.
- err = txn->get(commit_key, &commit_val);
+ std::string val;
+ err = txn->get(tmp_rs_key, &val);
if (err == TxnErrorCode::TXN_OK) {
auto existed_rowset_meta = response->mutable_existed_rowset_meta();
- if (!existed_rowset_meta->ParseFromString(commit_val)) {
+ if (!existed_rowset_meta->ParseFromString(val)) {
code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- msg = fmt::format("malformed rowset meta value. key={}",
hex(commit_key));
+ msg = fmt::format("malformed rowset meta value. key={}",
hex(tmp_rs_key));
return;
}
if (!existed_rowset_meta->has_index_id()) {
@@ -843,8 +827,7 @@ void
MetaServiceImpl::prepare_rowset(::google::protobuf::RpcController* controll
existed_rowset_meta->set_index_id(rowset_meta.index_id());
} else {
TabletIndexPB tablet_idx;
- get_tablet_idx(code, msg, txn.get(), instance_id,
rowset_meta.tablet_id(),
- tablet_idx);
+ get_tablet_idx(code, msg, txn.get(), instance_id, tablet_id,
tablet_idx);
if (code != MetaServiceCode::OK) return;
existed_rowset_meta->set_index_id(tablet_idx.index_id());
rowset_meta.set_index_id(tablet_idx.index_id());
@@ -868,10 +851,7 @@ void
MetaServiceImpl::prepare_rowset(::google::protobuf::RpcController* controll
return;
}
- std::string prepare_key;
- std::string prepare_val;
- RecycleRowsetKeyInfo prepare_key_info {instance_id, tablet_id, rowset_id};
- recycle_rowset_key(prepare_key_info, &prepare_key);
+ auto prepare_rs_key = recycle_rowset_key({instance_id, tablet_id,
rowset_id});
RecycleRowsetPB prepare_rowset;
using namespace std::chrono;
int64_t now =
duration_cast<seconds>(system_clock::now().time_since_epoch()).count();
@@ -881,32 +861,26 @@ void
MetaServiceImpl::prepare_rowset(::google::protobuf::RpcController* controll
rowset_meta.set_allocated_tablet_schema(nullptr);
prepare_rowset.mutable_rowset_meta()->CopyFrom(rowset_meta);
prepare_rowset.set_type(RecycleRowsetPB::PREPARE);
- prepare_rowset.SerializeToString(&prepare_val);
+ prepare_rowset.SerializeToString(&val);
DCHECK_GT(prepare_rowset.expiration(), 0);
- txn->put(prepare_key, prepare_val);
- LOG(INFO) << "xxx put" << (temporary ? " tmp " : " ") <<
"prepare_rowset_key "
- << hex(prepare_key) << " associated commit_rowset_key " <<
hex(commit_key)
- << " value_size " << prepare_val.size();
+ txn->put(prepare_rs_key, val);
+ LOG(INFO) << "xxx put prepare_rs_key " << hex(prepare_rs_key) << "
value_size " << val.size();
err = txn->commit();
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
- ss << "failed to save recycle rowset, err=" << err;
- msg = ss.str();
+ msg = fmt::format("failed to save recycle rowset, err={}", err);
return;
}
}
/**
- * 0. Construct the corresponding rowset commit_key and commit_value according
- * to the info in request
- * 1. Check whether this rowset has already been committed through commit_key
- * a. if has been committed
- * 1. if committed value is same with commit_value, it may be a
redundant
+ * 1. Check and confirm tmp rowset kv does not exist
+ * a. if exist
+ * 1. if tmp rowset is same with self, it may be a redundant
* retry request, return ok
- * 2. else, abort commit_rowset
+ * 2. else, abort commit_rowset
* b. else, goto 2
- * 2. Construct the corresponding rowset prepare_key(recycle rowset)
- * 3. Remove prepare_key and put commit rowset kv
+ * 2. Remove recycle rowset kv and put tmp rowset kv
*/
void MetaServiceImpl::commit_rowset(::google::protobuf::RpcController*
controller,
const CreateRowsetRequest* request,
@@ -932,24 +906,11 @@ void
MetaServiceImpl::commit_rowset(::google::protobuf::RpcController* controlle
return;
}
RPC_RATE_LIMIT(commit_rowset)
- // temporary == true is for load txn, schema change, compaction
- // temporary == false currently no such situation
- bool temporary = request->has_temporary() ? request->temporary() : false;
+
int64_t tablet_id = rowset_meta.tablet_id();
- int64_t end_version = rowset_meta.end_version();
const auto& rowset_id = rowset_meta.rowset_id_v2();
- std::string commit_key;
- std::string commit_val;
-
- if (temporary) { // load txn, schema change, compaction
- int64_t txn_id = rowset_meta.txn_id();
- MetaRowsetTmpKeyInfo key_info {instance_id, txn_id, tablet_id};
- meta_rowset_tmp_key(key_info, &commit_key);
- } else { // ?
- MetaRowsetKeyInfo key_info {instance_id, tablet_id, end_version};
- meta_rowset_key(key_info, &commit_key);
- }
+ auto tmp_rs_key = meta_rowset_tmp_key({instance_id, rowset_meta.txn_id(),
tablet_id});
std::unique_ptr<Transaction> txn;
TxnErrorCode err = txn_kv_->create_txn(&txn);
@@ -961,12 +922,12 @@ void
MetaServiceImpl::commit_rowset(::google::protobuf::RpcController* controlle
// Check if commit key already exists.
std::string existed_commit_val;
- err = txn->get(commit_key, &existed_commit_val);
+ err = txn->get(tmp_rs_key, &existed_commit_val);
if (err == TxnErrorCode::TXN_OK) {
auto existed_rowset_meta = response->mutable_existed_rowset_meta();
if (!existed_rowset_meta->ParseFromString(existed_commit_val)) {
code = MetaServiceCode::PROTOBUF_PARSE_ERR;
- msg = fmt::format("malformed rowset meta value. key={}",
hex(commit_key));
+ msg = fmt::format("malformed rowset meta value. key={}",
hex(tmp_rs_key));
return;
}
if (existed_rowset_meta->rowset_id_v2() == rowset_meta.rowset_id_v2())
{
@@ -1027,21 +988,14 @@ void
MetaServiceImpl::commit_rowset(::google::protobuf::RpcController* controlle
rowset_meta.set_allocated_tablet_schema(nullptr);
}
- std::string prepare_key;
- RecycleRowsetKeyInfo prepare_key_info {instance_id, tablet_id, rowset_id};
- recycle_rowset_key(prepare_key_info, &prepare_key);
- DCHECK_GT(rowset_meta.txn_expiration(), 0);
- if (!rowset_meta.SerializeToString(&commit_val)) {
- code = MetaServiceCode::PROTOBUF_SERIALIZE_ERR;
- msg = "failed to serialize rowset meta";
- return;
- }
+ auto recycle_rs_key = recycle_rowset_key({instance_id, tablet_id,
rowset_id});
+ txn->remove(recycle_rs_key);
- txn->remove(prepare_key);
- txn->put(commit_key, commit_val);
- LOG(INFO) << "xxx put" << (temporary ? " tmp " : " ") <<
"commit_rowset_key " << hex(commit_key)
- << " delete prepare_rowset_key " << hex(prepare_key) << "
value_size "
- << commit_val.size();
+ DCHECK_GT(rowset_meta.txn_expiration(), 0);
+ auto tmp_rs_val = rowset_meta.SerializeAsString();
+ txn->put(tmp_rs_key, tmp_rs_val);
+ LOG(INFO) << "xxx put tmp_rs_key " << hex(tmp_rs_key) << " delete
recycle_rs_key "
+ << hex(recycle_rs_key) << " value_size " << tmp_rs_val.size();
err = txn->commit();
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
@@ -1342,9 +1296,6 @@ void
MetaServiceImpl::get_rowset(::google::protobuf::RpcController* controller,
int64_t req_end = request->end_version();
req_end = req_end < 0 ? std::numeric_limits<int64_t>::max() - 1 : req_end;
- LOG(INFO) << "req_bc_cnt=" << req_bc_cnt << ", bc_cnt=" << bc_cnt
- << ", req_cc_cnt=" << req_cc_cnt << ", cc_cnt=" << cc_cnt << ",
req_cp=" << req_cp
- << ", cp=" << cp;
//==========================================================================
// Find version ranges to be synchronized due to compaction
//==========================================================================
diff --git a/cloud/test/fdb_injection_test.cpp
b/cloud/test/fdb_injection_test.cpp
index c59a302d347..e8fb68f8e6e 100644
--- a/cloud/test/fdb_injection_test.cpp
+++ b/cloud/test/fdb_injection_test.cpp
@@ -473,7 +473,6 @@ static Status prepare_rowset(MetaService* service, const
std::string& instance_i
cloud::CreateRowsetRequest req;
cloud::CreateRowsetResponse resp;
req.set_cloud_unique_id(cloud_unique_id(instance_id));
- req.set_temporary(true);
req.mutable_rowset_meta()->CopyFrom(
create_rowset(tablet_id, rowset_id, txn_id, index_id,
partition_id));
@@ -501,7 +500,6 @@ static Status commit_rowset(MetaService* service, const
std::string& instance_id
cloud::CreateRowsetRequest req;
cloud::CreateRowsetResponse resp;
req.set_cloud_unique_id(cloud_unique_id(instance_id));
- req.set_temporary(true);
req.mutable_rowset_meta()->CopyFrom(
create_rowset(tablet_id, rowset_id, txn_id, index_id,
partition_id));
LOG_INFO("send commit rowset request");
diff --git a/cloud/test/meta_service_http_test.cpp
b/cloud/test/meta_service_http_test.cpp
index 9f5f2274c7d..4e982685e7f 100644
--- a/cloud/test/meta_service_http_test.cpp
+++ b/cloud/test/meta_service_http_test.cpp
@@ -326,7 +326,6 @@ static void prepare_rowset(MetaService* meta_service, const
doris::RowsetMetaClo
brpc::Controller cntl;
auto arena = res.GetArena();
auto req =
google::protobuf::Arena::CreateMessage<CreateRowsetRequest>(arena);
- req->set_temporary(true);
req->mutable_rowset_meta()->CopyFrom(rowset);
meta_service->prepare_rowset(&cntl, req, &res, nullptr);
if (!arena) delete req;
@@ -337,7 +336,6 @@ static void commit_rowset(MetaService* meta_service, const
doris::RowsetMetaClou
brpc::Controller cntl;
auto arena = res.GetArena();
auto req =
google::protobuf::Arena::CreateMessage<CreateRowsetRequest>(arena);
- req->set_temporary(true);
req->mutable_rowset_meta()->CopyFrom(rowset);
meta_service->commit_rowset(&cntl, req, &res, nullptr);
if (!arena) delete req;
diff --git a/cloud/test/meta_service_job_test.cpp
b/cloud/test/meta_service_job_test.cpp
index 2d8f973eaff..11e1b93f3eb 100644
--- a/cloud/test/meta_service_job_test.cpp
+++ b/cloud/test/meta_service_job_test.cpp
@@ -99,7 +99,6 @@ void commit_rowset(MetaService* meta_service, const
doris::RowsetMetaCloudPB& ro
CreateRowsetResponse& res) {
brpc::Controller cntl;
CreateRowsetRequest req;
- req.set_temporary(true);
req.mutable_rowset_meta()->CopyFrom(rowset);
meta_service->commit_rowset(&cntl, &req, &res, nullptr);
}
diff --git a/cloud/test/meta_service_test.cpp b/cloud/test/meta_service_test.cpp
index c58e74fd46b..b7d36e87904 100644
--- a/cloud/test/meta_service_test.cpp
+++ b/cloud/test/meta_service_test.cpp
@@ -183,7 +183,6 @@ static void prepare_rowset(MetaServiceProxy* meta_service,
const doris::RowsetMe
brpc::Controller cntl;
auto arena = res.GetArena();
auto req =
google::protobuf::Arena::CreateMessage<CreateRowsetRequest>(arena);
- req->set_temporary(true);
req->mutable_rowset_meta()->CopyFrom(rowset);
meta_service->prepare_rowset(&cntl, req, &res, nullptr);
if (!arena) delete req;
@@ -194,7 +193,6 @@ static void commit_rowset(MetaServiceProxy* meta_service,
const doris::RowsetMet
brpc::Controller cntl;
auto arena = res.GetArena();
auto req =
google::protobuf::Arena::CreateMessage<CreateRowsetRequest>(arena);
- req->set_temporary(true);
req->mutable_rowset_meta()->CopyFrom(rowset);
meta_service->commit_rowset(&cntl, req, &res, nullptr);
if (!arena) delete req;
diff --git a/cloud/test/schema_kv_test.cpp b/cloud/test/schema_kv_test.cpp
index 65e51f67e07..8fc03b951ce 100644
--- a/cloud/test/schema_kv_test.cpp
+++ b/cloud/test/schema_kv_test.cpp
@@ -303,7 +303,6 @@ static void prepare_rowset(MetaServiceProxy* meta_service,
const doris::RowsetMe
brpc::Controller cntl;
auto arena = res.GetArena();
auto req =
google::protobuf::Arena::CreateMessage<CreateRowsetRequest>(arena);
- req->set_temporary(true);
req->mutable_rowset_meta()->CopyFrom(rowset);
meta_service->prepare_rowset(&cntl, req, &res, nullptr);
if (!arena) delete req;
@@ -314,7 +313,6 @@ static void commit_rowset(MetaServiceProxy* meta_service,
const doris::RowsetMet
brpc::Controller cntl;
auto arena = res.GetArena();
auto req =
google::protobuf::Arena::CreateMessage<CreateRowsetRequest>(arena);
- req->set_temporary(true);
req->mutable_rowset_meta()->CopyFrom(rowset);
meta_service->commit_rowset(&cntl, req, &res, nullptr);
if (!arena) delete req;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
