fix bug that collation does not work for nullable type (#3392) (#3395)

close #3391
pingcap · Apr 12, 2022 · fab9b5b · fab9b5b
1 parent 0f33c53
commit fab9b5b
Show file tree

Hide file tree

Showing 2 changed files with 111 additions and 54 deletions.
diff --git a/dbms/src/Flash/Mpp/MPPHandler.cpp b/dbms/src/Flash/Mpp/MPPHandler.cpp
@@ -1,6 +1,7 @@
 #include <Common/FailPoint.h>
 #include <Common/TiFlashMetrics.h>
 #include <DataStreams/SquashingBlockOutputStream.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Flash/Coprocessor/DAGBlockOutputStream.h>
 #include <Flash/Coprocessor/DAGCodec.h>
 #include <Flash/Coprocessor/DAGUtils.h>
@@ -207,7 +208,7 @@ std::vector<RegionInfo> MPPTask::prepare(const mpp::DispatchTaskRequest & task_r
         assert(isColumnExpr(expr));
         auto column_index = decodeDAGInt64(expr.val());
         partition_col_id.emplace_back(column_index);
-        if (has_collator_info && getDataTypeByFieldType(expr.field_type())->isString())
+        if (has_collator_info && removeNullable(getDataTypeByFieldType(expr.field_type()))->isString())
         {
             collators.emplace_back(getCollatorFromFieldType(exchangeSender.types(i)));
         }