WL#8579 Spatial Reference Systems

Add a data dictionary table, objects and cache for spatial reference
systems.

Add geographic (2d) and projected (based on geographic 2d) spatial
reference system definitions from the EPSG Geodetic Parameter Dataset,
version 8.7.

Issue a warning if the SRID refers to an undefined spatial reference
system in functions MBRCONTAINS, MBRCOVEREDBY, MBRCOVERS, MBRDISJOINT,
MBREQUALS, MBRINTERSECTS, MBROVERLAPS, MBRTOUCHES, MBRWITHIN, ST_AREA,
ST_BUFFER, ST_CENTROID, ST_CONTAINS, ST_CONVEXHULL, ST_CROSSES,
ST_DIFFERENCE, ST_DISJOINT, ST_DISTANCE, ST_ENVELOPE, ST_EQUALS,
ST_INTERSECTION, ST_INTERSECTS, ST_ISSIMPLE, ST_LENGTH, ST_OVERLAPS,
ST_SIMPLIFY, ST_SYMDIFFERENCE, ST_TOUCHES, ST_UNION and ST_WITHIN.

Issue an error if the SRID refers to an undefined spatial reference
system in functions ST_ISVALID, ST_MAKEENVELOPE and ST_VALIDATE.

Author: nryeng

client/upgrade/program.cc

@@ -27,6 +27,7 @@
 #include "my_default.h"
 #include "check/mysqlcheck.h"
 #include "../scripts/mysql_fix_privilege_tables_sql.c"
+#include "../scripts/sql_commands_system_tables_data_fix.h"
 #include "../scripts/sql_commands_sys_schema.h"
 
 #include "base/abstract_connection_program.h"
@@ -211,6 +212,11 @@ class Program : public Base::Abstract_connection_program
       return EXIT_UPGRADING_QUERIES_ERROR;
     }
 
+    if (this->run_commands_system_tables_data_fix() != 0)
+    {
+      return EXIT_UPGRADING_QUERIES_ERROR;
+    }
+
     if (this->m_upgrade_systables_only == false)
     {
       this->print_verbose_message("Checking system database.");
@@ -609,6 +615,42 @@ class Program : public Base::Abstract_connection_program
     return 0;
   }
 
+  /**
+    Update system table data
+
+    @retval 0 Success
+    @retval non-zero Error
+  */
+  int run_commands_system_tables_data_fix()
+  {
+    const char **query_ptr;
+    int result;
+
+    Mysql_query_runner runner(*this->m_query_runner);
+    Instance_callback<int64, const Mysql_query_runner::Row&, Program>
+      result_cb(this, &Program::result_callback);
+    Instance_callback<int64, const Message_data&, Program>
+      message_cb(this, &Program::fix_privilage_tables_error);
+
+    runner.add_result_callback(&result_cb);
+    runner.add_message_callback(&message_cb);
+
+    this->print_verbose_message("Upgrading system table data.");
+
+    for (query_ptr= &mysql_system_tables_data_fix[0];
+         *query_ptr != NULL;
+         query_ptr++)
+    {
+      result= runner.run_query(*query_ptr);
+      if (!this->m_ignore_errors && result != 0)
+      {
+        return result;
+      }
+    }
+
+    return 0;
+  }
+
   /**
     Update the sys schema
    */

libmysqld/CMakeLists.txt

@@ -106,6 +106,8 @@ SET(LIBMYSQLD_BOOST_SOURCES
   ../sql/debug_sync.cc
   ../sql/handler.cc
   ../sql/geometry_rtree.cc
+  ../sql/gis/srs/srs.cc
+  ../sql/gis/srs/wkt_parser.cc
   ../sql/item_geofunc.cc
   ../sql/item_geofunc_buffer.cc
   ../sql/item_geofunc_internal.cc
@@ -161,6 +163,26 @@ IF(HAVE_UNDEF)
     COMPILE_FLAGS "-Wno-undef")
 ENDIF()
 
+# Boost source compares signed and unsigned integer expressions
+MY_CHECK_CXX_COMPILER_FLAG("-Wsign-compare" HAVE_SIGN_COMPARE)
+IF(HAVE_SIGN_COMPARE)
+  ADD_COMPILE_FLAGS(
+    ../sql/gis/srs/wkt_parser.cc
+    COMPILE_FLAGS "-Wno-sign-compare"
+  )
+ENDIF()
+
+# Set -O1 on Solaris x86 to avoid exhausting virtual memory when
+# compiling
+IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_SYSTEM_NAME MATCHES "SunOS")
+  IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i386")
+    ADD_COMPILE_FLAGS(
+      ../sql/gis/srs/wkt_parser.cc
+      COMPILE_FLAGS "-O1"
+    )
+  ENDIF()
+ENDIF()
+
 # Boost source use auto_ptr, deprecated in C++11
 MY_CHECK_CXX_COMPILER_FLAG("-Wdeprecated-declarations"
                            HAVE_DEPRECATED_DECLARATIONS)

mysql-test/r/dd_schema_definition_ci.result

@@ -1288,13 +1288,13 @@ ST_ISVALID(ST_GEOMFROMTEXT('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(POINT(0 0)))')
 #
 SELECT ST_ASTEXT(ST_MAKEENVELOPE(ST_GEOMFROMTEXT('POINT(0 1)', 4236),
 ST_GEOMFROMTEXT('POINT(0 0)', 0)));
-ERROR HY000: Incorrect arguments to st_makeenvelope
+ERROR HY000: Binary geometry function st_makeenvelope given two geometries of different srids: 4236 and 0, which should have been identical.
 SELECT ST_ASTEXT(ST_MAKEENVELOPE(ST_GEOMFROMTEXT('POINT(0 1)', 1),
 ST_GEOMFROMTEXT('POINT(0 0)', 0)));
-ERROR HY000: Incorrect arguments to st_makeenvelope
+ERROR HY000: Binary geometry function st_makeenvelope given two geometries of different srids: 1 and 0, which should have been identical.
 SELECT ST_ASTEXT(ST_MAKEENVELOPE(ST_GEOMFROMTEXT('POINT(0 1)', 0),
 ST_GEOMFROMTEXT('POINT(0 0)', 100)));
-ERROR HY000: Incorrect arguments to st_makeenvelope
+ERROR HY000: Binary geometry function st_makeenvelope given two geometries of different srids: 0 and 100, which should have been identical.
 #
 # Bug #20085563  ASSERTION `!NULL_VALUE && OPDONE && STR_VALUE_ARG->LENGTH() > 0' FAILED
 #
@@ -1566,9 +1566,9 @@ result
 SELECT ST_ISVALID(ST_GEOMFROMTEXT('POINT(0 0)', -1));
 ERROR 22003: SRID value is out of range in 'st_geomfromtext'
 SELECT ST_ISVALID(ST_GEOMFROMTEXT('POINT(0 0)', 1));
-ERROR HY000: Incorrect arguments to st_isvalid
+ERROR SR001: Function st_isvalid is only defined for Cartesian spatial reference systems, but one of its arguments is in SRID 1, which has not been defined.
 SELECT ST_ISVALID(ST_GEOMFROMTEXT('POINT(0 0)', 1000));
-ERROR HY000: Incorrect arguments to st_isvalid
+ERROR SR001: Function st_isvalid is only defined for Cartesian spatial reference systems, but one of its arguments is in SRID 1000, which has not been defined.
 #
 # Bug#20406850 WL#8034 : CRASH WITH ST_ISVAID() IN ITEM_FUNC_ISVALID::VAL_INT FUNCTION
 #

mysql-test/r/dd_schema_definition_cs.result

@@ -1332,6 +1332,8 @@ FROM named_places
 WHERE name = 'Goose Island';
 ST_AsText(ST_Envelope(boundary))
 POLYGON((59 13,67 13,67 18,59 18,59 13))
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_envelope will be done in SRID 0.
 # Conformance Item T15 
 SELECT ST_X(position) 
 FROM bridges 
@@ -1362,6 +1364,8 @@ FROM road_segments
 WHERE fid = 106;
 ST_Length(centerline)
 26
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_length will be done in SRID 0.
 # Conformance Item T22 
 SELECT ST_NumPoints(centerline) 
 FROM road_segments 
@@ -1380,12 +1384,16 @@ FROM named_places
 WHERE name = 'Goose Island';
 ST_AsText(ST_Centroid(boundary))
 POINT(63 15.5)
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_centroid will be done in SRID 0.
 # Conformance Item T26 
 SELECT ST_Area(boundary) 
 FROM named_places 
 WHERE name = 'Goose Island';
 ST_Area(boundary)
 40
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_area will be done in SRID 0.
 # Conformance Item T27 
 SELECT ST_AsText(ST_ExteriorRing(shore)) 
 FROM lakes 
@@ -1428,18 +1436,24 @@ FROM divided_routes
 WHERE name = 'Route 75';
 ST_Length(centerlines)
 96
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_length will be done in SRID 0.
 # Conformance Item T34 
 SELECT ST_AsText(ST_Centroid(shores)) 
 FROM ponds 
 WHERE fid = 120;
 ST_AsText(ST_Centroid(shores))
 POINT(25 42)
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_centroid will be done in SRID 0.
 # Conformance Item T36 
 SELECT ST_Area(shores) 
 FROM ponds 
 WHERE fid = 120;
 ST_Area(shores)
 8
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_area will be done in SRID 0.
 # Conformance Item T37 
 SELECT ST_Equals(boundary,
 ST_PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',101))
@@ -1448,6 +1462,8 @@ WHERE name = 'Goose Island';
 ST_Equals(boundary,
 ST_PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',101))
 1
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_equals will be done in SRID 0.
 SELECT ST_Equals(boundary,
 ST_PolyFromText('POLYGON( ( 67 13, 67 18, 59 18, 59 13, 67 13) )',1))
 FROM named_places
@@ -1460,67 +1476,89 @@ WHERE divided_routes.name = 'Route 75'
 AND named_places.name = 'Ashton';
 ST_Disjoint(centerlines, boundary)
 1
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_disjoint will be done in SRID 0.
 # Conformance Item T39 
 SELECT ST_Touches(centerline, shore) 
 FROM streams, lakes 
 WHERE streams.name = 'Cam Stream' 
 AND lakes.name = 'Blue Lake';
 ST_Touches(centerline, shore)
 1
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_touches will be done in SRID 0.
 # Conformance Item T42
 SELECT ST_Crosses(road_segments.centerline, divided_routes.centerlines)
 FROM road_segments, divided_routes 
 WHERE road_segments.fid = 102 
 AND divided_routes.name = 'Route 75';
 ST_Crosses(road_segments.centerline, divided_routes.centerlines)
 1
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_crosses will be done in SRID 0.
 # Conformance Item T43 
 SELECT ST_Intersects(road_segments.centerline, divided_routes.centerlines) 
 FROM road_segments, divided_routes 
 WHERE road_segments.fid = 102 
 AND divided_routes.name = 'Route 75';
 ST_Intersects(road_segments.centerline, divided_routes.centerlines)
 1
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_intersects will be done in SRID 0.
 # Conformance Item T44 
 SELECT ST_Contains(forests.boundary, named_places.boundary) 
 FROM forests, named_places 
 WHERE forests.name = 'Green Forest' 
 AND named_places.name = 'Ashton';
 ST_Contains(forests.boundary, named_places.boundary)
 0
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_contains will be done in SRID 0.
 # Conformance Item T46 
 SELECT ST_Distance(position, boundary) 
 FROM bridges, named_places 
 WHERE bridges.name = 'Cam Bridge' 
 AND named_places.name = 'Ashton';
 ST_Distance(position, boundary)
 12
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_distance will be done in SRID 0.
 # Conformance Item T48 
 SELECT ST_AsText(ST_Difference(named_places.boundary, forests.boundary)) 
 FROM named_places, forests 
 WHERE named_places.name = 'Ashton' 
 AND forests.name = 'Green Forest';
 ST_AsText(ST_Difference(named_places.boundary, forests.boundary))
 POLYGON((84 42,84 48,62 48,56 34,84 42))
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_difference will be done in SRID 0.
 SELECT ST_AsText(ST_Union(shore, boundary)) 
 FROM lakes, named_places 
 WHERE lakes.name = 'Blue Lake' 
 AND named_places.name = 'Goose Island';
 ST_AsText(ST_Union(shore, boundary))
 POLYGON((52 18,48 6,73 9,66 23,52 18))
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_union will be done in SRID 0.
 # Conformance Item T50 
 SELECT ST_AsText(ST_SymDifference(shore, boundary)) 
 FROM lakes, named_places 
 WHERE lakes.name = 'Blue Lake' 
 AND named_places.name = 'Ashton';
 ST_AsText(ST_SymDifference(shore, boundary))
 MULTIPOLYGON(((52 18,48 6,73 9,66 23,52 18),(59 18,67 18,67 13,59 13,59 18)),((62 48,56 34,56 30,84 30,84 48,62 48)))
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_symdifference will be done in SRID 0.
 # Conformance Item T51 
 SELECT count(*) 
 FROM buildings, bridges 
 WHERE ST_Contains(ST_Buffer(bridges.position, 15.0), buildings.footprint) = 1;
 count(*)
 1
+Warnings:
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_buffer will be done in SRID 0.
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_contains will be done in SRID 0.
+Warning	3519	There's no spatial reference system with SRID 101. Calculations in function st_contains will be done in SRID 0.
 DROP DATABASE gis_ogs;
 #
 # Bug#13362660 ASSERTION `FIELD_POS < FIELD_COUNT' FAILED. IN PROTOCOL_TEXT::STORE

mysql-test/r/gis-precise.result

@@ -1762,6 +1762,7 @@ user	MyISAM
 Checking if update is needed.
 Checking server version.
 Running queries to upgrade MySQL server.
+Upgrading system table data.
 Checking system database.
 mysql.column_stats                                 OK
 mysql.columns_priv                                 OK

mysql-test/r/gis.result

@@ -1769,3 +1769,30 @@ LINESTRING(POINT(1, 1))
 ST_LongFromGeoHash(UpdateXML(1, NULL, NULL))
 );
 ERROR 22023: Invalid GIS data provided to function linestring.
+#
+# WL#8579 Spatial Reference Systems
+#
+# SRID 0 (should pass)
+SELECT ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 0), 10);
+ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 0), 10)
+s000000000
+# Projected SRS (should pass)
+SELECT ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 2000), 10);
+ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 2000), 10)
+s000000000
+# Geographic SRS (should pass)
+SELECT ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 4326), 10);
+ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 4326), 10)
+s000000000
+# Undefined SRS (should pass)
+SELECT ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 19000000), 10);
+ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 19000000), 10)
+s000000000
+# Unparseable SRS definition (should pass)
+INSERT INTO mysql.st_spatial_reference_systems(id, catalog_id, name,
+organization, organization_coordsys_id, definition, description)
+VALUES (11111111, 1, 'TEST11111111', 'Foo', 11111111, 'FOOBAR', '');
+SELECT ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 11111111), 10);
+ST_GEOHASH(ST_GEOMFROMTEXT('POINT(0 0)', 11111111), 10)
+s000000000
+DELETE FROM mysql.st_spatial_reference_systems WHERE id = 11111111;