Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion be/src/storage/tablet/tablet_meta.h
Original file line number Diff line number Diff line change
Expand Up @@ -842,7 +842,7 @@ inline size_t TabletMeta::version_count() const {
}

inline size_t TabletMeta::stale_version_count() const {
return _rs_metas.size();
return _stale_rs_metas.size();
}

inline TabletState TabletMeta::tablet_state() const {
Expand Down
55 changes: 55 additions & 0 deletions be/test/load/delta_writer/delta_writer_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <iostream>
#include <map>
#include <memory>
#include <mutex>
#include <string>
#include <utility>

Expand All @@ -53,6 +54,7 @@
#include "storage/olap_define.h"
#include "storage/options.h"
#include "storage/rowset/beta_rowset.h"
#include "storage/rowset/rowset_writer.h"
#include "storage/rowset_builder.h"
#include "storage/schema.h"
#include "storage/segment/segment.h"
Expand All @@ -62,6 +64,7 @@
#include "storage/tablet_info.h"
#include "storage/task/engine_publish_version_task.h"
#include "storage/txn/txn_manager.h"
#include "util/defer_op.h"

namespace doris {
class OlapMeta;
Expand Down Expand Up @@ -542,6 +545,58 @@ TEST_F(TestDeltaWriter, open) {
EXPECT_EQ(Status::OK(), res);
}

TEST_F(TestDeltaWriter, metadata_size_limit_without_stale_rowsets) {
RuntimeProfile profile("MetadataSizeLimit");
TCreateTabletReq request;
create_tablet_request(10007, 270068378, &request);
ASSERT_TRUE(engine_ref->create_tablet(request, &profile).ok());
auto tablet = engine_ref->tablet_manager()->get_tablet(request.tablet_id);
ASSERT_NE(nullptr, tablet);
ASSERT_FALSE(tablet->enable_unique_key_merge_on_write());

std::string serialized_meta;
{
std::unique_lock lock(tablet->get_header_lock());
tablet->tablet_meta()->serialize(&serialized_meta);
}
ASSERT_EQ(1, tablet->version_count());
ASSERT_GT(tablet->avg_rs_meta_serialize_size(), 0);

const auto original_limit = config::tablet_meta_serialize_size_limit;
Defer restore_limit(
[original_limit] { config::tablet_meta_serialize_size_limit = original_limit; });

WriteRequest write_req;
write_req.tablet_id = request.tablet_id;
write_req.schema_hash = request.tablet_schema.schema_hash;
write_req.partition_id = request.partition_id;
write_req.txn_id = 20007;
write_req.table_schema_param = std::make_shared<OlapTableSchemaParam>();

// A single active rowset must be counted once: reject below its size and allow equality.
config::tablet_meta_serialize_size_limit = tablet->avg_rs_meta_serialize_size() - 1;
{
RowsetBuilder builder(*engine_ref, write_req, &profile);
auto status = builder.init();
ASSERT_TRUE(status.is<ErrorCode::TOO_MANY_VERSION>()) << status;
ASSERT_NE(std::string::npos, status.to_string().find("meta serialize size")) << status;
}

config::tablet_meta_serialize_size_limit = tablet->avg_rs_meta_serialize_size();
{
RowsetBuilder builder(*engine_ref, write_req, &profile);
auto status = builder.init();
ASSERT_TRUE(status.ok()) << status;
ASSERT_TRUE(builder.rowset_writer()->flush().ok());
ASSERT_TRUE(builder.build_rowset().ok());
ASSERT_TRUE(builder.commit_txn().ok());
}

ASSERT_TRUE(engine_ref->tablet_manager()
->drop_tablet(request.tablet_id, request.replica_id, false)
.ok());
}

TEST_F(TestDeltaWriter, vec_write) {
std::unique_ptr<RuntimeProfile> profile;
profile = std::make_unique<RuntimeProfile>("CreateTablet");
Expand Down
29 changes: 29 additions & 0 deletions be/test/storage/tablet/tablet_meta_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,35 @@

namespace doris {

TEST(TabletMetaTest, ActiveAndStaleVersionCountsFollowCompactionLifecycle) {
TabletMeta tablet_meta;
EXPECT_EQ(0, tablet_meta.version_count());
EXPECT_EQ(0, tablet_meta.stale_version_count());

auto first = std::make_shared<RowsetMeta>();
auto second = std::make_shared<RowsetMeta>();
auto merged = std::make_shared<RowsetMeta>();
first->set_version(Version(1, 1));
second->set_version(Version(2, 2));
merged->set_version(Version(1, 2));
ASSERT_TRUE(tablet_meta.add_rs_meta(first).ok());
ASSERT_TRUE(tablet_meta.add_rs_meta(second).ok());
EXPECT_EQ(2, tablet_meta.version_count());
EXPECT_EQ(0, tablet_meta.stale_version_count());

tablet_meta.modify_rs_metas({merged}, {first, second});
EXPECT_EQ(1, tablet_meta.version_count());
EXPECT_EQ(2, tablet_meta.stale_version_count());

tablet_meta.delete_stale_rs_meta_by_version(Version(1, 1));
EXPECT_EQ(1, tablet_meta.version_count());
EXPECT_EQ(1, tablet_meta.stale_version_count());

tablet_meta.delete_stale_rs_meta_by_version(Version(2, 2));
EXPECT_EQ(1, tablet_meta.version_count());
EXPECT_EQ(0, tablet_meta.stale_version_count());
}

TEST(TabletMetaTest, SaveAndParse) {
std::string meta_path = "./be/test/storage/test_data/tablet_meta_test.hdr";

Expand Down
Loading