test

Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
zanmato1984 · Oct 19, 2022 · dae275e · dae275e
1 parent 9e35992
commit dae275e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/dbms/src/Storages/Transaction/TiDB.cpp b/dbms/src/Storages/Transaction/TiDB.cpp
@@ -765,6 +765,8 @@ try
         is_invisible = json->getValue<bool>("is_invisible");
     if (json->has("is_global"))
         is_global = json->getValue<bool>("is_global");
+    if (json->has("is_redistributed"))
+        is_redistributed = json->getValue<bool>("is_redistributed");
 }
 catch (const Poco::Exception & e)
 {
@@ -885,7 +887,7 @@ try
         {
             auto index_info_json = index_arr->getObject(i);
             IndexInfo index_info(index_info_json);
-            if (index_info.is_primary)
+            if (index_info.is_primary || index_info.is_redistributed)
                 index_infos.emplace_back(index_info);
         }
     }
@@ -894,8 +896,6 @@ try
     pk_is_handle = obj->getValue<bool>("pk_is_handle");
     if (obj->has("is_common_handle"))
         is_common_handle = obj->getValue<bool>("is_common_handle");
-    if (!is_common_handle)
-        index_infos.clear();
     comment = obj->getValue<String>("comment");
     if (obj->has("update_timestamp"))
         update_timestamp = obj->getValue<Timestamp>("update_timestamp");

diff --git a/dbms/src/Storages/Transaction/TiDB.h b/dbms/src/Storages/Transaction/TiDB.h
@@ -341,6 +341,7 @@ struct IndexInfo
     bool is_primary;
     bool is_invisible;
     bool is_global;
+    bool is_redistributed;
 };
 
 struct TableInfo
@@ -411,9 +412,25 @@ struct TableInfo
     /// due to we will not update IndexInfo except RENAME DDL action,
     /// but DDL like add column / drop column may change the offset of columns
     /// Thus, please be very careful when you must have to use offset information !!!!!
-    const IndexInfo & getPrimaryIndexInfo() const { return index_infos[0]; }
+    const IndexInfo & getPrimaryIndexInfo() const
+    {
+        for (const auto & index_info : index_infos)
+        {
+            if (index_info.is_primary)
+                return index_info;
+        }
+        throw DB::Exception("Should not reach here");
+    }
 
-    IndexInfo & getPrimaryIndexInfo() { return index_infos[0]; }
+    IndexInfo & getPrimaryIndexInfo()
+    {
+        for (auto & index_info : index_infos)
+        {
+            if (index_info.is_primary)
+                return index_info;
+        }
+        throw DB::Exception("Should not reach here");
+    }
 };
 
 using DBInfoPtr = std::shared_ptr<DBInfo>;

diff --git a/dbms/src/TiDB/Schema/SchemaBuilder.cpp b/dbms/src/TiDB/Schema/SchemaBuilder.cpp
@@ -1138,6 +1138,18 @@ void SchemaBuilder<Getter, NameMapper>::applyCreateLogicalTable(const TiDB::DBIn
     // Create logical table at last, only logical table creation will be treated as "complete".
     // Intermediate failure will hide the logical table creation so that schema syncing when restart will re-create all (despite some physical tables may have created).
     applyCreatePhysicalTable(db_info, table_info);
+    for (auto & index_info : table_info->index_infos)
+    {
+        if (index_info.is_redistributed)
+        {
+            auto new_table = std::make_shared<TableInfo>();
+            *new_table = *table_info;
+            new_table->id = table_info->id << 32 | index_info.id;
+            new_table->index_infos.clear();
+            new_table->name = name_mapper.mapPartitionName(*new_table);
+            applyCreatePhysicalTable(db_info, new_table);
+        }
+    }
 }
 
 template <typename Getter, typename NameMapper>