Changeset: 3bd9cd0c28db for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3bd9cd0c28db
Modified Files:
clients/Tests/MAL-signatures-hge.test
clients/Tests/MAL-signatures.test
geom/monetdb5/geom.c
geom/monetdb5/geom.h
Branch: geos-reentrant
Log Message:
restored epilogue (keep api stable)
diffs (67 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -46229,6 +46229,11 @@ command geom.coordinateFromWKB(X_0:wkb,
wkbCoordinateFromWKB;
returns xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided geometry
geom
+epilogue
+command geom.epilogue():void
+geom_epilogue;
+(empty)
+geom
getSRID
command geom.getSRID(X_0:wkb):int
wkbGetSRID;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -34679,6 +34679,11 @@ command geom.coordinateFromWKB(X_0:wkb,
wkbCoordinateFromWKB;
returns xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided geometry
geom
+epilogue
+command geom.epilogue():void
+geom_epilogue;
+(empty)
+geom
getSRID
command geom.getSRID(X_0:wkb):int
wkbGetSRID;
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2353,6 +2353,13 @@ geom_prelude(void)
return MAL_SUCCEED;
}
+static str
+geom_epilogue(void *ret)
+{
+ (void) ret;
+ return MAL_SUCCEED;
+}
+
/* create the WKB out of the GEOSGeometry
* It makes sure to make all checks before returning
* the input geosGeometry should not be altered by this function
@@ -5771,6 +5778,7 @@ static mel_func geom_init_funcs[] = {
command("geom", "mbrDistance", mbrDistance, false, "Returns the distance of
the centroids of the two boxes", args(1,3,
arg("",dbl),arg("box1",mbr),arg("box2",mbr))),
command("geom", "coordinateFromWKB", wkbCoordinateFromWKB, false, "returns
xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided geometry",
args(1,3, arg("",dbl),arg("",wkb),arg("",int))),
command("geom", "coordinateFromMBR", wkbCoordinateFromMBR, false, "returns
xmin (=1), ymin (=2), xmax (=3) or ymax(=4) of the provided mbr", args(1,3,
arg("",dbl),arg("",mbr),arg("",int))),
+ command("geom", "epilogue", geom_epilogue, false, "", args(1,1,
arg("",void))),
command("batgeom", "FromText", wkbFromText_bat, false, "", args(1,4,
batarg("",wkb),batarg("wkt",str),arg("srid",int),arg("type",int))),
command("batgeom", "ToText", wkbAsText_bat, false, "", args(1,3,
batarg("",str),batarg("w",wkb),arg("withSRID",int))),
command("batgeom", "GeometryType", wkbGeometryType_bat, false, "", args(1,3,
batarg("",str),batarg("w",wkb),arg("flag",int))),
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -43,8 +43,6 @@ geom_export str geoHasZ(int* res, int* i
geom_export str geoHasM(int* res, int* info);
geom_export str geoGetType(char** res, int* info, int* flag);
-geom_export str geom_epilogue(void *ret);
-
/* functions that are used when a column is added to an existing table */
geom_export str mbrFromMBR(mbr **w, mbr **src);
geom_export str wkbFromWKB(wkb **w, wkb **src);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
