MDEV-29355 Backport templatized INET6 implementation from 10.7 to 10.6

Author: abarkov

plugin/type_inet/item_inetfunc.cc

@@ -158,7 +158,7 @@ String *Item_func_inet6_aton::val_str(String *buffer)
     return buffer;
   }
 
-  Inet6_null ipv6(*tmp.string());
+  Inet6Bundle::Fbt_null ipv6(*tmp.string());
   if (!ipv6.is_null())
   {
     ipv6.to_binary(buffer);
@@ -197,7 +197,7 @@ String *Item_func_inet6_ntoa::val_str_ascii(String *buffer)
     return buffer;
   }
 
-  Inet6_null ipv6(static_cast<const Binary_string&>(*tmp.string()));
+  Inet6Bundle::Fbt_null ipv6(static_cast<const Binary_string&>(*tmp.string()));
   if (!ipv6.is_null())
   {
     ipv6.to_string(buffer);
@@ -221,6 +221,22 @@ longlong Item_func_is_ipv4::val_int()
   return !tmp.is_null() && !Inet4_null(*tmp.string()).is_null();
 }
 
+class IP6 : public Inet6Bundle::Fbt_null
+{
+public:
+  IP6(Item* arg) : Inet6Bundle::Fbt_null(arg) {}
+  bool is_v4compat() const
+  {
+    static_assert(sizeof(in6_addr) == IN6_ADDR_SIZE, "unexpected in6_addr size");
+    return IN6_IS_ADDR_V4COMPAT((struct in6_addr *) m_buffer);
+  }
+  bool is_v4mapped() const
+  {
+    static_assert(sizeof(in6_addr) == IN6_ADDR_SIZE, "unexpected in6_addr size");
+    return IN6_IS_ADDR_V4MAPPED((struct in6_addr *) m_buffer);
+  }
+};
+
 
 /**
   Checks if the passed string represents an IPv6-address.
@@ -230,17 +246,16 @@ longlong Item_func_is_ipv6::val_int()
 {
   DBUG_ASSERT(fixed());
   String_ptr_and_buffer<STRING_BUFFER_USUAL_SIZE> tmp(args[0]);
-  return !tmp.is_null() && !Inet6_null(*tmp.string()).is_null();
+  return !tmp.is_null() && !Inet6Bundle::Fbt_null(*tmp.string()).is_null();
 }
 
-
 /**
   Checks if the passed IPv6-address is an IPv4-compat IPv6-address.
 */
 
 longlong Item_func_is_ipv4_compat::val_int()
 {
-  Inet6_null ip6(args[0]);
+  IP6 ip6(args[0]);
   return !ip6.is_null() && ip6.is_v4compat();
 }
 
@@ -251,6 +266,6 @@ longlong Item_func_is_ipv4_compat::val_int()
 
 longlong Item_func_is_ipv4_mapped::val_int()
 {
-  Inet6_null ip6(args[0]);
+  IP6 ip6(args[0]);
   return !ip6.is_null() && ip6.is_v4mapped();
 }

plugin/type_inet/mysql-test/type_inet/type_inet6.result

@@ -2229,3 +2229,31 @@ SELECT * FROM t1 WHERE d >= ALL (SELECT * FROM t1);
 d
 12::
 DROP TABLE t1;
+#
+# MDEV-27015 Assertion `!is_null()' failed in FixedBinTypeBundle<FbtImpl>::Fbt FixedBinTypeBundle<FbtImpl>::Field_fbt::to_fbt()
+#
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a INET6(6) DEFAULT '::10');
+INSERT INTO t1(id) VALUES (1), (2), (3), (4);
+INSERT INTO t1 VALUES (5,'::5'), (6,'::6');
+SELECT * FROM t1 ORDER BY a;
+id	a
+5	::5
+6	::6
+1	::10
+2	::10
+3	::10
+4	::10
+CREATE VIEW v1(a, m) AS SELECT a, MIN(id) FROM t1 GROUP BY a;
+CREATE TABLE t2 SELECT * FROM v1;
+SELECT * FROM v1 ORDER BY a;
+a	m
+::5	5
+::6	6
+::10	1
+SELECT * FROM t2 ORDER BY a;
+a	m
+::5	5
+::6	6
+::10	1
+DROP VIEW v1;
+DROP TABLE t1, t2;

plugin/type_inet/mysql-test/type_inet/type_inet6.test

@@ -1641,3 +1641,18 @@ SELECT * FROM t1 ORDER BY d;
 SELECT * FROM t1 WHERE d <= ALL (SELECT * FROM t1);
 SELECT * FROM t1 WHERE d >= ALL (SELECT * FROM t1);
 DROP TABLE t1;
+
+--echo #
+--echo # MDEV-27015 Assertion `!is_null()' failed in FixedBinTypeBundle<FbtImpl>::Fbt FixedBinTypeBundle<FbtImpl>::Field_fbt::to_fbt()
+--echo #
+
+CREATE TABLE t1 (id int NOT NULL PRIMARY KEY, a INET6(6) DEFAULT '::10');
+INSERT INTO t1(id) VALUES (1), (2), (3), (4);
+INSERT INTO t1 VALUES (5,'::5'), (6,'::6');
+SELECT * FROM t1 ORDER BY a;
+CREATE VIEW v1(a, m) AS SELECT a, MIN(id) FROM t1 GROUP BY a;
+CREATE TABLE t2 SELECT * FROM v1;
+SELECT * FROM v1 ORDER BY a;
+SELECT * FROM t2 ORDER BY a;
+DROP VIEW v1;
+DROP TABLE t1, t2;

plugin/type_inet/plugin.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2019 MariaDB Corporation
+/* Copyright (c) 2019,2021 MariaDB Corporation
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,14 +21,10 @@
 #include <mysql/plugin_data_type.h>
 #include <mysql/plugin_function.h>
 
-
-Type_handler_inet6 type_handler_inet6;
-
-
 static struct st_mariadb_data_type plugin_descriptor_type_inet6=
 {
   MariaDB_DATA_TYPE_INTERFACE_VERSION,
-  &type_handler_inet6
+  Inet6Bundle::type_handler_fbt()
 };