Changeset: fab0ae3e09ea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fab0ae3e09ea
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geomBulk.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/wlr.c
Branch: malerrors
Log Message:
Another batch of SQLSTATE errors
diffs (truncated from 2428 to 300 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -117,12 +117,12 @@ transformPoint(GEOSGeometry **transforme
gcs_old = GEOSGeom_getCoordSeq(geosGeometry);
if (gcs_old == NULL)
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
/* create the coordinates sequence for the transformed geometry */
gcs_new = GEOSCoordSeq_create(1, coordinatesNum);
if (gcs_new == NULL)
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
/* create the transformed coordinates */
ret = transformCoordSeq(0, coordinatesNum, proj4_src, proj4_dst,
gcs_old, gcs_new);
@@ -135,7 +135,7 @@ transformPoint(GEOSGeometry **transforme
*transformedGeometry = GEOSGeom_createPoint(gcs_new);
if (*transformedGeometry == NULL) {
GEOSCoordSeq_destroy(gcs_new);
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
}
return MAL_SUCCEED;
@@ -155,16 +155,16 @@ transformLine(GEOSCoordSeq *gcs_new, con
gcs_old = GEOSGeom_getCoordSeq(geosGeometry);
if (gcs_old == NULL)
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
/* get the number of points in the geometry */
if (!GEOSCoordSeq_getSize(gcs_old, &pointsNum))
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSCoordSeq_getSize failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_getSize failed");
/* create the coordinates sequence for the transformed geometry */
*gcs_new = GEOSCoordSeq_create(pointsNum, coordinatesNum);
if (*gcs_new == NULL)
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSCoordSeq_create failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_create failed");
/* create the transformed coordinates */
for (i = 0; i < pointsNum; i++) {
@@ -195,7 +195,7 @@ transformLineString(GEOSGeometry **trans
*transformedGeometry = GEOSGeom_createLineString(coordSeq);
if (*transformedGeometry == NULL) {
GEOSCoordSeq_destroy(coordSeq);
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_createLineString failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGeom_createLineString failed");
}
return ret;
@@ -217,7 +217,7 @@ transformLinearRing(GEOSGeometry **trans
*transformedGeometry = GEOSGeom_createLinearRing(coordSeq);
if (*transformedGeometry == NULL) {
GEOSCoordSeq_destroy(coordSeq);
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_createLineString failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGeom_createLineString failed");
}
return ret;
@@ -236,7 +236,7 @@ transformPolygon(GEOSGeometry **transfor
exteriorRingGeometry = GEOSGetExteriorRing(geosGeometry);
if (exteriorRingGeometry == NULL) {
*transformedGeometry = NULL;
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGetExteriorRing failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGetExteriorRing failed");
}
ret = transformLinearRing(&transformedExteriorRingGeometry,
exteriorRingGeometry, proj4_src, proj4_dst);
@@ -277,7 +277,7 @@ transformPolygon(GEOSGeometry **transfor
if (*transformedGeometry == NULL) {
for (i = 0; i < numInteriorRings; i++)
GEOSGeom_destroy(transformedInteriorRingGeometries[i]);
- ret = createException(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_createPolygon failed");
+ ret = createException(MAL, "geom.Transform", "SQLSTATE 38000
!""Geos operation GEOSGeom_createPolygon failed");
}
GDKfree(transformedInteriorRingGeometries);
GEOSGeom_destroy(transformedExteriorRingGeometry);
@@ -295,16 +295,16 @@ transformMultiGeometry(GEOSGeometry **tr
geometriesNum = GEOSGetNumGeometries(geosGeometry);
if (geometriesNum == -1)
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGetNumGeometries failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGetNumGeometries failed");
transformedMultiGeometries = GDKmalloc(geometriesNum *
sizeof(GEOSGeometry *));
if (transformedMultiGeometries == NULL)
throw(MAL, "geom.Transform", "SQLSTATE HY001 !"MAL_MALLOC_FAIL);
for (i = 0; i < geometriesNum; i++) {
if ((multiGeometry = GEOSGetGeometryN(geosGeometry, i)) == NULL)
- ret = createException(MAL, "geom.Transform", "SQLSTATE
----- !""GEOSGetGeometryN failed");
+ ret = createException(MAL, "geom.Transform", "SQLSTATE
38000 !""Geos operation GEOSGetGeometryN failed");
else if ((subGeometryType = GEOSGeomTypeId(multiGeometry) + 1)
== 0)
- ret = createException(MAL, "geom.Transform", "SQLSTATE
----- !""GEOSGeomTypeId failed");
+ ret = createException(MAL, "geom.Transform", "SQLSTATE
38000 !""Geos operation GEOSGeomTypeId failed");
else {
switch (subGeometryType) {
case wkbPoint_mdb:
@@ -340,7 +340,7 @@ transformMultiGeometry(GEOSGeometry **tr
if (*transformedGeometry == NULL) {
for (i = 0; i < geometriesNum; i++)
GEOSGeom_destroy(transformedMultiGeometries[i]);
- ret = createException(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGeom_createCollection failed");
+ ret = createException(MAL, "geom.Transform", "SQLSTATE 38000
!""Geos operation GEOSGeom_createCollection failed");
}
GDKfree(transformedMultiGeometries);
@@ -434,7 +434,7 @@ wkbTransform(wkb **transformedWKB, wkb *
pj_free(proj4_src);
if (proj4_dst)
pj_free(proj4_dst);
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""pj_init
failed");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
pj_init failed");
}
/* get the geosGeometry from the wkb */
@@ -470,7 +470,7 @@ wkbTransform(wkb **transformedWKB, wkb *
GEOSSetSRID(transformedGeosGeometry, *srid_dst);
/* get the wkb */
if ((*transformedWKB = geos2wkb(transformedGeosGeometry)) ==
NULL)
- ret = createException(MAL, "geom.Transform", "SQLSTATE
----- !""geos2wkb failed");
+ ret = createException(MAL, "geom.Transform", "SQLSTATE
38000 !""Geos operation geos2wkb failed");
/* destroy the geos geometries */
GEOSGeom_destroy(transformedGeosGeometry);
}
@@ -491,21 +491,21 @@ forceDimCoordSeq(int idx, int coordinate
//get the coordinates
if (!GEOSCoordSeq_getX(gcs_old, idx, &x))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_getX failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_getX failed");
if (!GEOSCoordSeq_getY(gcs_old, idx, &y))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_getY failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_getY failed");
if (coordinatesNum > 2 && dim > 2 && //read it only if needed (dim
>2)
!GEOSCoordSeq_getZ(gcs_old, idx, &z))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_getZ failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_getZ failed");
//create the new coordinates
if (!GEOSCoordSeq_setX(gcs_new, idx, x))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_setX failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_setX failed");
if (!GEOSCoordSeq_setY(gcs_new, idx, y))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_setY failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_setY failed");
if (dim > 2)
if (!GEOSCoordSeq_setZ(gcs_new, idx, z))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_setZ failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos
operation GEOSCoordSeq_setZ failed");
return MAL_SUCCEED;
}
@@ -524,13 +524,13 @@ forceDimPoint(GEOSGeometry **outGeometry
if (gcs_old == NULL) {
*outGeometry = NULL;
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
}
/* create the coordinates sequence for the translated geometry */
if ((gcs_new = GEOSCoordSeq_create(1, dim)) == NULL) {
*outGeometry = NULL;
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_create failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_create failed");
}
/* create the translated coordinates */
@@ -545,7 +545,7 @@ forceDimPoint(GEOSGeometry **outGeometry
*outGeometry = GEOSGeom_createPoint(gcs_new);
if (*outGeometry == NULL) {
GEOSCoordSeq_destroy(gcs_new);
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_createPoint failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGeom_createPoint failed");
}
return MAL_SUCCEED;
@@ -566,16 +566,16 @@ forceDimLineString(GEOSGeometry **outGeo
gcs_old = GEOSGeom_getCoordSeq(geosGeometry);
if (gcs_old == NULL)
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
/* get the number of points in the geometry */
if (!GEOSCoordSeq_getSize(gcs_old, &pointsNum))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_getSize failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_getSize failed");
/* create the coordinates sequence for the translated geometry */
gcs_new = GEOSCoordSeq_create(pointsNum, dim);
if (gcs_new == NULL)
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_create failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_create failed");
/* create the translated coordinates */
for (i = 0; i < pointsNum; i++) {
@@ -590,7 +590,7 @@ forceDimLineString(GEOSGeometry **outGeo
*outGeometry = GEOSGeom_createLineString(gcs_new);
if (*outGeometry == NULL) {
GEOSCoordSeq_destroy(gcs_new);
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_createLineString failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGeom_createLineString failed");
}
return MAL_SUCCEED;
@@ -613,16 +613,16 @@ forceDimLinearRing(GEOSGeometry **outGeo
gcs_old = GEOSGeom_getCoordSeq(geosGeometry);
if (gcs_old == NULL)
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
/* get the number of points in the geometry */
if (!GEOSCoordSeq_getSize(gcs_old, &pointsNum))
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_getSize failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_getSize failed");
/* create the coordinates sequence for the translated geometry */
gcs_new = GEOSCoordSeq_create(pointsNum, dim);
if (gcs_new == NULL)
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSCoordSeq_create failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_create failed");
/* create the translated coordinates */
for (i = 0; i < pointsNum; i++) {
@@ -637,7 +637,7 @@ forceDimLinearRing(GEOSGeometry **outGeo
*outGeometry = GEOSGeom_createLinearRing(gcs_new);
if (*outGeometry == NULL) {
GEOSCoordSeq_destroy(gcs_new);
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_createLinearRing failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGeom_createLinearRing failed");
}
return MAL_SUCCEED;
@@ -656,7 +656,7 @@ forceDimPolygon(GEOSGeometry **outGeomet
exteriorRingGeometry = GEOSGetExteriorRing(geosGeometry);
if (!exteriorRingGeometry) {
*outGeometry = NULL;
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGetExteriorRing failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGetExteriorRing failed");
}
if ((ret = forceDimLinearRing(&transformedExteriorRingGeometry,
exteriorRingGeometry, dim)) != MAL_SUCCEED) {
@@ -693,7 +693,7 @@ forceDimPolygon(GEOSGeometry **outGeomet
if (*outGeometry == NULL) {
for (i = 0; i < numInteriorRings; i++)
GEOSGeom_destroy(transformedInteriorRingGeometries[i]);
- ret = createException(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_createPolygon failed");
+ ret = createException(MAL, "geom.ForceDim", "SQLSTATE 38000
!""Geos operation GEOSGeom_createPolygon failed");
}
GDKfree(transformedInteriorRingGeometries);
GEOSGeom_destroy(transformedExteriorRingGeometry);
@@ -732,7 +732,7 @@ forceDimMultiGeometry(GEOSGeometry **out
if (*outGeometry == NULL) {
for (i = 0; i < geometriesNum; i++)
GEOSGeom_destroy(transformedMultiGeometries[i]);
- err = createException(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGeom_createCollection failed");
+ err = createException(MAL, "geom.ForceDim", "SQLSTATE 38000
!""Geos operation GEOSGeom_createCollection failed");
}
GDKfree(transformedMultiGeometries);
@@ -779,7 +779,7 @@ wkbForceDim(wkb **outWKB, wkb **geomWKB,
geosGeometry = wkb2geos(*geomWKB);
if (geosGeometry == NULL) {
*outWKB = NULL;
- throw(MAL, "geom.ForceDim", "SQLSTATE ----- !""wkb2geos
failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
wkb2geos failed");
}
if ((err = forceDimGeometry(&outGeometry, geosGeometry, *dim)) !=
MAL_SUCCEED) {
@@ -796,7 +796,7 @@ wkbForceDim(wkb **outWKB, wkb **geomWKB,
GEOSGeom_destroy(outGeometry);
if (*outWKB == NULL)
- throw(MAL, "geom.ForceDim", "SQLSTATE ----- !""geos2wkb
failed");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
geos2wkb failed");
return MAL_SUCCEED;
}
@@ -811,18 +811,18 @@ segmentizePoint(GEOSGeometry **outGeomet
//get the coordinates
if ((gcs_old = GEOSGeom_getCoordSeq(geosGeometry)) == NULL) {
*outGeometry = NULL;
- throw(MAL, "geom.Segmentize", "SQLSTATE -----
!""GEOSGeom_getCoordSeq failed");
+ throw(MAL, "geom.Segmentize", "SQLSTATE 38000 !""Geos operation
GEOSGeom_getCoordSeq failed");
}
//create a copy of it
if ((gcs_new = GEOSCoordSeq_clone(gcs_old)) == NULL) {
*outGeometry = NULL;
- throw(MAL, "geom.Segmentize", "SQLSTATE -----
!""GEOSCoordSeq_clone failed");
+ throw(MAL, "geom.Segmentize", "SQLSTATE 38000 !""Geos operation
GEOSCoordSeq_clone failed");
}
//create the geometry from the coordinates sequence
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
