MDEV-35126 Wrong results from st_isvalid for multipolygon.

The Gis_polygon::is_valid() and the Gis_multi_polygon::is_valid() implemented with precise geometry engine.

Author: Alexey Botchkov

mysql-test/main/spatial_utility_function_isvalid.result

@@ -404,3 +404,42 @@ create or replace table tb1 as SELECT st_validate(POINTFROMTEXT(' POINT( 4 1 )
 create or replace table tb1 as SELECT st_validate(ST_GeomFromText (' linestring( 4 1,4 4 ) ')) a;
 create table tb2 as SELECT (st_validate (ST_collect(( POINTFROMTEXT(' POINT( 4 1 ) ') )) )) a;
 drop table tb1, tb2;
+########################################################################
+# MDEV-35126 Wrong results from st_isvalid or st_validate function, while using multipolygon.
+########################################################################
+select ST_isvalid(ST_GEOMFROMTEXT('multipolygon(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)), ((59 18,67 18,67 13,59 13,59 18)))'));
+ST_isvalid(ST_GEOMFROMTEXT('multipolygon(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)), ((59 18,67 18,67 13,59 13,59 18)))'))
+1
+select ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 6 0, 1 2, 0 0)), (( 7 7, 1 8, 7 0, 7 7 ))) '));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 6 0, 1 2, 0 0)), (( 7 7, 1 8, 7 0, 7 7 ))) '))
+1
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((70 50, 80 50, 80 60, 70 60, 70 50)))'));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((70 50, 80 50, 80 60, 70 60, 70 50)))'))
+0
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((90 50, 100 50, 100 60, 90 60, 90 50)))'));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((90 50, 100 50, 100 60, 90 60, 90 50)))'))
+0
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((60 20, 70 20, 70 30, 60 30, 60 20)))'));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((60 20, 70 20, 70 30, 60 30, 60 20)))'))
+1
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 80 200, 110 210, 140 270, 70 280, 40 250, 60 220, 80 200)), (( 120 210, 160 260, 140 260, 120 210)))'));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 80 200, 110 210, 140 270, 70 280, 40 250, 60 220, 80 200)), (( 120 210, 160 260, 140 260, 120 210)))'))
+1
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 80 200, 110 210, 140 270, 70 280, 40 250, 60 220, 80 200)), (( 90 220, 110 240, 60 250, 90 220)))'));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 80 200, 110 210, 140 270, 70 280, 40 250, 60 220, 80 200)), (( 90 220, 110 240, 60 250, 90 220)))'))
+0
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 5 5, 5 0, 0 5, 0 0)), (( 2 0, 3 0, 2 1, 2 0 ))) '));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 5 5, 5 0, 0 5, 0 0)), (( 2 0, 3 0, 2 1, 2 0 ))) '))
+0
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 3 0, 0 3, 0 0)), (( 3 0, 3 3, 0 3, 3 0))) '));
+ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 3 0, 0 3, 0 0)), (( 3 0, 3 3, 0 3, 3 0))) '))
+0
+SELECT ST_IsValid(ST_GEOMFROMTEXT(' POLYGON( ( 0 0, 0 0, 8 0, 0 0 ) ) '));
+ST_IsValid(ST_GEOMFROMTEXT(' POLYGON( ( 0 0, 0 0, 8 0, 0 0 ) ) '))
+0
+SELECT ST_IsValid(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( ( 2 2, 2 8, 8 8, 8 2, 2 2 ), ( 4 4, 4 6, 6 6, 6 4, 4 4 ) ), ( ( 2 2, 1 2, 0 5, 2 9, 2 2 ) ) ) ')) c;
+c
+0
+SELECT ST_IsValid(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( (2 2, 2 4, 4 4, 4 2, 2 2) ), ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) '));
+ST_IsValid(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( (2 2, 2 4, 4 4, 4 2, 2 2) ), ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) '))
+0

mysql-test/main/spatial_utility_function_isvalid.test

@@ -387,3 +387,31 @@ create or replace table tb1 as SELECT st_validate(POINTFROMTEXT(' POINT( 4 1 )
 create or replace table tb1 as SELECT st_validate(ST_GeomFromText (' linestring( 4 1,4 4 ) ')) a;
 create table tb2 as SELECT (st_validate (ST_collect(( POINTFROMTEXT(' POINT( 4 1 ) ') )) )) a;
 drop table tb1, tb2;
+
+--echo ########################################################################
+--echo # MDEV-35126 Wrong results from st_isvalid or st_validate function, while using multipolygon.
+--echo ########################################################################
+select ST_isvalid(ST_GEOMFROMTEXT('multipolygon(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)), ((59 18,67 18,67 13,59 13,59 18)))'));
+
+select ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 6 0, 1 2, 0 0)), (( 7 7, 1 8, 7 0, 7 7 ))) '));
+
+# Concave shapes are not well-supported. This is correctly marked as invalid.
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((70 50, 80 50, 80 60, 70 60, 70 50)))'));
+
+# Concave shapes are not well-supported. This is correctly marked as invalid.
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((90 50, 100 50, 100 60, 90 60, 90 50)))'));
+
+# Concave shapes are not well-supported. This is incorrectly marked as invalid.
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 40 40, 80 40, 100 0, 120 40, 160 40, 130 70, 150 110, 100 90, 50 110, 70 70, 40 40)), ((60 20, 70 20, 70 30, 60 30, 60 20)))'));
+
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 80 200, 110 210, 140 270, 70 280, 40 250, 60 220, 80 200)), (( 120 210, 160 260, 140 260, 120 210)))'));
+
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 80 200, 110 210, 140 270, 70 280, 40 250, 60 220, 80 200)), (( 90 220, 110 240, 60 250, 90 220)))'));
+
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 5 5, 5 0, 0 5, 0 0)), (( 2 0, 3 0, 2 1, 2 0 ))) '));
+SELECT ST_isvalid(ST_GEOMFROMTEXT(' MULTIPOLYGON((( 0 0, 3 0, 0 3, 0 0)), (( 3 0, 3 3, 0 3, 3 0))) '));
+
+SELECT ST_IsValid(ST_GEOMFROMTEXT(' POLYGON( ( 0 0, 0 0, 8 0, 0 0 ) ) '));
+SELECT ST_IsValid(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( ( 2 2, 2 8, 8 8, 8 2, 2 2 ), ( 4 4, 4 6, 6 6, 6 4, 4 4 ) ), ( ( 2 2, 1 2, 0 5, 2 9, 2 2 ) ) ) ')) c;
+SELECT ST_IsValid(ST_GEOMFROMTEXT(' MULTIPOLYGON( ( (2 2, 2 4, 4 4, 4 2, 2 2) ), ( (3 5, 2 5, 2 4, 3 4, 3 5) ) ) '));
+

sql/gcalc_slicescan.h

@@ -252,6 +252,7 @@ class Gcalc_heap : public Gcalc_dyn_list
 #endif /*GCALC_CHECK_WITH_FLOAT*/
  double coord_extent;
  Gcalc_dyn_list::Item **get_cur_hook() { return m_hook; }
+ int get_n_points() const { return m_n_points; }
 
 private:
  Gcalc_dyn_list::Item *m_first;

sql/gcalc_tools.cc

@@ -131,7 +131,7 @@ int Gcalc_function::count_internal(const char *cur_func, uint set_type,
  uint n_ops= c_op & ~(op_any | op_not | v_mask);
  uint n_shape= c_op & ~(op_any | op_not | v_mask); /* same as n_ops */
  op_type v_state= (op_type) (c_op & v_mask);
- int result= 0;
+ int result= 0, t_counter;
  const char *sav_cur_func= cur_func;
 
  // GCALC_DBUG_ENTER("Gcalc_function::count_internal");
@@ -175,6 +175,11 @@ int Gcalc_function::count_internal(const char *cur_func, uint set_type,
  //GCALC_DBUG_RETURN(mask);
 
  result= count_internal(cur_func, set_type, &cur_func);
+ if (next_func == op_any_intersection)
+ {
+ t_counter= result == result_true;
+ result= result_false;
+ }
 
  while (--n_ops)
  {
@@ -211,6 +216,10 @@ int Gcalc_function::count_internal(const char *cur_func, uint set_type,
  else
  result= result_true;
  break;
+ case op_any_intersection:
+ t_counter+= next_res == result_true;
+ result= (t_counter > 1) ? result_true : result_false;
+ break;
  default:
  GCALC_DBUG_ASSERT(FALSE);
  };

sql/gcalc_tools.h

@@ -30,6 +30,7 @@
  op_intersection ( A && B && C ... )
  op_symdifference ( A+B+C+... == 1 )
  op_difference ( A && !(B||C||..))
+ op_any_intersection ( A && B || A && C || ... || B && C ... )
  with the calls of the add_operation(operation, n_operands) method.
  The relation is calculated over a set of shapes, that in turn have
  to be added with the add_new_shape() method. All the 'shapes' can
@@ -55,23 +56,24 @@ class Gcalc_function
  enum op_type
  {
  v_empty= 0x00000000,
- v_find_t= 0x01000000,
- v_find_f= 0x02000000,
- v_t_found= 0x03000000,
- v_f_found= 0x04000000,
- v_mask= 0x07000000,
-
- op_not= 0x80000000,
- op_shape= 0x00000000,
- op_union= 0x10000000,
- op_intersection= 0x20000000,
- op_symdifference= 0x30000000,
- op_difference= 0x40000000,
- op_repeat= 0x50000000,
- op_border= 0x60000000,
- op_internals= 0x70000000,
- op_false= 0x08000000,
- op_any= 0x78000000 /* The mask to get any of the operations */
+ v_find_t= 0x00100000,
+ v_find_f= 0x00200000,
+ v_t_found= 0x00300000,
+ v_f_found= 0x00400000,
+ v_mask= 0x00700000,
+
+ op_not= 0x80000000,
+ op_shape= 0x00000000,
+ op_union= 0x10000000,
+ op_intersection= 0x20000000,
+ op_symdifference= 0x30000000,
+ op_difference= 0x40000000,
+ op_repeat= 0x50000000,
+ op_border= 0x60000000,
+ op_internals= 0x70000000,
+ op_false= 0x08000000,
+ op_any_intersection= 0x07000000,
+ op_any= 0x7F000000 /* The mask to get any of the operations */
  };
  enum shape_type
  {
@@ -144,7 +146,7 @@ class Gcalc_operation_transporter : public Gcalc_shape_transporter
  gcalc_shape_info m_si;
 public:
  Gcalc_operation_transporter(Gcalc_function *fn, Gcalc_heap *heap) :
- Gcalc_shape_transporter(heap), m_fn(fn) {}
+ Gcalc_shape_transporter(heap), m_fn(fn), m_si(0) {}
 
  int single_point(double x, double y) override;
  int start_line() override;

sql/gstream.h

@@ -35,9 +35,18 @@ class Gis_read_stream
  };
 
  Gis_read_stream(CHARSET_INFO *charset, const char *buffer, int size)
- :m_cur(buffer), m_limit(buffer + size), m_err_msg(NULL), m_charset(charset)
+ : m_wkt(buffer)
+ , m_cur(buffer)
+ , m_limit(buffer + size)
+ , m_err_msg(NULL)
+ , m_charset(charset)
  {}
- Gis_read_stream(): m_cur(NullS), m_limit(NullS), m_err_msg(NullS)
+
+ Gis_read_stream()
+ : m_wkt(NullS)
+ , m_cur(NullS)
+ , m_limit(NullS)
+ , m_err_msg(NullS)
  {}
  ~Gis_read_stream()
  {
@@ -82,7 +91,13 @@ class Gis_read_stream
  return err_msg;
  }
 
+ const char *get_wkt() const
+ {
+ return m_wkt;
+ }
+
 protected:
+ const char *const m_wkt;
  const char *m_cur;
  const char *m_limit;
  char *m_err_msg;