[incubator-doris] branch master updated: Set cumulative point upon no suitable rowsets (#2204)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhaoc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 22d0987  Set cumulative point upon no suitable rowsets (#2204)
22d0987 is described below

commit 22d0987e97c4bb3b7af8e748c808be7b63a3fd43
Author: lichaoyong <li...@baidu.com>
AuthorDate: Thu Nov 14 22:16:42 2019 +0800

    Set cumulative point upon no suitable rowsets (#2204)
---
 be/src/olap/cumulative_compaction.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/be/src/olap/cumulative_compaction.cpp b/be/src/olap/cumulative_compaction.cpp
index 245e0f1..26706cc 100755
--- a/be/src/olap/cumulative_compaction.cpp
+++ b/be/src/olap/cumulative_compaction.cpp
@@ -109,14 +109,11 @@ OLAPStatus CumulativeCompaction::pick_rowsets_to_compact() {
         _input_rowsets = transient_rowsets;
     }
 		
-    if (_input_rowsets.empty()) {
-        // There are no rowsets choosed to do cumulative compaction.
+    if (_input_rowsets.size() <= 1) {
+        // There are no suitable rowsets choosed to do cumulative compaction.
         // Under this circumstance, cumulative_point should be set.
         // Otherwise, the next round will not choose rowsets. 
         _tablet->set_cumulative_layer_point(candidate_rowsets.back()->start_version());
-    }
-
-    if (_input_rowsets.size() <= 1) {
         return OLAP_ERR_CUMULATIVE_NO_SUITABLE_VERSIONS;
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org