Changeset: 34a523fbef4d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=34a523fbef4d
Modified Files:
geom/monetdb5/geom.c
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/formatinput.c
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/pyapi/pyheader.h
sql/backends/monet5/UDF/pyapi/pyloader.c
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_lib.c
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/vaults/fits/fits.c
Branch: malerrors
Log Message:
Another batch of SQLSTATE errors
diffs (truncated from 2917 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
@@ -71,7 +71,7 @@ transformCoordSeq(int idx, int coordinat
if (!GEOSCoordSeq_getX(gcs_old, idx, &x) ||
!GEOSCoordSeq_getY(gcs_old, idx, &y) ||
(coordinatesNum > 2 && !GEOSCoordSeq_getZ(gcs_old, idx, &z)))
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""Couldn't get
coordinates");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos cannot get
coordinates");
/* check if the passed reference system is geographic (proj=latlong)
* and change the degrees to radians because pj_transform works with
radians*/
@@ -83,9 +83,9 @@ transformCoordSeq(int idx, int coordinat
errorNum = pj_get_errno_ref();
if (*errorNum != 0) {
if (coordinatesNum > 2)
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""Couldn't transform point (%f %f %f): %s\n", x, y, z, pj_strerrno(*errorNum));
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos
cannot transform point (%f %f %f): %s\n", x, y, z, pj_strerrno(*errorNum));
else
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""Couldn't transform point (%f %f): %s\n", x, y, pj_strerrno(*errorNum));
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos
cannot transform point (%f %f): %s\n", x, y, pj_strerrno(*errorNum));
}
/* check if the destination reference system is geographic and change
@@ -96,7 +96,7 @@ transformCoordSeq(int idx, int coordinat
if (!GEOSCoordSeq_setX(gcs_new, idx, x) ||
!GEOSCoordSeq_setY(gcs_new, idx, y) ||
(coordinatesNum > 2 && !GEOSCoordSeq_setZ(gcs_new, idx, z)))
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""Couldn't set
coordinates");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos cannot set
coordinates");
return MAL_SUCCEED;
}
@@ -250,7 +250,7 @@ transformPolygon(GEOSGeometry **transfor
if (numInteriorRings == -1) {
*transformedGeometry = NULL;
GEOSGeom_destroy(transformedExteriorRingGeometry);
- throw(MAL, "geom.Transform", "SQLSTATE -----
!""GEOSGetInteriorRingN failed.");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos operation
GEOSGetInteriorRingN failed.");
}
/* iterate over the interiorRing and transform each one of them */
@@ -320,7 +320,7 @@ transformMultiGeometry(GEOSGeometry **tr
ret =
transformPolygon(&transformedMultiGeometries[i], multiGeometry, proj4_src,
proj4_dst, srid);
break;
default:
- ret = createException(MAL, "geom.Transform",
"SQLSTATE ----- !""Unknown geometry type");
+ ret = createException(MAL, "geom.Transform",
"SQLSTATE 38000 !""Geos unknown geometry type");
break;
}
}
@@ -401,7 +401,7 @@ wkbTransform(wkb **transformedWKB, wkb *
(void) srid_dst;
(void) proj4_src_str;
(void) proj4_dst_str;
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""Function Not
Implemented");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos function Not
Implemented");
#else
projPJ proj4_src, proj4_dst;
GEOSGeom geosGeometry, transformedGeosGeometry;
@@ -410,7 +410,7 @@ wkbTransform(wkb **transformedWKB, wkb *
str ret = MAL_SUCCEED;
if (*geomWKB == NULL)
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""wkb is null");
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Geos wkb format
is null");
if (wkb_isnil(*geomWKB) ||
*srid_src == int_nil ||
@@ -423,9 +423,9 @@ wkbTransform(wkb **transformedWKB, wkb *
}
if (strcmp(*proj4_src_str, "null") == 0)
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""Could not find
in spatial_ref_sys srid %d\n", *srid_src);
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Cannot find in
spatial_ref_sys srid %d\n", *srid_src);
if (strcmp(*proj4_dst_str, "null") == 0)
- throw(MAL, "geom.Transform", "SQLSTATE ----- !""Could not find
in spatial_ref_sys srid %d\n", *srid_dst);
+ throw(MAL, "geom.Transform", "SQLSTATE 38000 !""Cannot find in
spatial_ref_sys srid %d\n", *srid_dst);
proj4_src = /*pj_init_plus */ projFromStr(*proj4_src_str);
proj4_dst = /*pj_init_plus */ projFromStr(*proj4_dst_str);
@@ -462,7 +462,7 @@ wkbTransform(wkb **transformedWKB, wkb *
break;
default:
transformedGeosGeometry = NULL;
- ret = createException(MAL, "geom.Transform", "SQLSTATE -----
!""Unknown geometry type");
+ ret = createException(MAL, "geom.Transform", "SQLSTATE 38000
!""Geos unknown geometry type");
}
if (ret == MAL_SUCCEED && transformedGeosGeometry) {
@@ -668,7 +668,7 @@ forceDimPolygon(GEOSGeometry **outGeomet
if (numInteriorRings == -1) {
*outGeometry = NULL;
GEOSGeom_destroy(transformedExteriorRingGeometry);
- throw(MAL, "geom.ForceDim", "SQLSTATE -----
!""GEOSGetInteriorRingN failed.");
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
GEOSGetInteriorRingN failed.");
}
/* iterate over the interiorRing and translate each one of them */
@@ -759,7 +759,7 @@ forceDimGeometry(GEOSGeometry **outGeome
case wkbGeometryCollection_mdb:
return forceDimMultiGeometry(outGeometry, geosGeometry, dim);
default:
- throw(MAL, "geom.ForceDim", "SQLSTATE ----- !""%s Unknown
geometry type", geom_type2str(geometryType, 0));
+ throw(MAL, "geom.ForceDim", "SQLSTATE 38000 !""Geos operation
%s unknown geometry type", geom_type2str(geometryType, 0));
}
}
@@ -1045,7 +1045,7 @@ segmentizePolygon(GEOSGeometry **outGeom
if (numInteriorRings == -1) {
*outGeometry = NULL;
GEOSGeom_destroy(transformedExteriorRingGeometry);
- throw(MAL, "geom.Segmentize", "SQLSTATE -----
!""GEOSGetInteriorRingN failed.");
+ throw(MAL, "geom.Segmentize", "SQLSTATE 38000 !""Geos operation
GEOSGetInteriorRingN failed.");
}
//iterate over the interiorRing and segmentize each one of them
transformedInteriorRingGeometries = GDKmalloc(numInteriorRings *
sizeof(GEOSGeometry *));
@@ -1135,7 +1135,7 @@ segmentizeGeometry(GEOSGeometry **outGeo
case wkbGeometryCollection_mdb:
return segmentizeMultiGeometry(outGeometry, geosGeometry, sz);
default:
- throw(MAL, "geom.Segmentize", "SQLSTATE ----- !""%s Unknown
geometry type", geom_type2str(geometryType, 0));
+ throw(MAL, "geom.Segmentize", "SQLSTATE 38000 !"" Geos %s
Unknown geometry type", geom_type2str(geometryType, 0));
}
}
@@ -1362,7 +1362,7 @@ translatePolygon(GEOSGeometry **outGeome
if (numInteriorRings == -1) {
*outGeometry = NULL;
GEOSGeom_destroy(transformedExteriorRingGeometry);
- throw(MAL, "geom.Translate", "SQLSTATE -----
!""GEOSGetInteriorRingN failed.");
+ throw(MAL, "geom.Translate", "SQLSTATE 38000 !""Geos operation
GEOSGetInteriorRingN failed.");
}
/* iterate over the interiorRing and translate each one of them */
@@ -1453,7 +1453,7 @@ translateGeometry(GEOSGeometry **outGeom
case wkbGeometryCollection_mdb:
return translateMultiGeometry(outGeometry, geosGeometry, dx,
dy, dz);
default:
- throw(MAL, "geom.Translate", "SQLSTATE ----- !""%s Unknown
geometry type", geom_type2str(geometryType, 0));
+ throw(MAL, "geom.Translate", "SQLSTATE 38000 !""Geos %s unknown
geometry type", geom_type2str(geometryType, 0));
}
}
@@ -1674,7 +1674,7 @@ dumpGeometriesGeometry(BAT *idBAT, BAT *
return dumpGeometriesMulti(idBAT, geomBAT, geosGeometry, path);
default:
- throw(MAL, "geom.Dump", "SQLSTATE ----- !""%s Unknown geometry
type", geom_type2str(geometryType, 0));
+ throw(MAL, "geom.Dump", "SQLSTATE 38000 !""Geos %s unknown
geometry type", geom_type2str(geometryType, 0));
}
}
@@ -1904,7 +1904,7 @@ dumpPointsGeometry(BAT *idBAT, BAT *geom
case wkbGeometryCollection_mdb:
return dumpPointsMultiGeometry(idBAT, geomBAT, geosGeometry,
path);
default:
- throw(MAL, "geom.DumpPoints", "SQLSTATE ----- !""%s Unknown
geometry type", geom_type2str(geometryType, 0));
+ throw(MAL, "geom.DumpPoints", "SQLSTATE 38000 !""Geoes %s
unknown geometry type", geom_type2str(geometryType, 0));
}
}
@@ -2002,7 +2002,7 @@ geom_2_geom(wkb **resWKB, wkb **valueWKB
if (valueSRID != *columnSRID || valueType != *columnType) {
GEOSGeom_destroy(geosGeometry);
- throw(MAL, "calc.wkb", "SQLSTATE ----- !""column needs
geometry(%d, %d) and value is geometry(%d, %d)\n", *columnType, *columnSRID,
valueType, valueSRID);
+ throw(MAL, "calc.wkb", "SQLSTATE 38000 !""Geos column needs
geometry(%d, %d) and value is geometry(%d, %d)\n", *columnType, *columnSRID,
valueType, valueSRID);
}
/* get the wkb from the geosGeometry */
@@ -2455,7 +2455,7 @@ wkbFromBinary(wkb **geomWKB, char **inSt
strLength = strlen(*inStr);
if (strLength & 1)
- throw(MAL, "geom.FromBinary", "SQLSTATE ----- !""odd length
input string");
+ throw(MAL, "geom.FromBinary", "SQLSTATE 38000 !""Geos odd
length input string");
wkbLength = strLength / 2;
assert(wkbLength <= GDK_int_max);
@@ -2470,7 +2470,7 @@ wkbFromBinary(wkb **geomWKB, char **inSt
int secondHalf = decit((*inStr)[i + 1]);
if (firstHalf == -1 || secondHalf == -1) {
GDKfree(w);
- throw(MAL, "geom.FromBinary", "SQLSTATE -----
!""incorrectly formatted input string");
+ throw(MAL, "geom.FromBinary", "SQLSTATE 38000 !""Geos
incorrectly formatted input string");
}
w->data[i / 2] = (firstHalf << 4) | secondHalf;
}
@@ -2542,8 +2542,8 @@ wkbFromText(wkb **geomWKB, str *geomWKT,
te += (te > 2);
if (*tpe > 0 && te != *tpe)
- throw(SQL, "wkb.FromText", "SQLSTATE ----- !""Geometry not type
'%d: %s' but '%d: %s' instead", *tpe, geom_type2str(*tpe, 0), te,
geom_type2str(te, 0));
- throw(MAL, "wkb.FromText", "SQLSTATE ----- !""%s", "cannot parse
string");
+ throw(SQL, "wkb.FromText", "SQLSTATE 38000 !""Geometry not type
'%d: %s' but '%d: %s' instead", *tpe, geom_type2str(*tpe, 0), te,
geom_type2str(te, 0));
+ throw(MAL, "wkb.FromText", "SQLSTATE 38000 !""%s", "cannot parse
string");
}
/* create textual representation of the wkb */
@@ -2562,10 +2562,10 @@ wkbAsText(char **txt, wkb **geomWKB, int
}
if ((*geomWKB)->srid < 0)
- throw(MAL, "geom.AsText", "SQLSTATE ----- !""Negative SRID");
+ throw(MAL, "geom.AsText", "SQLSTATE 38000 !""Geod negative
SRID");
if (wkbTOSTR(&wkt, &len, *geomWKB) == 0)
- throw(MAL, "geom.AsText", "SQLSTATE ----- !""Failed to create
Text from Well Known Format");
+ throw(MAL, "geom.AsText", "SQLSTATE 38000 !""Geos failed to
create Text from Well Known Format");
if (withSRID == NULL || *withSRID == 0) { //accepting NULL
withSRID to make internal use of it easier
*txt = wkt;
@@ -2680,7 +2680,7 @@ wkbMLineStringToPolygon(wkb **geomWKB, s
externalGeometry = wkb2geos(linestringsWKB[0]);
if (externalGeometry == NULL) {
- ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE ----- !""Error in wkb2geos");
+ ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE 38000 !""Geos operation wkb2geos failed");
goto bailout;
}
@@ -2714,7 +2714,7 @@ wkbMLineStringToPolygon(wkb **geomWKB, s
while (--i >= 1)
GEOSGeom_destroy(internalGeometries[i -
1]);
GDKfree(internalGeometries);
- ret = createException(MAL,
"geom.MLineStringToPolygon", "SQLSTATE ----- !""Error in wkb2geos");
+ ret = createException(MAL,
"geom.MLineStringToPolygon", "SQLSTATE 38000 !""Geos operation wkb2geos
failed");
goto bailout;
}
@@ -2725,7 +2725,7 @@ wkbMLineStringToPolygon(wkb **geomWKB, s
while (--i >= 1)
GEOSGeom_destroy(internalGeometries[i -
1]);
GDKfree(internalGeometries);
- ret = createException(MAL,
"geom.MLineStringToPolygon", "SQLSTATE ----- !""Error in wkb2geos");
+ ret = createException(MAL,
"geom.MLineStringToPolygon", "SQLSTATE 38000 !""Geos operation wkb2geos
failed");
goto bailout;
}
internalGeometries[i - 1] =
GEOSGeom_createLinearRing(coordSeq_internal);
@@ -2746,7 +2746,7 @@ wkbMLineStringToPolygon(wkb **geomWKB, s
for (i = 0; i < itemsNum - 1; i++)
GEOSGeom_destroy(internalGeometries[i]);
GDKfree(internalGeometries);
- ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE ----- !""Error creating Polygon from LinearRing");
+ ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE 38000 !""Geos error creating Polygon from LinearRing");
goto bailout;
}
GDKfree(internalGeometries);
@@ -2757,7 +2757,7 @@ wkbMLineStringToPolygon(wkb **geomWKB, s
GEOSGeom_destroy(finalGeometry);
- ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE ----- !""The provided MultiLineString does not create a valid
Polygon");
+ ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE 38000 !""Geos the provided MultiLineString does not create a valid
Polygon");
goto bailout;
}
@@ -2767,9 +2767,9 @@ wkbMLineStringToPolygon(wkb **geomWKB, s
if (*geomWKB == NULL)
ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE 38000 !""Geos operation geos2wkb failed");
} else if (*flag == 1) {
- ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE ----- !""Multipolygon from string has not been defined");
+ ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE 38000 !""Geos multipolygon from string has not been defined");
} else {
- ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE ----- !""Unknown flag");
+ ret = createException(MAL, "geom.MLineStringToPolygon",
"SQLSTATE 38000 !""Geos unknown flag");
}
bailout:
@@ -2803,9 +2803,9 @@ wkbMakePoint(wkb **out, dbl *x, dbl *y,
seq = GEOSCoordSeq_create(1, 3);
break;
case 11: /* x, y, z, m */
- throw(MAL, "geom.MakePoint", "SQLSTATE ----- !""POINTZM is not
supported");
+ throw(MAL, "geom.MakePoint", "SQLSTATE 38000 !""Geos POINTZM is
not supported");
default:
- throw(MAL, "geom.MakePoint", "SQLSTATE -----
!"ILLEGAL_ARGUMENT);
+ throw(MAL, "geom.MakePoint", "SQLSTATE 38000 !""Geos
"ILLEGAL_ARGUMENT);
}
if (seq == NULL)
@@ -2821,7 +2821,7 @@ wkbMakePoint(wkb **out, dbl *x, dbl *y,
if ((geosGeometry = GEOSGeom_createPoint(seq)) == NULL) {
GEOSCoordSeq_destroy(seq);
- throw(MAL, "geom.MakePoint", "SQLSTATE ----- !""Failed to
create GEOSGeometry from the coordinates");
+ throw(MAL, "geom.MakePoint", "SQLSTATE 38000 !""Geos opertion
GEOSGeometry failed");
}
*out = geos2wkb(geosGeometry);
@@ -2830,7 +2830,7 @@ wkbMakePoint(wkb **out, dbl *x, dbl *y,
if (wkb_isnil(*out)) {
GDKfree(*out);
*out = NULL;
- throw(MAL, "geom.MakePoint", "SQLSTATE ----- !""Failed to
create WKB from GEOSGeometry");
+ throw(MAL, "geom.MakePoint", "SQLSTATE 38000 !""Geos to create
WKB from GEOSGeometry failed");
}
return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
