From d2466c38ad02466b56bb609fe5ce580d1f484c28 Mon Sep 17 00:00:00 2001
From: wjhh2008 <wjh2006-1@163.com>
Date: Fri, 11 Nov 2022 12:07:16 +0000
Subject: [PATCH] fix load data partiton id calculation for null field

---
 src/sql/engine/cmd/ob_load_data_impl.cpp | 17 ++++++-----------
 src/sql/engine/cmd/ob_load_data_impl.h   |  2 --
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/sql/engine/cmd/ob_load_data_impl.cpp b/src/sql/engine/cmd/ob_load_data_impl.cpp
index d946ea04f..25eb3972e 100644
--- a/src/sql/engine/cmd/ob_load_data_impl.cpp
+++ b/src/sql/engine/cmd/ob_load_data_impl.cpp
@@ -1059,7 +1059,8 @@ int ObLoadDataSPImpl::exec_shuffle(int64_t task_id, ObShuffleTaskHandle *handle)
         } else {
           for (int i = 0; i < handle->parser.get_fields_per_line().count(); ++i) {
             ObCSVGeneralParser::FieldValue &str_v = handle->parser.get_fields_per_line().at(i);
-            handle->row_in_file.get_cell(i).set_varchar_value(str_v.ptr_, str_v.len_);
+            handle->row_in_file.get_cell(i) =
+              static_cast<ObConstRawExpr *>(handle->generator.get_field_exprs().at(i))->get_value();
           }
           if (OB_FAIL(handle->calc_tablet_id_expr->eval(handle->exec_ctx, handle->row_in_file, result))) {
             LOG_WARN("fail to calc tablet id", K(ret));
@@ -1207,13 +1208,7 @@ int ObLoadDataSPImpl::exec_insert(ObInsertTask &task, ObInsertResult& result)
         if (c != 0) {
           OZ (sql_str.append(",", 1));
         }
-        if (ObLoadDataUtils::is_null_field(single_row_values[c])) {
-          OZ (sql_str.append(ObString(ObLoadDataUtils::NULL_STRING)));
-        } else if (ObLoadDataUtils::is_zero_field(single_row_values[c])) {
-          OZ (sql_str.append("0"));
-        } else {
-          OZ (sql_str.append(single_row_values[c]));
-        }
+        OZ (sql_str.append(single_row_values[c]));
       }
       OZ (sql_str.append(")", 1));
 
@@ -2061,12 +2056,12 @@ int ObPartDataFragMgr::next_insert_task(int64_t batch_row_count, ObInsertTask &t
 
   while (OB_SUCC(ret) && row_count < batch_row_count) {
     new_top_begin_point.reset();
-    //每次处理一个头部的frag
+    //handle one frag from head
     while (OB_EAGAIN == queue_.top(link)) { pause(); }
     if (OB_ISNULL(frag = static_cast<ObDataFrag *>(link))) {
       ret = OB_ERR_UNEXPECTED;
     } else if ((row_count += frag->row_cnt) > batch_row_count) {
-      //情况1 frag还有剩余数据，不需要pop
+      //case1 frag has data remained，do not pop
       new_top_begin_point.frag_row_pos_ = frag->row_cnt - (row_count - batch_row_count);
       if (OB_FAIL(rowoffset2pos(frag,
                                 new_top_begin_point.frag_row_pos_,
@@ -2080,7 +2075,7 @@ int ObPartDataFragMgr::next_insert_task(int64_t batch_row_count, ObInsertTask &t
         LOG_WARN("fail to push back frag", K(ret));
       }
     } else {
-      //情况2 frag榨干，需要pop
+      //case2 frag is empty，need pop
       if (OB_FAIL(queue_.pop(link))) {
         ret = OB_ERR_UNEXPECTED;
       } else if (OB_FAIL(frag_free_list_.push_back(frag))) {
diff --git a/src/sql/engine/cmd/ob_load_data_impl.h b/src/sql/engine/cmd/ob_load_data_impl.h
index 22a8db779..d1ae8a291 100644
--- a/src/sql/engine/cmd/ob_load_data_impl.h
+++ b/src/sql/engine/cmd/ob_load_data_impl.h
@@ -615,8 +615,6 @@ public:
     if (field.is_null_
         || (0 == field.len_ && lib::is_oracle_mode())) {
       obj.set_null();
-    } else if (0 == field.len_ && !is_string_type_column && lib::is_mysql_mode()) {
-      obj.set_int(0);
     } else {
       obj.set_varchar(field.ptr_, field.len_);
       obj.set_collation_type(cs_type);