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

eldenmoon pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 0c13977ee54 [Fix](segment compaction) 
_check_and_set_is_doing_segcompaction should be the last condition (#33043)
0c13977ee54 is described below

commit 0c13977ee54320c038f2a50ecf5e370f5ec18f49
Author: lihangyu <15605149...@163.com>
AuthorDate: Fri Mar 29 17:35:30 2024 +0800

    [Fix](segment compaction) _check_and_set_is_doing_segcompaction should be 
the last condition (#33043)
    
    introduced by #33001
---
 be/src/olap/rowset/beta_rowset_writer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/be/src/olap/rowset/beta_rowset_writer.cpp 
b/be/src/olap/rowset/beta_rowset_writer.cpp
index a7cec72faea..3bba3febec7 100644
--- a/be/src/olap/rowset/beta_rowset_writer.cpp
+++ b/be/src/olap/rowset/beta_rowset_writer.cpp
@@ -416,8 +416,8 @@ Status BetaRowsetWriter::_segcompaction_if_necessary() {
     // otherwise _segcompacting_cond will never get notified
     if (!config::enable_segcompaction || !_context.enable_segcompaction ||
         !_context.tablet_schema->cluster_key_idxes().empty() ||
-        !_check_and_set_is_doing_segcompaction() ||
-        _context.tablet_schema->num_variant_columns() > 0) {
+        _context.tablet_schema->num_variant_columns() > 0 ||
+        !_check_and_set_is_doing_segcompaction()) {
         return status;
     }
     if (_segcompaction_status.load() != OK) {


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

Reply via email to