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 be88e68e775 [feature](merge-cloud) Set rowset dir for cloud tablet
(#30632)
be88e68e775 is described below
commit be88e68e77597bd1f97c37ea7a35a59d17a3c65c
Author: walter <[email protected]>
AuthorDate: Wed Jan 31 19:13:30 2024 +0800
[feature](merge-cloud) Set rowset dir for cloud tablet (#30632)
---
be/src/cloud/cloud_rowset_builder.cpp | 1 +
be/src/cloud/cloud_tablet.cpp | 5 ++++-
be/src/olap/base_tablet.cpp | 4 ++++
be/src/olap/tablet.cpp | 3 ---
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/be/src/cloud/cloud_rowset_builder.cpp
b/be/src/cloud/cloud_rowset_builder.cpp
index bc8d257c046..74e65627746 100644
--- a/be/src/cloud/cloud_rowset_builder.cpp
+++ b/be/src/cloud/cloud_rowset_builder.cpp
@@ -61,6 +61,7 @@ Status CloudRowsetBuilder::init() {
context.partial_update_info = _partial_update_info;
// New loaded data is always written to latest shared storage
context.fs = _engine.latest_fs();
+ context.rowset_dir = _tablet->tablet_path();
_rowset_writer = DORIS_TRY(_tablet->create_rowset_writer(context, false));
// TODO(plat1ko):
diff --git a/be/src/cloud/cloud_tablet.cpp b/be/src/cloud/cloud_tablet.cpp
index 5b9a614c6e8..24c924fb6bc 100644
--- a/be/src/cloud/cloud_tablet.cpp
+++ b/be/src/cloud/cloud_tablet.cpp
@@ -28,6 +28,7 @@
#include "cloud/cloud_meta_mgr.h"
#include "cloud/cloud_storage_engine.h"
#include "io/cache/block/block_file_cache_factory.h"
+#include "olap/olap_define.h"
#include "olap/rowset/rowset.h"
#include "olap/rowset/rowset_factory.h"
#include "olap/rowset/rowset_writer.h"
@@ -37,7 +38,9 @@ namespace doris {
using namespace ErrorCode;
CloudTablet::CloudTablet(CloudStorageEngine& engine, TabletMetaSharedPtr
tablet_meta)
- : BaseTablet(std::move(tablet_meta)), _engine(engine) {}
+ : BaseTablet(std::move(tablet_meta)), _engine(engine) {
+ _tablet_path = remote_tablet_path(_tablet_meta->tablet_id());
+}
CloudTablet::~CloudTablet() = default;
diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp
index ec932b4282d..2e82740887d 100644
--- a/be/src/olap/base_tablet.cpp
+++ b/be/src/olap/base_tablet.cpp
@@ -136,6 +136,10 @@ BaseTablet::BaseTablet(TabletMetaSharedPtr tablet_meta) :
_tablet_meta(std::move
INT_COUNTER_METRIC_REGISTER(_metric_entity, flush_bytes);
INT_COUNTER_METRIC_REGISTER(_metric_entity, flush_finish_count);
+ // construct _timestamped_versioned_tracker from rs and stale rs meta
+
_timestamped_version_tracker.construct_versioned_tracker(_tablet_meta->all_rs_metas(),
+
_tablet_meta->all_stale_rs_metas());
+
// if !_tablet_meta->all_rs_metas()[0]->tablet_schema(),
// that mean the tablet_meta is still no upgrade to doris 1.2 versions.
// Before doris 1.2 version, rowset metas don't have tablet schema.
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index 27dfebdbe4e..4eac632f0f0 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -280,9 +280,6 @@ Tablet::Tablet(StorageEngine& engine, TabletMetaSharedPtr
tablet_meta, DataDir*
_tablet_path = fmt::format("{}/{}/{}/{}/{}", _data_dir->path(),
DATA_PREFIX,
_tablet_meta->shard_id(), tablet_id(),
schema_hash());
}
- // construct _timestamped_versioned_tracker from rs and stale rs meta
-
_timestamped_version_tracker.construct_versioned_tracker(_tablet_meta->all_rs_metas(),
-
_tablet_meta->all_stale_rs_metas());
}
bool Tablet::set_tablet_schema_into_rowset_meta() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
