Skip to content

Make SnapshotManager compiled successfully #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaoyli merged 1 commit into from
Jan 7, 2019
Merged

Make SnapshotManager compiled successfully #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/olap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ add_library(Olap STATIC
serialize.cpp
storage_engine.cpp
data_dir.cpp
#snapshot_manager.cpp
snapshot_manager.cpp
stream_index_common.cpp
stream_index_reader.cpp
stream_index_writer.cpp
Expand Down
6 changes: 3 additions & 3 deletions be/src/olap/snapshot_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ OLAPStatus SnapshotManager::storage_medium_migrate(
}

// judge case when no need to migrate
uint32_t count = available_storage_medium_type_count();
uint32_t count = StorageEngine::get_instance()->available_storage_medium_type_count();
if (count <= 1) {
LOG(INFO) << "available storage medium type count is less than 1, "
<< "no need to migrate. count=" << count;
Expand Down Expand Up @@ -700,7 +700,7 @@ OLAPStatus SnapshotManager::storage_medium_migrate(
tablet->release_header_lock();

// generate schema hash path where files will be migrated
auto stores = get_stores_for_create_tablet(storage_medium);
auto stores = StorageEngine::get_instance()->get_stores_for_create_tablet(storage_medium);
if (stores.empty()) {
res = OLAP_ERR_INVALID_ROOT_PATH;
OLAP_LOG_WARNING("fail to get root path for create tablet.");
Expand Down Expand Up @@ -750,7 +750,7 @@ OLAPStatus SnapshotManager::storage_medium_migrate(
res = OLAP_ERR_TABLE_CREATE_FROM_HEADER_ERROR;
break;
}
res = _tablet_mgr.add_tablet(tablet_id, schema_hash, tablet, false);
res = TabletManager::instance()->add_tablet(tablet_id, schema_hash, tablet, false);
if (res != OLAP_SUCCESS) {
OLAP_LOG_WARNING("fail to add tablet to StorageEngine. [res=%d]", res);
break;
Expand Down
1 change: 0 additions & 1 deletion be/src/olap/tablet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ class Tablet : public std::enable_shared_from_this<Tablet> {
OLAPStatus _unprotect_clear_schema_change_info(AlterTabletType* alter_tablet_type,
bool only_one,
bool check_only);
public:
DataDir* _data_dir;
TabletState _state;
RowsetGraph* _rs_graph;
Expand Down