ddl: fix TypeBit default value (#9467)

close #9461 ddl: fix TypeBit default value Signed-off-by: Lloyd-Pottiger <[email protected]>
pingcap · Sep 26, 2024 · 1ce2f11 · 1ce2f11
1 parent d91bcde
commit 1ce2f11
Show file tree

Hide file tree

Showing 6 changed files with 150 additions and 74 deletions.
diff --git a/contrib/poco b/contrib/poco
diff --git a/dbms/src/TiDB/Schema/TiDB.cpp b/dbms/src/TiDB/Schema/TiDB.cpp
@@ -156,14 +156,7 @@ Field ColumnInfo::defaultValueToField() const
         });
     case TypeBit:
     {
-        // TODO: We shall use something like `orig_default_bit`, which will never change once created,
-        //  rather than `default_bit`, which could be altered.
-        //  See https://github.com/pingcap/tidb/issues/17641 and https://github.com/pingcap/tidb/issues/17642
-        const auto & bit_value = default_bit_value;
-        // TODO: There might be cases that `orig_default` is not null but `default_bit` is null,
-        //  i.e. bit column added with an default value but later modified to another.
-        //  For these cases, neither `orig_default` (may get corrupted) nor `default_bit` (modified) is correct.
-        //  This is a bug anyway, we choose to make it simple, i.e. use `default_bit`.
+        const auto & bit_value = origin_default_bit_value;
         if (bit_value.isEmpty())
         {
             if (hasNotNullFlag())
@@ -382,6 +375,7 @@ try
     json->set("origin_default", origin_default_value);
     json->set("default", default_value);
     json->set("default_bit", default_bit_value);
+    json->set("origin_default_bit", origin_default_bit_value);
     {
         // "type" field
         Poco::JSON::Object::Ptr tp_json = new Poco::JSON::Object();
@@ -433,6 +427,8 @@ try
         default_value = json->get("default");
     if (!json->isNull("default_bit"))
         default_bit_value = json->get("default_bit");
+    if (!json->isNull("origin_default_bit"))
+        origin_default_bit_value = json->get("origin_default_bit");
     {
         // type
         auto type_json = json->getObject("type");
@@ -1286,7 +1282,11 @@ ColumnInfo toTiDBColumnInfo(const tipb::ColumnInfo & tipb_column_info)
     // TiFlash get default value from origin_default_value, check `Field ColumnInfo::defaultValueToField() const`
     // So we need to set origin_default_value to tipb_column_info.default_val()
     // Related logic in tidb, https://github.com/pingcap/tidb/blob/45318da24d8e4c0c6aab836d291a33f949dd18bf/pkg/table/tables/tables.go#L2303-L2329
-    tidb_column_info.origin_default_value = tipb_column_info.default_val();
+    // For TypeBit, we need to set origin_default_bit_value to tipb_column_info.default_val().
+    if (tidb_column_info.tp == TypeBit)
+        tidb_column_info.origin_default_bit_value = tipb_column_info.default_val();
+    else
+        tidb_column_info.origin_default_value = tipb_column_info.default_val();
     tidb_column_info.collate = tipb_column_info.collation();
     for (int i = 0; i < tipb_column_info.elems_size(); ++i)
         tidb_column_info.elems.emplace_back(tipb_column_info.elems(i), i + 1);

diff --git a/dbms/src/TiDB/Schema/TiDB.h b/dbms/src/TiDB/Schema/TiDB.h
@@ -115,6 +115,7 @@ struct ColumnInfo
     Int32 offset = -1;
     Poco::Dynamic::Var origin_default_value;
     Poco::Dynamic::Var default_value;
+    Poco::Dynamic::Var origin_default_bit_value;
     Poco::Dynamic::Var default_bit_value;
     TP tp = TypeDecimal; // TypeDecimal is not used by TiDB.
     UInt32 flag = 0;
+4 −2		Foundation/include/Poco/JSONString.h
+6 −2		Foundation/include/Poco/UTF8String.h
+36 −4		Foundation/src/JSONString.cpp
+5 −5		Foundation/src/UTF8String.cpp
+3 −5		Foundation/src/VarHolder.cpp
+12 −2		Foundation/testsuite/src/StringTest.cpp
+21 −0		Foundation/testsuite/src/UTF8StringTest.cpp
+2 −0		Foundation/testsuite/src/UTF8StringTest.h
+29 −3		JSON/include/Poco/JSON/Array.h
+119 −55		JSON/include/Poco/JSON/Object.h
+10 −7		JSON/include/Poco/JSON/Stringifier.h
+4 −4		JSON/src/Array.cpp
+57 −27		JSON/src/Object.cpp
+13 −9		JSON/src/Stringifier.cpp
+184 −6		JSON/testsuite/src/JSONTest.cpp
+3 −1		JSON/testsuite/src/JSONTest.h