fix divided lock table issue of Spider

MariaDB · Jun 5, 2020 · d3a6ed0 · d3a6ed0
1 parent 418f161
commit d3a6ed0
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 2 deletions.
diff --git a/storage/spider/ha_spider.cc b/storage/spider/ha_spider.cc
@@ -1166,6 +1166,26 @@ THR_LOCK_DATA **ha_spider::store_lock(
         !spider_param_local_lock_table(thd)
       ) {
         wide_handler->lock_table_type = 1;
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+        if (partition_handler_share && partition_handler_share->handlers)
+        {
+          uint roop_count;
+          for (roop_count = 0; roop_count < partition_handler_share->no_parts;
+            ++roop_count)
+          {
+            if (unlikely((store_error_num =
+              partition_handler_share->handlers[roop_count]->
+                append_lock_tables_list())))
+            {
+              break;
+            }
+          }
+        } else {
+#endif
+          store_error_num = append_lock_tables_list();
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+        }
+#endif
       }
     } else {
       DBUG_PRINT("info",("spider default lock route"));
@@ -1181,6 +1201,27 @@ THR_LOCK_DATA **ha_spider::store_lock(
           spider_param_semi_table_lock(thd, wide_handler->semi_table_lock)
         ) {
           wide_handler->lock_table_type = 2;
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+          if (partition_handler_share && partition_handler_share->handlers)
+          {
+            uint roop_count;
+            for (roop_count = 0;
+              roop_count < partition_handler_share->no_parts;
+              ++roop_count)
+            {
+              if (unlikely((store_error_num =
+                partition_handler_share->handlers[roop_count]->
+                  append_lock_tables_list())))
+              {
+                break;
+              }
+            }
+          } else {
+#endif
+            store_error_num = append_lock_tables_list();
+#ifdef WITH_PARTITION_STORAGE_ENGINE
+          }
+#endif
         }
       }
       if (
@@ -16014,10 +16055,10 @@ int ha_spider::set_union_table_name_pos_sql()
   DBUG_RETURN(0);
 }
 
-int ha_spider::lock_tables()
+int ha_spider::append_lock_tables_list()
 {
   int error_num, roop_count;
-  DBUG_ENTER("ha_spider::lock_tables");
+  DBUG_ENTER("ha_spider::append_lock_tables_list");
   DBUG_PRINT("info",("spider lock_table_type=%u",
     wide_handler->lock_table_type));
 
@@ -16081,6 +16122,15 @@ int ha_spider::lock_tables()
       }
     }
   }
+  DBUG_RETURN(0);
+}
+
+int ha_spider::lock_tables()
+{
+  int error_num, roop_count;
+  DBUG_ENTER("ha_spider::lock_tables");
+  DBUG_PRINT("info",("spider lock_table_type=%u",
+    wide_handler->lock_table_type));
 
 #if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
   if ((conn_kinds & SPIDER_CONN_KIND_MYSQL))

diff --git a/storage/spider/ha_spider.h b/storage/spider/ha_spider.h
@@ -1237,6 +1237,7 @@ class ha_spider: public handler
 #endif
   int init_union_table_name_pos_sql();
   int set_union_table_name_pos_sql();
+  int append_lock_tables_list();
   int lock_tables();
   int dml_init();
 #ifdef HA_CAN_BULK_ACCESS