Bug #25451180 SPLIT ITEM_FUNC_SPATIAL_OPERATION

nryeng · nryeng · commit 3330929785e6 · 2017-02-16T09:39:21.000+01:00
Split class Item_func_spatial_operation into one class per SQL function
it computes. Preserve Item_func_spatial_operation as a base class that
contains only the GIS computations and val_int().

Add "m_" prefix to member variables of Item_func_spatial_operation.

Change BG_geometry_collection::merge_one_run() to take an
Item_func_st_union pointer as parameter, since that's the only spatial
operation used by this function.

Change-Id: I8e10ae0304898bd017023670eb19f4b70f4be395
diff --git a/sql/item_create.cc b/sql/item_create.cc
@@ -627,29 +627,6 @@ using Mbr_within_instantiator=
 using Mbr_crosses_instantiator=
   Mbr_rel_instantiator<Item_func::SP_CROSSES_FUNC>;
 
-template<Item_func_spatial_operation::op_type Op_type>
-class Spatial_instantiator
-{
-public:
-  static const uint Min_argcount= 2;
-  static const uint Max_argcount= 2;
-
-  Item *instantiate(THD *thd, PT_item_list *args)
-  {
-    return new (thd->mem_root)
-      Item_func_spatial_operation(POS(), (*args)[0], (*args)[1], Op_type);
-  }
-};
-
-using Intersection_instantiator=
-  Spatial_instantiator<Item_func_spatial_operation::op_intersection>;
-using Difference_instantiator=
-  Spatial_instantiator<Item_func_spatial_operation::op_difference>;
-using Union_instantiator=
-  Spatial_instantiator<Item_func_spatial_operation::op_union>;
-using Symdifference_instantiator=
-  Spatial_instantiator<Item_func_spatial_operation::op_symdifference>;
-
 
 template<Item_func::Functype Functype>
 using Spatial_rel_instantiator=
@@ -1778,7 +1755,7 @@ static const std::pair<const char *, Create_func *> func_array[]=
   { "ST_CONTAINS", SQL_FACTORY(St_contains_instantiator) },
   { "ST_CONVEXHULL", SQL_FN(Item_func_convex_hull, 1) },
   { "ST_CROSSES", SQL_FACTORY(St_crosses_instantiator) },
-  { "ST_DIFFERENCE", SQL_FACTORY(Difference_instantiator) },
+  { "ST_DIFFERENCE", SQL_FN(Item_func_st_difference, 2) },
   { "ST_DIMENSION", SQL_FN(Item_func_dimension, 1) },
   { "ST_DISJOINT", SQL_FACTORY(St_disjoint_instantiator) },
   { "ST_DISTANCE", SQL_FN_LIST(Item_func_distance, 2) },
@@ -1802,7 +1779,7 @@ static const std::pair<const char *, Create_func *> func_array[]=
   { "ST_GEOMFROMWKB", SQL_FACTORY(Geomfromwkb_instantiator) },
   { "ST_INTERIORRINGN", SQL_FACTORY(Sp_interiorringn_instantiator) },
   { "ST_INTERSECTS", SQL_FACTORY(St_intersects_instantiator) },
-  { "ST_INTERSECTION", SQL_FACTORY(Intersection_instantiator) },
+  { "ST_INTERSECTION", SQL_FN(Item_func_st_intersection, 2) },
   { "ST_ISCLOSED", SQL_FN(Item_func_isclosed, 1) },
   { "ST_ISEMPTY", SQL_FN(Item_func_isempty, 1) },
   { "ST_ISSIMPLE", SQL_FN(Item_func_issimple, 1) },
@@ -1843,10 +1820,10 @@ static const std::pair<const char *, Create_func *> func_array[]=
   { "ST_SIMPLIFY", SQL_FN(Item_func_simplify, 2) },
   { "ST_SRID", SQL_FACTORY(Srid_instantiator) },
   { "ST_STARTPOINT", SQL_FACTORY(Startpoint_instantiator) },
-  { "ST_SYMDIFFERENCE", SQL_FACTORY(Symdifference_instantiator) },
+  { "ST_SYMDIFFERENCE", SQL_FN(Item_func_st_symdifference, 2) },
   { "ST_SWAPXY", SQL_FN(Item_func_swap_xy, 1) },
   { "ST_TOUCHES", SQL_FACTORY(St_touches_instantiator) },
-  { "ST_UNION", SQL_FACTORY(Union_instantiator) },
+  { "ST_UNION", SQL_FN(Item_func_st_union, 2) },
   { "ST_VALIDATE", SQL_FN(Item_func_validate, 1) },
   { "ST_WITHIN", SQL_FACTORY(St_within_instantiator) },
   { "ST_X", SQL_FACTORY(X_instantiator) },
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
@@ -127,7 +127,7 @@ class BG_result_buf_mgr
 };
 
 
-class Item_func_spatial_operation;
+class Item_func_st_union;
 
 /**
   A utility class to flatten any hierarchy of geometry collection into one
@@ -197,7 +197,7 @@ class BG_geometry_collection
   void merge_components(bool *pnull_value);
 private:
   template<typename Coordsys>
-  bool merge_one_run(Item_func_spatial_operation *ifso,
+  bool merge_one_run(Item_func_st_union *ifsu,
                      bool *pnull_value);
   bool store_geometry(const Geometry *geo, bool break_multi_geom);
   Geometry *store(const Geometry *geo);
@@ -1064,9 +1064,25 @@ class Item_func_spatial_rel final : public Item_bool_func2
 /**
   Spatial operations
 */
-class Item_func_spatial_operation final : public Item_geometry_func
+class Item_func_spatial_operation : public Item_geometry_func
 {
+public:
+  String *val_str(String *) override;
+
 protected:
+  enum op_type
+  {
+    op_union= 0x10000000,
+    op_intersection= 0x20000000,
+    op_symdifference= 0x30000000,
+    op_difference= 0x40000000,
+  };
+
+  Item_func_spatial_operation(const POS &pos, Item *a, Item *b, op_type sp_op)
+    : Item_geometry_func(pos, a, b), m_spatial_op(sp_op)
+  {}
+
+private:
   // It will call the protected member functions in this class,
   // no data member accessed directly.
   template<typename Geotypes>
@@ -1089,9 +1105,6 @@ class Item_func_spatial_operation final : public Item_geometry_func
 
   Geometry *empty_result(String *str, uint32 srid);
 
-  String tmp_value1,tmp_value2;
-  BG_result_buf_mgr bg_resbuf_mgr;
-
   bool assign_result(Geometry *geo, String *result);
 
   template <typename Geotypes>
@@ -1118,34 +1131,56 @@ class Item_func_spatial_operation final : public Item_geometry_func
   Geometry *geocol_union(const BG_geometry_collection &bggc1,
                          const BG_geometry_collection &bggc2,
                          String *result);
-public:
-  enum op_type
-  {
-    op_shape= 0,
-    op_not= 0x80000000,
-    op_union= 0x10000000,
-    op_intersection= 0x20000000,
-    op_symdifference= 0x30000000,
-    op_difference= 0x40000000,
-    op_backdifference= 0x50000000,
-    op_any= 0x70000000
-  };
 
-  Item_func_spatial_operation(const POS &pos, Item *a, Item *b,
-                              Item_func_spatial_operation::op_type sp_op) :
-    Item_geometry_func(pos, a, b), spatial_op(sp_op)
-  {
-  }
-  virtual ~Item_func_spatial_operation();
-  String *val_str(String *) override;
-  const char *func_name() const override;
-  void print(String *str, enum_query_type query_type) override
-  {
-    Item_func::print(str, query_type);
-  }
-private:
-  op_type spatial_op;
+  op_type m_spatial_op;
   String m_result_buffer;
+  String m_tmp_value1;
+  String m_tmp_value2;
+  BG_result_buf_mgr m_bg_resbuf_mgr;
+};
+
+
+class Item_func_st_difference final : public Item_func_spatial_operation
+{
+public:
+  Item_func_st_difference(const POS &pos, Item *a, Item *b)
+    : Item_func_spatial_operation(pos, a, b, op_difference)
+  {}
+  const char *func_name() const override
+  { return "st_difference"; }
+};
+
+
+class Item_func_st_intersection final : public Item_func_spatial_operation
+{
+public:
+  Item_func_st_intersection(const POS &pos, Item *a, Item *b)
+    : Item_func_spatial_operation(pos, a, b, op_intersection)
+  {}
+  const char *func_name() const override
+  { return "st_intersection"; }
+};
+
+
+class Item_func_st_symdifference final : public Item_func_spatial_operation
+{
+public:
+  Item_func_st_symdifference(const POS &pos, Item *a, Item *b)
+    : Item_func_spatial_operation(pos, a, b, op_symdifference)
+  {}
+  const char *func_name() const override
+  { return "st_symdifference"; }
+};
+
+
+class Item_func_st_union final : public Item_func_spatial_operation
+{
+public:
+  Item_func_st_union(const POS &pos, Item *a, Item *b)
+    : Item_func_spatial_operation(pos, a, b, op_union)
+  {}
+  const char *func_name() const override
+  { return "st_union"; }
 };
 
 
diff --git a/sql/item_geofunc_internal.cc b/sql/item_geofunc_internal.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 
    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
@@ -163,8 +163,7 @@ merge_components(bool *pnull_value)
     return;
 
   POS pos;
-  Item_func_spatial_operation ifso(pos, NULL, NULL,
-                                   Item_func_spatial_operation::op_union);
+  Item_func_st_union ifsu(pos, NULL, NULL);
   bool do_again= true;
   uint32 last_composition[6]= {0}, num_unchanged_composition= 0;
   size_t last_num_geos= 0;
@@ -201,7 +200,7 @@ merge_components(bool *pnull_value)
   */
   while (!*pnull_value && do_again)
   {
-    do_again= merge_one_run<Coordsys>(&ifso, pnull_value);
+    do_again= merge_one_run<Coordsys>(&ifsu, pnull_value);
     if (!*pnull_value && do_again)
     {
       const size_t num_geos= m_geos.size();
@@ -392,13 +391,13 @@ class Rtree_entry_compare
 
   @tparam Coordsys Coordinate system type, specified using those defined in
           boost::geometry::cs.
-  @param ifso the Item_func_spatial_operation object, we here rely on it to
+  @param ifsu the Item_func_spatial_operation object, we here rely on it to
          do union operation.
   @param[out] pnull_value takes back null_value set during the operation.
   @return whether need another call of this function.
  */
 template<typename Coordsys>
-bool BG_geometry_collection::merge_one_run(Item_func_spatial_operation *ifso,
+bool BG_geometry_collection::merge_one_run(Item_func_st_union *ifsu,
                                            bool *pnull_value)
 {
   Geometry *gres= NULL;
@@ -538,9 +537,9 @@ bool BG_geometry_collection::merge_one_run(Item_func_spatial_operation *ifso,
           break;
         }
 
-        gres= ifso->bg_geo_set_op<Coordsys>(*i, geom2,
+        gres= ifsu->bg_geo_set_op<Coordsys>(*i, geom2,
                                                         &wkbres);
-        null_value= ifso->null_value;
+        null_value= ifsu->null_value;
 
         if (null_value)
         {
diff --git a/sql/item_geofunc_setops.cc b/sql/item_geofunc_setops.cc
