MDEV-20760 Add Type_handler::KEY_pack_flags()

Backporting from 10.5 to 10.4 This is needed to fix MDEV-28727 easier.
MariaDB · Sep 30, 2022 · 3744b8a · 3744b8a
1 parent 1118e97
commit 3744b8a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 10 deletions.
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
@@ -4143,16 +4143,10 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info,
       /* Use packed keys for long strings on the first column */
       if (!((*db_options) & HA_OPTION_NO_PACK_KEYS) &&
           !((create_info->table_options & HA_OPTION_NO_PACK_KEYS)) &&
-          (key_part_length >= KEY_DEFAULT_PACK_LENGTH &&
-           (sql_field->real_field_type() == MYSQL_TYPE_STRING ||
-            sql_field->real_field_type() == MYSQL_TYPE_VARCHAR ||
-            f_is_blob(sql_field->pack_flag))) && !is_hash_field_needed)
-      {
-        if ((column_nr == 0 && f_is_blob(sql_field->pack_flag)) ||
-            sql_field->real_field_type() == MYSQL_TYPE_VARCHAR)
-          key_info->flags|= HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY;
-        else
-          key_info->flags|= HA_PACK_KEY;
+          (key_part_length >= KEY_DEFAULT_PACK_LENGTH) &&
+          !is_hash_field_needed)
+      {
+        key_info->flags|= sql_field->type_handler()->KEY_pack_flags(column_nr);
       }
       /* Check if the key segment is partial, set the key flag accordingly */
       if (key_part_length != sql_field->key_length &&

diff --git a/sql/sql_type.h b/sql/sql_type.h
@@ -3426,6 +3426,7 @@ class Type_handler
   virtual Schema *schema() const;
   virtual const Name name() const= 0;
   virtual const Name version() const { return m_version_default; }
+  virtual ulong KEY_pack_flags(uint column_nr) const { return 0; }
   virtual enum_field_types field_type() const= 0;
   virtual enum_field_types real_field_type() const { return field_type(); }
   /**
@@ -6152,6 +6153,10 @@ class Type_handler_string: public Type_handler_longstr
   virtual ~Type_handler_string() {}
   const Name name() const { return m_name_char; }
   enum_field_types field_type() const { return MYSQL_TYPE_STRING; }
+  ulong KEY_pack_flags(uint column_nr) const override
+  {
+    return HA_PACK_KEY;
+  }
   bool is_param_long_data_type() const { return true; }
   uint32 calc_pack_length(uint32 length) const { return length; }
   const Type_handler *type_handler_for_tmp_table(const Item *item) const
@@ -6215,6 +6220,16 @@ class Type_handler_varchar: public Type_handler_longstr
   virtual ~Type_handler_varchar() {}
   const Name name() const { return m_name_varchar; }
   enum_field_types field_type() const { return MYSQL_TYPE_VARCHAR; }
+  ulong KEY_pack_flags(uint column_nr) const override
+  {
+#if MARIADB_VERSION_ID >= 100500
+    if (column_nr == 0)
+      return HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY;
+    return HA_PACK_KEY;
+#else
+    return HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY;
+#endif
+  }
   enum_field_types type_code_for_protocol() const
   {
     return MYSQL_TYPE_VAR_STRING; // Keep things compatible for old clients
@@ -6271,6 +6286,11 @@ class Type_handler_varchar_compressed: public Type_handler_varchar
 public:
   Field *make_conversion_table_field(TABLE *, uint metadata,
                                      const Field *target) const;
+  ulong KEY_pack_flags(uint column_nr) const override
+  {
+    DBUG_ASSERT(0);
+    return 0;
+  }
 };
 
 
@@ -6280,6 +6300,12 @@ class Type_handler_blob_common: public Type_handler_longstr
   virtual ~Type_handler_blob_common() { }
   Field *make_conversion_table_field(TABLE *, uint metadata,
                                      const Field *target) const;
+  ulong KEY_pack_flags(uint column_nr) const override
+  {
+    if (column_nr == 0)
+      return HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY;
+    return HA_PACK_KEY;
+  }
   const Type_handler *type_handler_for_tmp_table(const Item *item) const
   {
     return blob_type_handler(item);
@@ -6390,6 +6416,11 @@ class Type_handler_blob_compressed: public Type_handler_blob
 public:
   Field *make_conversion_table_field(TABLE *, uint metadata,
                                      const Field *target) const;
+  ulong KEY_pack_flags(uint column_nr) const override
+  {
+    DBUG_ASSERT(0);
+    return 0;
+  }
 };