database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

A cleanup for MDEV-19908 Add class Type_collection

Browse Source 
Moving geometry types aggregation inside Type_collection_geometry

This change introduces a static method Type_aggregator::find_handler_in_array(),
which will later be reused by other data type plugins.
This commit is contained in:
Alexander Barkov
2019-10-04 10:12:27 +04:00
parent c2d8db66be
commit 57ce0bab32
3 changed files with 109 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_type.h
View File

@@ -7001,6 +7001,7 @@ extern MYSQL_PLUGIN_IMPORT Type_handler_interval_DDhhmmssff
class Type_aggregator
{
bool m_is_commutative;
public:
class Pair
{
public:
@@ -7018,6 +7019,23 @@ class Type_aggregator
return m_handler1 == handler1 && m_handler2 == handler2;
}
};
static const Type_handler *
find_handler_in_array(const Type_aggregator::Pair *pairs,
const Type_handler *h1,
const Type_handler *h2,
bool commutative)
{
for (const Type_aggregator::Pair *p= pairs; p->m_result; p++)
{
if (p->eq(h1, h2))
return p->m_result;
if (commutative && p->eq(h2, h1))
return p->m_result;
}
return NULL;
}
private:
Dynamic_array<Pair> m_array;
const Pair* find_pair(const Type_handler *handler1,
const Type_handler *handler2) const;