MDEV-9220 Split filesort.cc:make_sortkey() and filesort.cc::sortlength() into...

MDEV-9220 Split filesort.cc:make_sortkey() and filesort.cc::sortlength() into virtual methods in Type_handler

sql/filesort.h

@@ -24,10 +24,10 @@ class SQL_SELECT;
 class SQL_SELECT;
 class THD;
 struct TABLE;
-typedef struct st_sort_field SORT_FIELD;
+struct SORT_FIELD;
 class Filesort_tracker;
 
-ha_rows filesort(THD *thd, TABLE *table, st_sort_field *sortorder,
+ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder,
                  uint s_length, SQL_SELECT *select,
                  ha_rows max_rows, bool sort_positions,
                  ha_rows *examined_rows, ha_rows *found_rows,

sql/item.h

@@ -774,6 +774,17 @@ class Item: public Value_source,
   Item_result result_type() const { return type_handler()->result_type(); }
   /* ... while cmp_type() specifies how it should be compared */
   Item_result cmp_type() const { return type_handler()->cmp_type(); }
+  void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const
+  {
+    type_handler()->make_sort_key(to, item, sort_field, param);
+  }
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const
+  {
+    type_handler()->sortlength(thd, item, attr);
+  }
   virtual Item_result cast_to_int_type() const { return cmp_type(); }
   enum_field_types string_field_type() const
   {

sql/sql_class.h

@@ -4883,16 +4883,19 @@ class SJ_MATERIALIZATION_INFO : public Sql_alloc
 
 
 /* Structs used when sorting */
+struct SORT_FIELD_ATTR
+{
+  uint length;          /* Length of sort field */
+  uint suffix_length;   /* Length suffix (0-4) */
+};
+
 
-typedef struct st_sort_field {
+struct SORT_FIELD: public SORT_FIELD_ATTR
+{
   Field *field;				/* Field to sort */
   Item	*item;				/* Item if not sorting fields */
-  uint	 length;			/* Length of sort field */
-  uint   suffix_length;                 /* Length suffix (0-4) */
-  Item_result result_type;		/* Type of item */
   bool reverse;				/* if descending sort */
-  bool need_strxnfrm;			/* If we have to use strxnfrm() */
-} SORT_FIELD;
+};
 
 
 typedef struct st_sort_buffer {

sql/sql_sort.h

@@ -23,8 +23,8 @@
 #include "queues.h"
 
 typedef struct st_buffpek BUFFPEK;
-typedef struct st_sort_field SORT_FIELD;
 
+struct SORT_FIELD;
 class Field;
 struct TABLE;
 

sql/sql_test.h

@@ -22,7 +22,7 @@ class JOIN;
 struct TABLE_LIST;
 typedef class Item COND;
 typedef class st_select_lex SELECT_LEX;
-typedef struct st_sort_field SORT_FIELD;
+struct SORT_FIELD;
 
 #ifndef DBUG_OFF
 void print_where(COND *cond,const char *info, enum_query_type query_type);

sql/sql_type.h

@@ -25,12 +25,19 @@
 
 class Field;
 class Item;
+class Type_std_attributes;
+class Sort_param;
 struct TABLE;
+struct SORT_FIELD_ATTR;
 
 class Type_handler
 {
 protected:
   const Type_handler *string_type_handler(uint max_octet_length) const;
+  void make_sort_key_longlong(uchar *to,
+                              bool maybe_null, bool null_value,
+                              bool unsigned_flag,
+                              longlong value) const;
 public:
   static const Type_handler *get_handler_by_field_type(enum_field_types type);
   static const Type_handler *get_handler_by_real_type(enum_field_types type);
@@ -79,6 +86,12 @@ class Type_handler
   virtual Field *make_conversion_table_field(TABLE *TABLE,
                                              uint metadata,
                                              const Field *target) const= 0;
+  virtual void make_sort_key(uchar *to, Item *item,
+                             const SORT_FIELD_ATTR *sort_field,
+                             Sort_param *param) const= 0;
+  virtual void sortlength(THD *thd,
+                          const Type_std_attributes *item,
+                          SORT_FIELD_ATTR *attr) const= 0;
 };
 
 
@@ -90,6 +103,11 @@ class Type_handler_real_result: public Type_handler
   Item_result result_type() const { return REAL_RESULT; }
   Item_result cmp_type() const { return REAL_RESULT; }
   virtual ~Type_handler_real_result() {}
+  void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const;
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const;
 };
 
 
@@ -100,6 +118,11 @@ class Type_handler_decimal_result: public Type_handler
   Item_result cmp_type() const { return DECIMAL_RESULT; }
   virtual ~Type_handler_decimal_result() {};
   Field *make_num_distinct_aggregator_field(MEM_ROOT *, const Item *) const;
+  void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const;
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const;
 };
 
 
@@ -110,6 +133,11 @@ class Type_handler_int_result: public Type_handler
   Item_result cmp_type() const { return INT_RESULT; }
   virtual ~Type_handler_int_result() {}
   Field *make_num_distinct_aggregator_field(MEM_ROOT *, const Item *) const;
+  void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const;
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const;
 };
 
 
@@ -119,6 +147,11 @@ class Type_handler_temporal_result: public Type_handler
   Item_result result_type() const { return STRING_RESULT; }
   Item_result cmp_type() const { return TIME_RESULT; }
   virtual ~Type_handler_temporal_result() {}
+  void make_sort_key(uchar *to, Item *item,  const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const;
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const;
 };
 
 
@@ -131,6 +164,11 @@ class Type_handler_string_result: public Type_handler
   const Type_handler *
   type_handler_adjusted_to_max_octet_length(uint max_octet_length,
                                             CHARSET_INFO *cs) const;
+  void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const;
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const;
 };
 
 
@@ -526,6 +564,18 @@ class Type_handler_hybrid_field_type: public Type_handler
   {
     return m_type_handler->make_conversion_table_field(table, metadata, target);
   }
+  void make_sort_key(uchar *to, Item *item, const SORT_FIELD_ATTR *sort_field,
+                     Sort_param *param) const
+  {
+    m_type_handler->make_sort_key(to, item, sort_field, param);
+  }
+  void sortlength(THD *thd,
+                  const Type_std_attributes *item,
+                  SORT_FIELD_ATTR *attr) const
+  {
+    m_type_handler->sortlength(thd, item, attr);
+  }
+
 };