killxdcj commented on a change in pull request #5831:
URL: https://github.com/apache/incubator-doris/pull/5831#discussion_r641357651
##########
File path: be/src/olap/version_graph.cpp
##########
@@ -537,95 +560,58 @@ OLAPStatus
VersionGraph::capture_consistent_versions(const Version& spec_version
return OLAP_ERR_INPUT_PARAMETER_ERROR;
}
- // bfs_queue's element is vertex_index.
- std::queue<int64_t> bfs_queue;
- // predecessor[i] means the predecessor of vertex_index 'i'.
- std::vector<int64_t> predecessor(_version_graph.size());
- // visited[int64_t]==true means it had entered bfs_queue.
- std::vector<bool> visited(_version_graph.size());
- // [start_vertex_value, end_vertex_value)
- int64_t start_vertex_value = spec_version.first;
- int64_t end_vertex_value = spec_version.second + 1;
- // -1 is invalid vertex index.
- int64_t start_vertex_index = -1;
- // -1 is valid vertex index.
- int64_t end_vertex_index = -1;
-
- for (size_t i = 0; i < _version_graph.size(); ++i) {
- if (_version_graph[i].value == start_vertex_value) {
- start_vertex_index = i;
- }
- if (_version_graph[i].value == end_vertex_value) {
- end_vertex_index = i;
+ int64_t cur_idx = -1;
+ for (size_t i = 0; i < _version_graph.size(); i++) {
+ if (_version_graph[i].value == spec_version.first) {
+ cur_idx = i;
+ break;
}
}
- if (start_vertex_index < 0 || end_vertex_index < 0) {
- LOG(WARNING) << "fail to find path in version_graph. "
+ if (cur_idx < 0) {
+ LOG(WARNING) << "failed to find path in version_graph. "
<< "spec_version: " << spec_version.first << "-" <<
spec_version.second;
return OLAP_ERR_VERSION_NOT_EXIST;
}
- for (size_t i = 0; i < _version_graph.size(); ++i) {
- visited[i] = false;
- }
-
- bfs_queue.push(start_vertex_index);
- visited[start_vertex_index] = true;
- // The predecessor of root is itself.
- predecessor[start_vertex_index] = start_vertex_index;
-
- while (bfs_queue.empty() == false && visited[end_vertex_index] == false) {
- int64_t top_vertex_index = bfs_queue.front();
- bfs_queue.pop();
- for (const auto& it : _version_graph[top_vertex_index].edges) {
- if (visited[it] == false) {
- // If we don't support reverse version in the path, and start
vertex
- // value is larger than the end vertex value, we skip this
edge.
- if (_version_graph[top_vertex_index].value >
_version_graph[it].value) {
- continue;
- }
- visited[it] = true;
- predecessor[it] = top_vertex_index;
- bfs_queue.push(it);
+ int64_t end_value = spec_version.second + 1;
+ while (_version_graph[cur_idx].value < end_value) {
+ int64_t next_idx = -1;
+ for (const auto& it : _version_graph[cur_idx].edges) {
+ // Only consider incremental versions
+ if (_version_graph[it].value < _version_graph[cur_idx].value) {
Review comment:
resolved~
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
