least/greatest function for string (pingcap#6662)

close pingcap#6660
ywqzzy · Feb 13, 2023 · 4e8d098 · 4e8d098
1 parent 4386463
commit 4e8d098
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/dbms/src/Functions/LeastGreatest.h b/dbms/src/Functions/LeastGreatest.h
@@ -507,9 +507,28 @@ class FunctionLeastGreatestString : public IFunction
 
         // 2. calculate result column for string columns
         auto string_columns_size = string_columns.size();
+<<<<<<< HEAD
         ColumnString * result_col = nullptr;
         if (string_columns_size == 1)
             result_col = const_cast<ColumnString *>(string_columns[0]);
+=======
+        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;
+        }
+>>>>>>> f14785927 (least/greatest function for string (#6662))
         else if (string_columns_size >= 2)
         {
             std::vector<StringRef> result_string_refs;
@@ -550,7 +569,11 @@ class FunctionLeastGreatestString : public IFunction
             }
             else
             {
+<<<<<<< HEAD
                 // 3A. merge result columns of const columns and vector columns
+=======
+                // 3B. merge result columns of const columns and vector columns
+>>>>>>> f14785927 (least/greatest function for string (#6662))
                 auto col_str = ColumnString::create();
                 impl::stringRefVectorConstant(
                     collator,