[MDEV-19972] Move GIS code from Item_bool_func::get_full_func_mm_tree() to Item_func_spatial_rel::get_mm_leaf() - Jira

Details

Type: Task
Status: Closed (View Workflow)
Priority: Major
Resolution: Fixed
Fix Version/s: 10.5.0
Component/s: Data types, GIS
Labels:
None

Description

Item_bool_func::get_full_func_mm_tree() has the following code blocks:

#ifdef HAVE_SPATIAL

  const Type_handler_geometry *sav_geom_type= NULL;

  Field_geom *field_geom= dynamic_cast<Field_geom*>(field_item->field);

  if (field_geom)

    sav_geom_type= field_geom->type_handler_geom();

    /* We have to be able to store all sorts of spatial features here */

    field_geom->set_type_handler(&type_handler_geometry);

#endif /*HAVE_SPATIAL*/

and

#ifdef HAVE_SPATIAL

  if (field_geom)

    DBUG_ASSERT(sav_geom_type);

    field_geom->set_type_handler(sav_geom_type);

#endif /*HAVE_SPATIAL*/

This code here prevents moving GIS implementation into a data type plugin. The server code should at the end know nothing about Field_geom and type_handler_geometry.

Let's move this code inside Item_func_spatial_rel::get_mm_leaf(), so the Field_geom's type handler is changed just before the call for save_in_field_no_warnings() and restore it immediately after this.

The new code in Item_func_spatial_rel::get_mm_leaf() will look like this:

  Field_geom *field_geom= dynamic_cast<Field_geom*>(field);

  DBUG_ASSERT(field_geom);

  const Type_handler_geometry *sav_geom_type= field_geom->type_handler_geom();

  // We have to be able to store all sorts of spatial features here

  field_geom->set_type_handler(&type_handler_geometry);

  bool rc= value->save_in_field_no_warnings(field, 1);

  field_geom->set_type_handler(sav_geom_type);

  if (rc)

    DBUG_RETURN(&sel_arg_impossible);

Attachments

Issue Links

blocks

MDEV-4912 Data type plugin API version 1

Closed

Activity

Ascending order - Click to sort in descending order

Alexander Barkov created issue - 2019-07-05 16:51

Alexander Barkov made changes - 2019-07-05 16:51

Field	Original Value	New Value
Link		This issue blocks ~~MDEV-4912~~ [ ~~MDEV-4912~~ ]

Alexander Barkov made changes - 2019-07-05 16:52

Description

Item_bool_func::get_full_func_mm_tree() has the following code blocks:

{code:cpp}
#ifdef HAVE_SPATIAL
  const Type_handler_geometry *sav_geom_type= NULL;
  Field_geom *field_geom= dynamic_cast<Field_geom*>(field_item->field);
  if (field_geom)
  {
    sav_geom_type= field_geom->type_handler_geom();
    /* We have to be able to store all sorts of spatial features here */
    field_geom->set_type_handler(&type_handler_geometry);
  }
#endif /*HAVE_SPATIAL*/
{code}
and
{code:cpp}
#ifdef HAVE_SPATIAL
  if (field_geom)
  {
    DBUG_ASSERT(sav_geom_type);
    field_geom->set_type_handler(sav_geom_type);
  }
#endif /*HAVE_SPATIAL*/
{code}

This code here prevents moving GIS implementation into data type plugin. The server code should at the end know nothing about {{Field_geom}} and {{type_handler_geometry}}.

Let's move this code inside {{Item_func_spatial_rel::get_mm_leaf()}}, so the Field_geom's type handler is changed just before the call for {{save_in_field_no_warnings()}} and restore it immediately after this.

The new code in {{Item_func_spatial_rel::get_mm_leaf()}} will look like this:

{code:cpp}
  Field_geom *field_geom= dynamic_cast<Field_geom*>(field);
  DBUG_ASSERT(field_geom);
  const Type_handler_geometry *sav_geom_type= field_geom->type_handler_geom();
  // We have to be able to store all sorts of spatial features here
  field_geom->set_type_handler(&type_handler_geometry);
  bool rc= value->save_in_field_no_warnings(field, 1);
  field_geom->set_type_handler(sav_geom_type);
  if (rc)
    DBUG_RETURN(&sel_arg_impossible);
{code}

Item_bool_func::get_full_func_mm_tree() has the following code blocks:

{code:cpp}
#ifdef HAVE_SPATIAL
  const Type_handler_geometry *sav_geom_type= NULL;
  Field_geom *field_geom= dynamic_cast<Field_geom*>(field_item->field);
  if (field_geom)
  {
    sav_geom_type= field_geom->type_handler_geom();
    /* We have to be able to store all sorts of spatial features here */
    field_geom->set_type_handler(&type_handler_geometry);
  }
#endif /*HAVE_SPATIAL*/
{code}
and
{code:cpp}
#ifdef HAVE_SPATIAL
  if (field_geom)
  {
    DBUG_ASSERT(sav_geom_type);
    field_geom->set_type_handler(sav_geom_type);
  }
#endif /*HAVE_SPATIAL*/
{code}

This code here prevents moving GIS implementation into a data type plugin. The server code should at the end know nothing about {{Field_geom}} and {{type_handler_geometry}}.

Let's move this code inside {{Item_func_spatial_rel::get_mm_leaf()}}, so the Field_geom's type handler is changed just before the call for {{save_in_field_no_warnings()}} and restore it immediately after this.

The new code in {{Item_func_spatial_rel::get_mm_leaf()}} will look like this:

{code:cpp}
  Field_geom *field_geom= dynamic_cast<Field_geom*>(field);
  DBUG_ASSERT(field_geom);
  const Type_handler_geometry *sav_geom_type= field_geom->type_handler_geom();
  // We have to be able to store all sorts of spatial features here
  field_geom->set_type_handler(&type_handler_geometry);
  bool rc= value->save_in_field_no_warnings(field, 1);
  field_geom->set_type_handler(sav_geom_type);
  if (rc)
    DBUG_RETURN(&sel_arg_impossible);
{code}

Alexander Barkov made changes - 2019-07-05 16:53

Fix Version/s		10.5.0 [ 23709 ]
Fix Version/s	10.5 [ 23123 ]
Resolution		Fixed [ 1 ]
Status	Open [ 1 ]	Closed [ 6 ]

Sergei Golubchik made changes - 2021-12-06 21:24

Workflow

MariaDB v3 [ 98048 ]

MariaDB v4 [ 134030 ]

People

Assignee:: Alexander Barkov

Reporter:: Alexander Barkov

Votes:: 0 Vote for this issue

Watchers:: 1 Start watching this issue

Dates

Created:: 2019-07-05 16:51

Updated:: 2019-07-05 17:00

Resolved:: 2019-07-05 16:53

Git Integration

Error rendering 'com.xiplink.jira.git.jira_git_plugin:git-issue-webpanel'. Please contact your Jira administrators.

MariaDB Server

Details

Description

Attachments

Issue Links

Activity

People

Dates

Git Integration