Merge branch 'master' of https://github.com/pingcap/tiflash into leas…

…t_greatest_string
pingcap · Feb 8, 2023 · d780b5c · d780b5c
2 parents 15c3dfe + 0bb9cb4
commit d780b5c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/dbms/src/Functions/LeastGreatest.h b/dbms/src/Functions/LeastGreatest.h
@@ -508,9 +508,22 @@ class FunctionLeastGreatestString : public IFunction
 
         // 2. calculate result column for string columns
         auto string_columns_size = string_columns.size();
-        ColumnString * result_col = nullptr;
         if (string_columns_size == 1)
+        {
+            // 3A. merge result columns of const columns and result_col
+            ColumnString * result_col = nullptr;
             result_col = const_cast<ColumnString *>(string_columns[0]);
+            auto col_str = ColumnString::create();
+            impl::stringVectorConstant(
+                collator,
+                result_col->getChars(),
+                result_col->getOffsets(),
+                const_res,
+                col_str->getChars(),
+                col_str->getOffsets());
+            block.getByPosition(result).column = std::move(col_str);
+            return;
+        }
         else if (string_columns_size >= 2)
         {
             std::vector<StringRef> result_string_refs;
@@ -551,7 +564,7 @@ class FunctionLeastGreatestString : public IFunction
             }
             else
             {
-                // 3A. merge result columns of const columns and vector columns
+                // 3B. merge result columns of const columns and vector columns
                 auto col_str = ColumnString::create();
                 impl::stringRefVectorConstant(
                     collator,
@@ -562,22 +575,7 @@ class FunctionLeastGreatestString : public IFunction
                 block.getByPosition(result).column = std::move(col_str);
                 return;
             }
-        }
-
-        // 3B. merge result columns of const columns and result_col
-        if (string_columns_size == 1 && !const_columns.empty())
-        {
-            auto col_str = ColumnString::create();
-            impl::stringVectorConstant(
-                collator,
-                result_col->getChars(),
-                result_col->getOffsets(),
-                const_res,
-                col_str->getChars(),
-                col_str->getOffsets());
-            block.getByPosition(result).column = std::move(col_str);
-            return;
-        }
+        }  
     }
 
 private:

diff --git a/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp b/dbms/src/Storages/DeltaMerge/DeltaMergeStore_InternalBg.cpp
@@ -595,7 +595,7 @@ SegmentPtr DeltaMergeStore::gcTrySegmentMerge(const DMContextPtr & dm_context, c
     auto new_segment = segmentMerge(*dm_context, segments_to_merge, SegmentMergeReason::BackgroundGCThread);
     if (new_segment)
     {
-        checkSegmentUpdate(dm_context, segment, ThreadType::BG_GC);
+        checkSegmentUpdate(dm_context, new_segment, ThreadType::BG_GC);
     }
 
     return new_segment;
@@ -718,7 +718,7 @@ SegmentPtr DeltaMergeStore::gcTrySegmentMergeDelta(const DMContextPtr & dm_conte
     }
 
     segment_snap = {};
-    checkSegmentUpdate(dm_context, segment, ThreadType::BG_GC);
+    checkSegmentUpdate(dm_context, new_segment, ThreadType::BG_GC);
 
     return new_segment;
 }