Changeset: bf165651e17d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/bf165651e17d Modified Files: clients/Tests/MAL-signatures-hge.test clients/Tests/MAL-signatures.test geom/monetdb5/geomBulk.c Branch: geo-update Log Message:
Fix and approve. diffs (truncated from 573 to 300 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 @@ -4,6 +4,16 @@ query TTTTT nosort select * from sys.malfunctions() order by module, "function", address, signature, comment ---- aggr +Collect +command aggr.Collect(X_0:bat[:wkb]):wkb +wkbCollectAggr; +TODO +aggr +MakeLine +command aggr.MakeLine(X_0:bat[:wkb]):wkb +wkbMakeLineAggr; +Gets a BAT with point or linestring geometries and returns a single linestring geometry +aggr all command aggr.all(X_0:bat[:any_1]):any_1 SQLall; @@ -1154,6 +1164,26 @@ pattern aggr.str_group_concat(X_0:bat[:s CMDBATstr_group_concat; Calculate aggregate string concatenate of B. aggr +subCollect +command aggr.subCollect(X_0:bat[:wkb], X_1:bat[:oid], X_2:bat[:oid], X_3:bit):bat[:wkb] +wkbCollectAggrSubGrouped; +TODO +aggr +subCollect +command aggr.subCollect(X_0:bat[:wkb], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:wkb] +wkbCollectAggrSubGroupedCand; +TODO +aggr +subMakeLine +command aggr.subMakeLine(X_0:bat[:wkb], X_1:bat[:oid], X_2:bat[:oid], X_3:bit):bat[:wkb] +wkbMakeLineAggrSubGrouped; +TODO +aggr +subMakeLine +command aggr.subMakeLine(X_0:bat[:wkb], X_1:bat[:oid], X_2:bat[:any_1], X_3:bat[:oid], X_4:bit):bat[:wkb] +wkbMakeLineAggrSubGroupedCand; +TODO +aggr suball pattern aggr.suball(X_0:bat[:any_1], X_1:bat[:oid], X_2:bat[:oid], X_3:bat[:oid], X_4:bit):bat[:any_1] SQLall_grp; @@ -30669,6 +30699,16 @@ command batgeom.Distance(X_0:wkb, X_1:ba wkbDistance_geom_bat; (empty) batgeom +DistanceGeographic +command batgeom.DistanceGeographic(X_0:bat[:wkb], X_1:bat[:wkb]):bat[:dbl] +wkbDistanceGeographic_bat; +TODO +batgeom +DistanceGeographic +command batgeom.DistanceGeographic(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:oid], X_3:bat[:oid]):bat[:dbl] +wkbDistanceGeographic_bat_cand; +TODO +batgeom Filter command batgeom.Filter(X_0:bat[:wkb], X_1:wkb):bat[:wkb] wkbFilter_bat_geom; @@ -30889,6 +30929,11 @@ command batgeom.ToText(X_0:bat[:wkb], X_ wkbAsText_bat; (empty) batgeom +Transform +command batgeom.Transform(X_0:bat[:wkb], X_1:int, X_2:int, X_3:str, X_4:str):bat[:wkb] +wkbTransform_bat; +Transforms a bat of geometries from one srid to another +batgeom Union command batgeom.Union(X_0:bat[:wkb], X_1:bat[:wkb]):bat[:wkb] wkbUnion_bat; @@ -44599,6 +44644,11 @@ command geom.Centroid(X_0:wkb):wkb wkbCentroid; Computes the geometric center of a geometry, or equivalently, the center of mass of the geometry as a POINT. geom +Collect +command geom.Collect(X_0:wkb, X_1:wkb):wkb +wkbCollect; +TODO +geom Contains command geom.Contains(X_0:wkb, X_1:wkb):bit wkbContains; @@ -44634,16 +44684,51 @@ command geom.Covers(X_0:wkb, X_1:wkb):bi wkbCovers; Returns TRUE if no point of geometry B is outside geometry A geom +CoversGeographic +command geom.CoversGeographic(X_0:wkb, X_1:wkb):bit +wkbCoversGeographic; +TODO +geom Crosses command geom.Crosses(X_0:wkb, X_1:wkb):bit wkbCrosses; Returns TRUE if the supplied geometries have some, but not all, interior points in common. geom -DWithin -command geom.DWithin(X_0:wkb, X_1:wkb, X_2:dbl):bit +DWithin2 +command geom.DWithin2(X_0:wkb, X_1:wkb, X_2:mbr, X_3:mbr, X_4:dbl):bit +wkbDWithinMbr; +(empty) +geom +DWithinGeographic +command geom.DWithinGeographic(X_0:wkb, X_1:wkb, X_2:dbl):bit +wkbDWithinGeographic; +TODO +geom +DWithinGeographicjoin +command geom.DWithinGeographicjoin(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid], X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], X_9:bat[:oid]) +wkbDWithinGeographicJoin; +TODO +geom +DWithinGeographicselect +command geom.DWithinGeographicselect(X_0:bat[:wkb], X_1:bat[:oid], X_2:wkb, X_3:dbl, X_4:bit):bat[:oid] +wkbDWithinGeographicSelect; +TODO +geom +DWithin_noindex +command geom.DWithin_noindex(X_0:wkb, X_1:wkb, X_2:dbl):bit wkbDWithin; Returns true if the two geometries are within the specifies distance from each other geom +DWithinjoin_noindex +command geom.DWithinjoin_noindex(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:oid], X_3:bat[:oid], X_4:dbl, X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], X_9:bat[:oid]) +wkbDWithinJoinRTree; +TODO +geom +DWithinselect_noindex +command geom.DWithinselect_noindex(X_0:bat[:wkb], X_1:bat[:oid], X_2:wkb, X_3:dbl, X_4:bit):bat[:oid] +wkbDWithinSelectRTree; +TODO +geom DelaunayTriangles command geom.DelaunayTriangles(X_0:wkb, X_1:dbl, X_2:int):wkb wkbDelaunayTriangles; @@ -44669,6 +44754,11 @@ command geom.Distance(X_0:wkb, X_1:wkb): wkbDistance; Returns the 2-dimensional minimum cartesian distance between the two geometries in projected units (spatial ref units. geom +DistanceGeographic +command geom.DistanceGeographic(X_0:wkb, X_1:wkb):dbl +wkbDistanceGeographic; +TODO +geom Dump command geom.Dump(X_0:wkb) (X_1:bat[:str], X_2:bat[:wkb]) wkbDump; @@ -44789,11 +44879,41 @@ command geom.Intersection(X_0:wkb, X_1:w wkbIntersection; Returns a geometry that represents the point set intersection of the Geometries a, b geom -Intersects -command geom.Intersects(X_0:wkb, X_1:wkb):bit +IntersectsGeographic +command geom.IntersectsGeographic(X_0:wkb, X_1:wkb):bit +wkbIntersectsGeographic; +Returns true if the geographic Geometries intersect in any point +geom +IntersectsGeographicjoin +command geom.IntersectsGeographicjoin(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:oid], X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid]) +wkbIntersectsGeographicJoin; +TODO +geom +IntersectsGeographicselect +command geom.IntersectsGeographicselect(X_0:bat[:wkb], X_1:bat[:oid], X_2:wkb, X_3:bit):bat[:oid] +wkbIntersectsGeographicSelect; +TODO +geom +IntersectsMBR +command geom.IntersectsMBR(X_0:mbr, X_1:mbr):bit +mbrIntersects; +TODO +geom +Intersects_noindex +command geom.Intersects_noindex(X_0:wkb, X_1:wkb):bit wkbIntersects; Returns true if these Geometries 'spatially intersect in 2D' geom +Intersects_noindexjoin +command geom.Intersects_noindexjoin(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:oid], X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid]) +wkbIntersectsJoinNoIndex; +TODO +geom +Intersects_noindexselect +command geom.Intersects_noindexselect(X_0:bat[:wkb], X_1:bat[:oid], X_2:wkb, X_3:bit):bat[:oid] +wkbIntersectsSelectNoIndex; +TODO +geom IsClosed command geom.IsClosed(X_0:wkb):bit wkbIsClosed; @@ -44899,11 +45019,6 @@ command geom.MakeLine(X_0:wkb, X_1:wkb): wkbMakeLine; Gets two point or linestring geometries and returns a linestring geometry geom -MakeLine -command geom.MakeLine(X_0:bat[:wkb]):wkb -wkbMakeLineAggr; -Gets a BAT with point or linestring geometries and returns a single linestring geometry -geom MakePoint command geom.MakePoint(X_0:dbl, X_1:dbl):wkb geom_MakePoint_dbl_dbl; @@ -47898,6 +48013,36 @@ resolve command remote.resolve(X_0:str):bat[:str] RMTresolve; resolve a pattern against Merovingian and return the URIs +rtree +DWithin +command rtree.DWithin(X_0:wkb, X_1:wkb, X_2:dbl):bit +wkbDWithin; +Returns true if these Geometries 'spatially intersect in 2D' +rtree +DWithinjoin +command rtree.DWithinjoin(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:oid], X_3:bat[:oid], X_4:dbl, X_5:bit, X_6:lng, X_7:bit) (X_8:bat[:oid], X_9:bat[:oid]) +wkbDWithinJoinRTree; +TODO +rtree +DWithinselect +command rtree.DWithinselect(X_0:bat[:wkb], X_1:bat[:oid], X_2:wkb, X_3:dbl, X_4:bit):bat[:oid] +wkbDWithinSelectRTree; +TODO +rtree +Intersects +command rtree.Intersects(X_0:wkb, X_1:wkb):bit +wkbIntersects; +Returns true if these Geometries 'spatially intersect in 2D' +rtree +Intersectsjoin +command rtree.Intersectsjoin(X_0:bat[:wkb], X_1:bat[:wkb], X_2:bat[:oid], X_3:bat[:oid], X_4:bit, X_5:lng, X_6:bit) (X_7:bat[:oid], X_8:bat[:oid]) +wkbIntersectsJoinRTree; +TODO +rtree +Intersectsselect +command rtree.Intersectsselect(X_0:bat[:wkb], X_1:bat[:oid], X_2:wkb, X_3:bit):bat[:oid] +wkbIntersectsSelectRTree; +TODO sample subuniform pattern sample.subuniform(X_0:bat[:any], X_1:dbl):bat[:oid] @@ -47919,20 +48064,15 @@ pattern sample.subuniform(X_0:bat[:any], SAMPLEuniform; Returns the oids of a uniform sample of size s and where the prg is seeded with sample_seed shp -attach -unsafe pattern shp.attach(X_0:str):void -SHPattach; -Register an ESRI Shapefile in the vault catalog +load +pattern shp.load(X_0:str, X_1:str):void +SHPload; +Import an ESRI Shapefile into a new table, on the sys schema shp -import -unsafe pattern shp.import(X_0:int):void -SHPimport; -Import an ESRI Shapefile with given id into the vault -shp -import -unsafe pattern shp.import(X_0:int, X_1:wkb):void -SHPpartialimport; -Partially import an ESRI Shapefile with given id into the vault +load +pattern shp.load(X_0:str, X_1:str, X_2:str):void +SHPloadSchema; +Import an ESRI Shapefile into a new table, on a certain schema sql affectedRows unsafe pattern sql.affectedRows(X_0:int, X_1:lng):int 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 @@ -4,6 +4,16 @@ query TTTTT nosort select * from sys.malfunctions() order by module, "function", address, signature, comment ---- aggr +Collect +command aggr.Collect(X_0:bat[:wkb]):wkb +wkbCollectAggr; +TODO +aggr +MakeLine +command aggr.MakeLine(X_0:bat[:wkb]):wkb +wkbMakeLineAggr; +Gets a BAT with point or linestring geometries and returns a single linestring geometry +aggr all command aggr.all(X_0:bat[:any_1]):any_1 SQLall; @@ -964,6 +974,26 @@ pattern aggr.str_group_concat(X_0:bat[:s CMDBATstr_group_concat; Calculate aggregate string concatenate of B. aggr _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
