diff --git a/be/src/olap/olap_common.h b/be/src/olap/olap_common.h index a83e6a6df63e1a..cd7d3961871ced 100644 --- a/be/src/olap/olap_common.h +++ b/be/src/olap/olap_common.h @@ -420,8 +420,6 @@ using ColumnId = uint32_t; using UniqueIdSet = std::set; // Column unique Id -> column id map using UniqueIdToColumnIdMap = std::map; -struct RowsetId; -RowsetId next_rowset_id(); // 8 bit rowset id version // 56 bit, inc number from 1 @@ -442,7 +440,7 @@ struct RowsetId { if (ec != std::errc {}) [[unlikely]] { if (config::force_regenerate_rowsetid_on_start_error) { LOG(WARNING) << "failed to init rowset id: " << rowset_id_str; - high = next_rowset_id().hi; + high = MAX_ROWSET_ID - 1; } else { throw Exception( Status::FatalError("failed to init rowset id: {}", rowset_id_str)); diff --git a/be/src/olap/rowset/unique_rowset_id_generator.cpp b/be/src/olap/rowset/unique_rowset_id_generator.cpp index 49e07e5835957a..0ac7f63837a099 100644 --- a/be/src/olap/rowset/unique_rowset_id_generator.cpp +++ b/be/src/olap/rowset/unique_rowset_id_generator.cpp @@ -17,17 +17,8 @@ #include "olap/rowset/unique_rowset_id_generator.h" -#include - -#include "olap/storage_engine.h" -#include "runtime/exec_env.h" - namespace doris { -RowsetId next_rowset_id() { - return ExecEnv::GetInstance()->storage_engine().next_rowset_id(); -} - UniqueRowsetIdGenerator::UniqueRowsetIdGenerator(const UniqueId& backend_uid) : _backend_uid(backend_uid), _inc_id(1) {} diff --git a/be/test/olap/rowset/rowset_meta_test.cpp b/be/test/olap/rowset/rowset_meta_test.cpp index 881ce383810e3c..cb1b2865c1440e 100644 --- a/be/test/olap/rowset/rowset_meta_test.cpp +++ b/be/test/olap/rowset/rowset_meta_test.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -113,4 +114,13 @@ TEST_F(RowsetMetaTest, TestInitWithInvalidData) { EXPECT_FALSE(rowset_meta.init("invalid pb meta data")); } +TEST_F(RowsetMetaTest, TestRowsetIdInit) { + RowsetId id {}; + config::force_regenerate_rowsetid_on_start_error = true; + std::string_view rowset_id_str = "test"; + id.init(rowset_id_str); + // 0x100000000000000 - 0x01 + EXPECT_EQ(id.to_string(), "72057594037927935"); +} + } // namespace doris