Merge branch 'release-5.3' into cherry-pick-4916-to-release-5.3

pingcap · Oct 20, 2022 · ef9e577 · ef9e577
2 parents 3d9c4ef + f3952aa
commit ef9e577
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/dbms/src/Functions/FunctionsLogical.h b/dbms/src/Functions/FunctionsLogical.h
@@ -137,7 +137,7 @@ struct NotImpl
 {
     using ResultType = UInt8;
 
-    static inline UInt8 apply(A a)
+    static inline bool apply(A a)
     {
         return !a;
     }
@@ -180,7 +180,7 @@ struct AssociativeOperationImpl
     {}
 
     /// Returns a combination of values in the i-th row of all columns stored in the constructor.
-    inline UInt8 apply(size_t i) const
+    inline bool apply(size_t i) const
     {
         if (Op::isSaturable())
         {
@@ -224,7 +224,7 @@ struct AssociativeOperationImpl<Op, 1>
         : vec(in[in.size() - 1]->getData())
     {}
 
-    inline UInt8 apply(size_t i) const
+    inline bool apply(size_t i) const
     {
         return vec[i];
     }

diff --git a/dbms/src/Functions/tests/gtest_logical.cpp b/dbms/src/Functions/tests/gtest_logical.cpp
@@ -44,6 +44,20 @@ try
             func_name,
             createOnlyNullColumn(2),
             createColumn<Nullable<UInt8>>({1, 0})));
+    // issue 6127
+    ASSERT_COLUMN_EQ(
+        createColumn<UInt8>({0, 1, 0, 0}),
+        executeFunction(
+            func_name,
+            createColumn<Int64>({0, 123, 0, 41}),
+            createColumn<UInt8>({0, 11, 221, 0})));
+    // issue 6127, position of UInt8 column may affect the result
+    ASSERT_COLUMN_EQ(
+        createColumn<UInt8>({0, 1, 0, 0}),
+        executeFunction(
+            func_name,
+            createColumn<UInt8>({0, 123, 0, 41}),
+            createColumn<Int64>({0, 11, 221, 0})));
 }
 CATCH
 
@@ -59,13 +73,6 @@ try
             func_name,
             createColumn<Nullable<UInt8>>({0, 1, 0, 1, {}, 0}),
             createColumn<Nullable<UInt8>>({0, 1, 1, 0, 1, {}})));
-    // issue 5849
-    ASSERT_COLUMN_EQ(
-        createColumn<UInt8>({0, 1, 1, 1}),
-        executeFunction(
-            func_name,
-            createColumn<UInt8>({0, 123, 0, 41}),
-            createColumn<Int64>({0, 11, 221, 0})));
     // column, const
     ASSERT_COLUMN_EQ(
         createColumn<Nullable<UInt8>>({1, 1}),
@@ -87,6 +94,13 @@ try
             func_name,
             createOnlyNullColumn(2),
             createColumn<Nullable<UInt8>>({1, 0})));
+    // issue 5849
+    ASSERT_COLUMN_EQ(
+        createColumn<UInt8>({0, 1, 1, 1}),
+        executeFunction(
+            func_name,
+            createColumn<UInt8>({0, 123, 0, 41}),
+            createColumn<Int64>({0, 11, 221, 0})));
 }
 CATCH