Merge pull request #217 from mroonga/fix-field-name

mysql8 storage: don't access field name directly in key_part_spec
mroonga · Nov 19, 2018 · e0dbbdd · e0dbbdd
2 parents 6e2b2f1 + 86510d1
commit e0dbbdd
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -4004,13 +4004,12 @@ bool ha_mroonga::storage_create_foreign_key(TABLE *table,
       bool is_same_field_name = false;
       MRN_KEY_PART_SPEC_LIST_EACH_BEGIN(key_spec->columns, key_part_spec) {
         const mrn_key_part_spec_field_name *field_name =
-          &(key_part_spec->field_name);
-        DBUG_PRINT("info", ("mroonga: field_name=%.*s",
-                            static_cast<int>(field_name->length),
-                            field_name->str));
+          MRN_KEY_PART_SPEC_FIELD_NAME(key_part_spec);
+        DBUG_PRINT("info", ("mroonga: field_name=" MRN_KEY_PART_SPEC_FIELD_NAME_FORMAT,
+                            MRN_KEY_PART_SPEC_FIELD_NAME_VALUE(field_name)));
         DBUG_PRINT("info", ("mroonga: field->field_name=" FIELD_NAME_FORMAT,
                             FIELD_NAME_FORMAT_VALUE(field)));
-        is_same_field_name = FIELD_NAME_EQUAL_STRING(field, field_name);
+        is_same_field_name = MRN_FIELD_NAME_EQUAL_KEY_PART_SPEC_FIELD_NAME(field, field_name);
       } MRN_KEY_PART_SPEC_LIST_EACH_END();
       if (!is_same_field_name) {
         continue;
@@ -4020,11 +4019,9 @@ bool ha_mroonga::storage_create_foreign_key(TABLE *table,
       static_cast<const mrn_foreign_key_spec *>(key_spec);
     MRN_KEY_PART_SPEC_LIST_EACH_BEGIN(fk->ref_columns, key_part_ref_spec) {
       const mrn_key_part_spec_field_name *ref_field_name =
-        &(key_part_ref_spec->field_name);
-      DBUG_PRINT("info", ("mroonga: ref_field_name=%.*s",
-                          static_cast<int>(ref_field_name->length),
-                          ref_field_name->str));
-
+        MRN_KEY_PART_SPEC_FIELD_NAME(key_part_ref_spec);
+      DBUG_PRINT("info", ("mroonga: ref_field_name=" MRN_KEY_PART_SPEC_FIELD_NAME_FORMAT,
+                          MRN_KEY_PART_SPEC_FIELD_NAME_VALUE(ref_field_name)));
       {
         const mrn_foreign_key_name *ref_db_name = &(fk->ref_db);
         DBUG_PRINT("info", ("mroonga: ref_db_name=%.*s",
@@ -4145,7 +4142,7 @@ bool ha_mroonga::storage_create_foreign_key(TABLE *table,
         DBUG_RETURN(false);
       }
       Field *ref_field = &ref_key_info->key_part->field[0];
-      if (!FIELD_NAME_EQUAL_STRING(ref_field, ref_field_name)) {
+      if (!MRN_FIELD_NAME_EQUAL_KEY_PART_SPEC_FIELD_NAME(ref_field, ref_field_name)) {
         mrn_open_mutex_lock(table->s);
         mrn_free_tmp_table_share(tmp_ref_table_share);
         mrn_open_mutex_unlock(table->s);
@@ -4156,7 +4153,11 @@ bool ha_mroonga::storage_create_foreign_key(TABLE *table,
                 "reference column [%s.%s.%s] is not used for primary key",
                 table->s->db.str,
                 normalized_ref_table_name,
+#ifdef MRN_KEY_PART_SPEC_FIELD_NAME_USE_ACCESSSOR_FUNCTION
+                ref_field_name);
+#else
                 ref_field_name->str);
+#endif
         my_message(error, err_msg, MYF(0));
         DBUG_RETURN(false);
       }

diff --git a/mrn_mysql_compat.h b/mrn_mysql_compat.h
@@ -153,11 +153,40 @@
 #endif
 
 #ifdef MRN_KEY_PART_SPEC_FIELD_NAME_USE_CONST_STRING
+#if (MYSQL_VERSION_ID >= 80013 && !defined(MRN_MARIADB_P))
+  typedef char mrn_key_part_spec_field_name;
+#else
   typedef LEX_CSTRING mrn_key_part_spec_field_name;
+#endif
 #else
   typedef LEX_STRING mrn_key_part_spec_field_name;
 #endif
 
+#if MYSQL_VERSION_ID >= 80013 && !defined(MRN_MARIADB_P)
+#  define MRN_KEY_PART_SPEC_FIELD_NAME_USE_ACCESSSOR_FUNCTION
+#  define MRN_KEY_PART_SPEC_FIELD_NAME(key_part_spec)			\
+     (key_part_spec)->get_field_name()
+#  define MRN_KEY_PART_SPEC_FIELD_NAME_FORMAT "%s"
+#  define MRN_KEY_PART_SPEC_FIELD_NAME_VALUE(key_pat_spec)		\
+     (key_part_spec)
+#  define MRN_FIELD_NAME_EQUAL_KEY_PART_SPEC_FIELD_NAME(field, name)	\
+     (strcmp((field)->field_name, name) == 0)
+#else
+#  define MRN_KEY_PART_SPEC_FIELD_NAME(key_part_spec)			\
+     &(key_part_spec)->field_name
+#  define MRN_KEY_PART_SPEC_FIELD_NAME_FORMAT "%.*s"
+#  define MRN_KEY_PART_SPEC_FIELD_NAME_VALUE(key_part_spec)		\
+     static_cast<int>((key_part_spec)->length), (key_part_spec)->str
+#  ifdef MRN_FIELD_FIELD_NAME_IS_LEX_STRING
+#    define MRN_FIELD_NAME_EQUAL_KEY_PART_SPEC_FIELD_NAME(field, string)	\
+       FIELD_NAME_EQUAL_STRING(field, string)
+#  else
+#    define MRN_FIELD_NAME_EQUAL_KEY_PART_SPEC_FIELD_NAME(field, string)	\
+       (strlen((field)->field_name) == string->length &&			\
+       strncmp((field)->field_name, string->str, string->length) == 0)
+#  endif
+#endif
+
 #if MYSQL_VERSION_ID >= 100302 && defined(MRN_MARIADB_P)
 #  define MRN_THD_MAKE_LEX_STRING_USE_CONST_STRING
 #endif