Changeset: 57b3b0306af6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/57b3b0306af6
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.mal
geom/sql/40_geom.sql
Branch: geo-update
Log Message:
Changed st_collect aggregate MAL function name.
diffs (45 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -7537,11 +7537,10 @@ static mel_func geom_init_funcs[] = {
command("geom", "IntersectsGeographic", wkbIntersectsGeographic, false,
"Returns true if the geographic Geometries intersect in any point", args(1, 3,
arg("", bit), arg("a", wkb), arg("b", wkb))),
command("geom", "DistanceGeographic", wkbDistanceGeographic, false, "TODO",
args(1, 3, arg("", dbl), arg("a", wkb), arg("b", wkb))),
command("geom", "CoversGeographic", wkbDistanceGeographic, false, "TODO",
args(1, 3, arg("", bit), arg("a", wkb), arg("b", wkb))),
-
- //TODO: Change name to Collect
- command("geom", "Union", wkbCollectAggrGrouped, false, "TODO", args(1, 4,
batarg("", wkb), batarg("val", wkb), batarg("g", oid), batargany("e", 1))),
- command("geom", "subUnion", wkbCollectAggrSubGrouped, false, "TODO", args(1,
5, batarg("", wkb), batarg("val", wkb), batarg("g", oid), batarg("e", oid),
arg("skip_nils", bit))),
- command("geom", "subUnion", wkbCollectAggrSubGroupedCand, false, "TODO",
args(1, 7, batarg("", wkb), batarg("val", wkb), batarg("g", oid),
batargany("e", 1), batarg("g", oid), arg("skip_nils", bit),
arg("abort_on_error", bit))),
+ command("geom", "Collect", wkbCollectAggrGrouped, false, "TODO", args(1, 4,
batarg("", wkb), batarg("val", wkb), batarg("g", oid), batargany("e", 1))),
+ command("geom", "subCollect", wkbCollectAggrSubGrouped, false, "TODO",
args(1, 5, batarg("", wkb), batarg("val", wkb), batarg("g", oid), batarg("e",
oid), arg("skip_nils", bit))),
+ command("geom", "subCollect", wkbCollectAggrSubGroupedCand, false, "TODO",
args(1, 7, batarg("", wkb), batarg("val", wkb), batarg("g", oid),
batargany("e", 1), batarg("g", oid), arg("skip_nils", bit),
arg("abort_on_error", bit))),
+
command("geom", "hasZ", geoHasZ, false, "returns 1 if the geometry has z
coordinate", args(1,2, arg("",int),arg("flags",int))),
command("geom", "hasM", geoHasM, false, "returns 1 if the geometry has m
coordinate", args(1,2, arg("",int),arg("flags",int))),
command("geom", "getType", geoGetType, false, "returns the str representation
of the geometry type", args(1,3,
arg("",str),arg("flags",int),arg("format",int))),
diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal
--- a/geom/monetdb5/geom.mal
+++ b/geom/monetdb5/geom.mal
@@ -54,10 +54,9 @@ command DistanceGeographic(a:wkb, b:wkb)
command DWithinGeographic(a:wkb, b:wkb, d:dbl) :bit address
wkbDWithinGeographic
command IntersectsGeographic(a:wkb, b:wkb) :bit address wkbIntersectsGeographic
command CoversGeographic(a:wkb, b:wkb) :bit address wkbCoversGeographic
-# TODO: Change name to Collect
-command Union(val:bat[:wkb], g:bat[:oid], e:bat[:any_1]) :bat[:wkb] address
wkbCollectAggrGrouped
-command subUnion(val:bat[:wkb], g:bat[:oid], e:bat[:oid], skip_nils:bit)
:bat[:wkb] address wkbCollectAggrSubGrouped
-command subUnion(val:bat[:wkb], g:bat[:oid], e:bat[:any_1], s:bat[:oid],
skip_nils:bit, abort_on_error:bit) :bat[:wkb] address
wkbCollectAggrSubGroupedCand
+command Collect(val:bat[:wkb], g:bat[:oid], e:bat[:any_1]) :bat[:wkb] address
wkbCollectAggrGrouped
+command subCollect(val:bat[:wkb], g:bat[:oid], e:bat[:oid], skip_nils:bit)
:bat[:wkb] address wkbCollectAggrSubGrouped
+command subCollect(val:bat[:wkb], g:bat[:oid], e:bat[:any_1], s:bat[:oid],
skip_nils:bit, abort_on_error:bit) :bat[:wkb] address
wkbCollectAggrSubGroupedCand
command hasZ(flags:int) :int address geoHasZ
diff --git a/geom/sql/40_geom.sql b/geom/sql/40_geom.sql
--- a/geom/sql/40_geom.sql
+++ b/geom/sql/40_geom.sql
@@ -4592,4 +4592,4 @@ GRANT EXECUTE ON FUNCTION ST_IntersectsG
CREATE FUNCTION ST_CoversGeographic(geom1 Geometry, geom2 Geometry) RETURNS
boolean EXTERNAL NAME geom."CoversGeographic";
GRANT EXECUTE ON FUNCTION ST_CoversGeographic(Geometry, Geometry) TO PUBLIC;
-CREATE AGGREGATE ST_Collect(geom Geometry) RETURNS Geometry external name
geom."Union";
+CREATE AGGREGATE ST_Collect(geom Geometry) RETURNS Geometry external name
geom."Collect";
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
