database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Manage tablet by partition id (#1591)

Browse Source
This commit is contained in:
yiguolei
2019-08-07 20:54:50 +08:00
committed by lichaoyong
parent dc4a5e6c10
commit 41cbedf57d
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
be/src/olap/tablet.cpp
View File

@ -933,4 +933,8 @@ OLAPStatus Tablet::set_partition_id(int64_t partition_id) {
return _tablet_meta->set_partition_id(partition_id);
}
TabletInfo Tablet::get_tablet_info() {
return TabletInfo(tablet_id(), schema_hash(), tablet_uid());
}
} // namespace doris

2
be/src/olap/tablet.h
View File

@ -230,6 +230,8 @@ public:
return _tablet_meta->initial_end_rowset_id();
}
TabletInfo get_tablet_info();
private:
void _print_missed_versions(const std::vector<Version>& missed_versions) const;
OLAPStatus _check_added_rowset(const RowsetSharedPtr& rowset);

12
be/src/olap/tablet_manager.cpp
View File

@ -200,6 +200,10 @@ OLAPStatus TabletManager::_add_tablet_to_map(TTabletId tablet_id, SchemaHash sch
}
_tablet_map[tablet_id].table_arr.push_back(tablet);
_tablet_map[tablet_id].table_arr.sort(_sort_tablet_by_creation_time);
// add the tablet id to partition map
_partition_tablet_map[tablet->partition_id()].insert(tablet->get_tablet_info());
VLOG(3) << "add tablet to map successfully"
<< " tablet_id = " << tablet_id
<< " schema_hash = " << schema_hash;
@ -598,6 +602,10 @@ OLAPStatus TabletManager::drop_tablets_on_error_root_path(
it != _tablet_map[tablet_id].table_arr.end();) {
if ((*it)->equal(tablet_id, schema_hash)) {
it = _tablet_map[tablet_id].table_arr.erase(it);
_partition_tablet_map[(*it)->partition_id()].erase((*it)->get_tablet_info());
if (_partition_tablet_map[(*it)->partition_id()].empty()) {
_partition_tablet_map.erase((*it)->partition_id());
}
} else {
++it;
}
@ -1322,6 +1330,10 @@ OLAPStatus TabletManager::_drop_tablet_directly_unlocked(
it != _tablet_map[tablet_id].table_arr.end();) {
if ((*it)->equal(tablet_id, schema_hash)) {
TabletSharedPtr tablet = *it;
_partition_tablet_map[(*it)->partition_id()].erase((*it)->get_tablet_info());
if (_partition_tablet_map[(*it)->partition_id()].empty()) {
_partition_tablet_map.erase((*it)->partition_id());
}
it = _tablet_map[tablet_id].table_arr.erase(it);
if (!keep_files) {
// drop tablet will update tablet meta, should lock

4
be/src/olap/tablet_manager.h
View File

@ -196,8 +196,8 @@ private:
std::vector<TabletSharedPtr> _shutdown_tablets;
// a map from partition id to
std::map<int64_t, vector<TabletSharedPtr>> partition_tablet_map;
// map from partition id to tablet_id
std::map<int64_t, std::set<TabletInfo>> _partition_tablet_map;
DISALLOW_COPY_AND_ASSIGN(TabletManager);
};