Changeset: 00bcbac3f7f6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/00bcbac3f7f6 Removed Files: geom/monetdb5/30_geom.mal geom/monetdb5/geom.mal geom/monetdb5/geom_funcs.mal monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal monetdb5/extras/mal_optimizer_template/opt_sql_append.mal monetdb5/extras/rapi/50_rapi.mal monetdb5/extras/rapi/rapi.mal monetdb5/modules/atoms/00_json_hge.mal monetdb5/modules/atoms/batxml.mal monetdb5/modules/atoms/blob.mal monetdb5/modules/atoms/color.mal monetdb5/modules/atoms/identifier.mal monetdb5/modules/atoms/inet.mal monetdb5/modules/atoms/json.mal monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/str.mal monetdb5/modules/atoms/streams.mal monetdb5/modules/atoms/url.mal monetdb5/modules/atoms/uuid.mal monetdb5/modules/atoms/xml.mal monetdb5/modules/kernel/00_aggr_hge.mal monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/alarm.mal monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/batcolor.mal monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/batstr.mal monetdb5/modules/kernel/group.mal monetdb5/modules/kernel/mmath.mal monetdb5/modules/kernel/status.mal monetdb5/modules/mal/00_batExtensions_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_calc_hge.mal monetdb5/modules/mal/00_iterator_hge.mal monetdb5/modules/mal/00_language_hge.mal monetdb5/modules/mal/00_mal_mapi_hge.mal monetdb5/modules/mal/00_mkey_hge.mal monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_calc.mal monetdb5/modules/mal/batExtensions.mal monetdb5/modules/mal/batMask.mal monetdb5/modules/mal/batmtime.mal monetdb5/modules/mal/bbp.mal monetdb5/modules/mal/clients.mal monetdb5/modules/mal/factories.mal monetdb5/modules/mal/groupby.mal monetdb5/modules/mal/inspect.mal monetdb5/modules/mal/iterator.mal monetdb5/modules/mal/json_util.mal monetdb5/modules/mal/language.mal monetdb5/modules/mal/mal_init.mal monetdb5/modules/mal/mal_io.mal monetdb5/modules/mal/mal_mapi.mal monetdb5/modules/mal/manifold.mal monetdb5/modules/mal/manual.mal monetdb5/modules/mal/mat.mal monetdb5/modules/mal/mdb.mal monetdb5/modules/mal/mkey.mal monetdb5/modules/mal/oltp.mal monetdb5/modules/mal/orderidx.mal monetdb5/modules/mal/pcre.mal monetdb5/modules/mal/profiler.mal monetdb5/modules/mal/querylog.mal monetdb5/modules/mal/remote.mal monetdb5/modules/mal/sample.mal monetdb5/modules/mal/sysmon.mal monetdb5/modules/mal/tablet.mal monetdb5/modules/mal/tokenizer.mal monetdb5/modules/mal/tracer.mal monetdb5/modules/mal/transaction.mal monetdb5/modules/mal/txtsim.mal monetdb5/modules/mal/wlc.mal monetdb5/optimizer/optimizer.mal sql/backends/monet5/40_sql.mal sql/backends/monet5/41_sql_hge.mal sql/backends/monet5/UDF/capi/50_capi.mal sql/backends/monet5/UDF/capi/capi.mal sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal sql/backends/monet5/UDF/pyapi3/pyapi3.mal sql/backends/monet5/UDF/udf/80_udf.mal sql/backends/monet5/UDF/udf/80_udf_hge.mal sql/backends/monet5/UDF/udf/udf.mal sql/backends/monet5/UDF/udf/udf_hge.mal sql/backends/monet5/generator/90_generator.mal sql/backends/monet5/generator/90_generator_hge.mal sql/backends/monet5/generator/generator.mal sql/backends/monet5/generator/generator_hge.mal sql/backends/monet5/sql.mal sql/backends/monet5/sql_decimal.mal sql/backends/monet5/sql_decimal_hge.mal sql/backends/monet5/sql_hge.mal sql/backends/monet5/sql_rank.mal sql/backends/monet5/sql_rank_hge.mal sql/backends/monet5/sql_subquery.mal sql/backends/monet5/sql_transaction.mal sql/backends/monet5/sqlcatalog.mal sql/backends/monet5/vaults/fits/72_fits.mal sql/backends/monet5/vaults/fits/fits.mal sql/backends/monet5/vaults/netcdf/74_netcdf.mal sql/backends/monet5/vaults/netcdf/netcdf.mal sql/backends/monet5/vaults/shp/75_shp.mal sql/backends/monet5/vaults/shp/shp.mal sql/backends/monet5/wlr.mal Branch: Jan2022 Log Message:
Removed unused .mal files. All information is in the corresponding .c file. diffs (truncated from 78392 to 300 lines): diff --git a/geom/monetdb5/30_geom.mal b/geom/monetdb5/30_geom.mal deleted file mode 100644 --- a/geom/monetdb5/30_geom.mal +++ /dev/null @@ -1,8 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. - -# This loads the MonetDB/GIS module -include geom; diff --git a/geom/monetdb5/geom.mal b/geom/monetdb5/geom.mal deleted file mode 100644 --- a/geom/monetdb5/geom.mal +++ /dev/null @@ -1,400 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. - -# @' overwrite lng needed for fixed size! Sizes are fixed in geom.prelude -atom mbr:lng; - -command tostr() address mbrTOSTR; -command fromstr() address mbrFROMSTR; -command hash() address mbrHASH; -command null() address mbrNULL; -command cmp() address mbrCOMP; -command read() address mbrREAD; -command write() address mbrWRITE; - -#command mbr(v:str) :mbr address mbrFromString; - -atom wkb; - -command tostr() address wkbTOSTR; -command fromstr() address wkbFROMSTR; -command hash() address wkbHASH; -command null() address wkbNULL; -command cmp() address wkbCOMP; #used in selections -command read() address wkbREAD; #read from log -command write() address wkbWRITE; #write on log -command put() address wkbPUT; #put in heap -command del() address wkbDEL; #delete from heap -command length() address wkbLENGTH; -command heap() address wkbHEAP; #create heap - -#command wkb(v:str) :wkb address wkbFromString; - -atom wkba; -command tostr() address wkbaTOSTR; -command fromstr() address wkbaFROMSTR; -command null() address wkbaNULL; -command hash() address wkbaHASH; -command cmp() address wkbaCOMP; #used in selections -command read() address wkbaREAD; #read from log -command write() address wkbaWRITE; #write on log -command put() address wkbaPUT; #put in heap -command del() address wkbaDEL; #delete from heap -command length() address wkbaLENGTH; -command heap() address wkbaHEAP; #create heap - -module geom; - -command hasZ(flags:int) :int address geoHasZ -comment "returns 1 if the geometry has z coordinate"; -command hasM(flags:int) :int address geoHasM -comment "returns 1 if the geometry has m coordinate"; -command getType(flags:int, format:int) :str address geoGetType -comment "returns the str representation of the geometry type"; - - -command MLineStringToPolygon(wkt:str, srid:int, flag:int) :wkb address wkbMLineStringToPolygon -comment "Creates polygons using the MultiLineString provided as WKT. Depending on the flag creates one (flag=0) or multiple (flag=1) polygons"; - - -#Geometry Constructors -command AsBinary(w:wkb) :str address wkbAsBinary -comment "Returns the wkb representation into HEX format"; -command FromBinary(w:str) :wkb address wkbFromBinary -comment "Creates a wkb using the HEX representation"; - -#command AsText(w:wkb) :str address wkbAsText -#comment "Creates the text representation of the Geometry."; -#command AsEWKT(w:wkb) :str address wkbAsEWKT -#comment "Returns the text representation of the geometry including the srid"; - -command ToText(w:wkb, withSRID:int) :str address wkbAsText; - -command FromText(wkt:str, srid:int, type:int) :wkb address wkbFromText; -command NumRings(w:wkb, exterior:int) :int address wkbNumRings -comment "Returns the number of interior rings+exterior on the first polygon of the geometry"; - -command MakePointXYZM(x:dbl, y:dbl, z:dbl, m:dbl, zmFlag:int) :wkb address wkbMakePoint -comment "creates a point using the coordinates"; - -#command MakePoint(x:dbl, y:dbl) :wkb address geomMakePoint2D -#comment "creates a point using the coordinates"; -#command MakePoint(x:dbl, y:dbl, z:dbl) :wkb address geomMakePoint3D -#comment "creates a point using the coordinates"; -##Gives error. I do not know how to create 4d point -#command MakePoint(x:dbl, y:dbl, z:dbl, m:dbl) :wkb address geomMakePoint4D -#comment "creates a point using the coordinates"; -#command MakePointM(x:dbl, y:dbl, m:dbl) :wkb address geomMakePointM -#comment "creates a point using the coordinates"; - -#Geometry Accessors -command GeometryType(w:wkb, flag:int) :str address wkbGeometryType; - -command GetCoordinate(w:wkb, idx:int) :dbl address wkbGetCoordinate -comment "Returns the coordinate at position idx of a point, or NULL if not available. idx=0 -> X, idx=1 -> Y, idx=2 -> Z. Input must be point"; - -command Boundary(w:wkb) :wkb address wkbBoundary -comment "Returns the closure of the combinatorial boundary of the Geometry."; -command CoordDim(w:wkb) :int address wkbCoordDim -comment " Return the coordinate dimension of the geometry"; -command Dimension(w:wkb) :int address wkbDimension -comment "The inherent dimension of this Geometry object, which must be less than or equal to the coordinate dimension."; -command getSRID(w:wkb) :int address wkbGetSRID -comment "Returns the Spatial Reference System ID for this Geometry."; -command setSRID(w:wkb, srid:int) :wkb address wkbSetSRID -comment "Sets the Reference System ID for this Geometry."; -command StartPoint(w:wkb) :wkb address wkbStartPoint -comment "Returns the first point of a LINESTRING geometry as a POINT or NULL if the input parameter is not a LINESTRING"; -command EndPoint(w:wkb) :wkb address wkbEndPoint -comment "Returns the last point of a LINESTRING geometry as a POINT or NULL if the input parameter is not a LINESTRING."; -command PointN(w:wkb, n:int) :wkb address wkbPointN -comment "Returns the n-th point of the Geometry. Argument w should be Linestring."; -command Envelope(w:wkb) :wkb address wkbEnvelope -comment "The minimum bounding box for this Geometry, returned as a Geometry. The polygon is defined by the corner points of the bounding box ((MINX,MINY),(MAXX,MINY),(MAXX,MAXY),(MINX,MAXY))."; -command EnvelopeFromCoordinates(:dbl, :dbl, :dbl, :dbl, :int) :wkb address wkbEnvelopeFromCoordinates -comment "A polygon created by the provided coordinates"; -command Polygon(:wkb, :bat[:wkb], :int) :wkb address wkbMakePolygon -comment "Returns a Polygon created from the provided LineStrings"; -command ExteriorRing(w:wkb) :wkb address wkbExteriorRing -comment "Returns a line string representing the exterior ring of the POLYGON geometry. Return NULL if the geometry is not a polygon."; -command InteriorRingN(w:wkb, n:int) :wkb address wkbInteriorRingN -comment "Return the Nth interior linestring ring of the polygon geometry. Return NULL if the geometry is not a polygon or the given N is out of range."; -command InteriorRings(w:wkb) :wkba address wkbInteriorRings -comment "Returns an 'array' with all the interior rings of the polygon"; -command IsClosed(w:wkb) :bit address wkbIsClosed -comment "Returns TRUE if the LINESTRING's start and end points are coincident."; -command IsEmpty(w:wkb) :bit address wkbIsEmpty -comment "Returns true if this Geometry is an empty geometry."; -command IsRing(w:wkb) :bit address wkbIsRing -comment "Returns TRUE if this LINESTRING is both closed and simple."; -command IsSimple(w:wkb) :bit address wkbIsSimple -comment "Returns (TRUE) if this Geometry has no anomalous geometric points, such as self intersection or self tangency."; -command IsValid(w:wkb) :bit address wkbIsValid -comment "Returns true if the ST_Geometry is well formed."; -command IsValidReason(w:wkb) :str address wkbIsValidReason -comment "Returns text stating if a geometry is valid or not and if not valid, a reason why."; -command IsValidDetail(w:wkb) :str address wkbIsValidDetail -comment "Returns a valid_detail (valid,reason,location) row stating if a geometry is valid or not and if not valid, a reason why and a location where."; -command Area(w:wkb) :dbl address wkbArea -comment "Returns the area of the surface if it is a polygon or multi-polygon"; -command Centroid(w:wkb) :wkb address wkbCentroid -comment "Computes the geometric center of a geometry, or equivalently, the center of mass of the geometry as a POINT."; -command Distance(a:wkb, b:wkb) :dbl address wkbDistance -comment "Returns the 2-dimensional minimum cartesian distance between the two geometries in projected units (spatial ref units."; -command Length(w:wkb) :dbl address wkbLength -comment "Returns the cartesian 2D length of the geometry if it is a linestrin or multilinestring"; -command ConvexHull(w:wkb) :wkb address wkbConvexHull -comment "Returns a geometry that represents the convex hull of this geometry. The convex hull of a geometry represents the minimum convex geometry that encloses all geometries within the set."; -command Intersection(a:wkb, b:wkb) :wkb address wkbIntersection -comment "Returns a geometry that represents the point set intersection of the Geometries a, b"; -command Union(a:wkb, b:wkb) :wkb address wkbUnion -comment "Returns a geometry that represents the point set union of the Geometries a, b"; -command Union(a:bat[:wkb]) :wkb address wkbUnionAggr -comment "Gets a BAT with geometries and returns their union"; -command Difference(a:wkb, b:wkb) :wkb address wkbDifference -comment "Returns a geometry that represents that part of geometry A that does not intersect with geometry B"; -command SymDifference(a:wkb, b:wkb) :wkb address wkbSymDifference -comment "Returns a geometry that represents the portions of A and B that do not intersect"; -command Buffer(a:wkb, distance:dbl) :wkb address wkbBuffer -comment "Returns a geometry that represents all points whose distance from this geometry is less than or equal to distance. Calculations are in the Spatial Reference System of this Geometry."; -command Contains(a:wkb, b:wkb) :bit address wkbContains -comment "Returns true if and only if no points of B lie in the exterior of A, and at least one point of the interior of B lies in the interior of A."; -command Crosses(a:wkb, b:wkb) :bit address wkbCrosses -comment "Returns TRUE if the supplied geometries have some, but not all, interior points in common."; -command Disjoint(a:wkb, b:wkb) :bit address wkbDisjoint -comment "Returns true if these Geometries are 'spatially disjoint'"; -command Equals(a:wkb, b:wkb) :bit address wkbEquals -comment "Returns true if the given geometries represent the same geometry. Directionality is ignored."; -command Intersects(a:wkb, b:wkb) :bit address wkbIntersects -comment "Returns true if these Geometries 'spatially intersect in 2D'"; -command Overlaps(a:wkb, b:wkb) :bit address wkbOverlaps -comment " Returns TRUE if the Geometries intersect but are not completely contained by each other."; -command Relate(a:wkb, b:wkb, intersection_matrix_pattern:str) :bit address wkbRelate -comment "Returns true if the Geometry a 'spatially related' to Geometry b, by testing for intersection between the Interior, Boundary and Exterior of the two geometries as specified by the values in the intersectionPatternMatrix."; -command Touches(a:wkb, b:wkb) :bit address wkbTouches -comment "Returns TRUE if the geometries have at least one point in common, but their interiors do not intersect."; -command Within(a:wkb, b:wkb) :bit address wkbWithin -comment "Returns TRUE if the geometry A is completely inside geometry B"; -command Covers(a:wkb, b:wkb) :bit address wkbCovers -comment "Returns TRUE if no point of geometry B is outside geometry A"; -command CoveredBy(a:wkb, b:wkb) :bit address wkbCoveredBy -comment "Returns TRUE if no point of geometry A is outside geometry B"; -command DWithin(a:wkb, b:wkb, dst:dbl) :bit address wkbDWithin -comment "Returns true if the two geometries are within the specifies distance from each other"; -command GeometryN(g:wkb, n:int) :wkb address wkbGeometryN -comment "Returns the 1-based Nth geometry if the geometry is a GEOMETRYCOLLECTION, (MULTI)POINT, (MULTI)LINESTRING, MULTICURVE or (MULTI)POLYGON. Otherwise, return NULL"; -command NumGeometries(g:wkb) :int address wkbNumGeometries -comment "Returns the number of geometries"; - -command Transform(g:wkb, srid_src:int, srid_dst:int, proj_src:str, proj_dest:str) :wkb address wkbTransform -comment "Transforms a geometry from one srid to another"; -#postGIS has also flag=2 and then it returns a TIN -command DelaunayTriangles(a:wkb, tolerance:dbl, flag:int) :wkb address wkbDelaunayTriangles -comment "Returns a Delaunay triangulation, flag=0 => collection of polygons, flag=1 => multilinestring"; -command Dump(a:wkb) (id:bat[ :str], geom:bat[ :wkb]) address wkbDump -comment "Gets a MultiPolygon and returns the Polygons in it"; -command DumpPoints(a:wkb) (id:bat[ :str], geom:bat[ :wkb]) address wkbDumpPoints -comment "Gets a Geometry and returns the Points in it"; - -command Segmentize(g:wkb, sz:dbl) :wkb address wkbSegmentize -comment "It creates a new geometry with all segments on it smaller or equal to sz"; -command ForceDimensions(g:wkb, d:int) :wkb address wkbForceDim -comment "Removes or Adds additional coordinates in the geometry to make it d dimensions"; - -command Contains(a:wkb, x:dbl, y:dbl) :bit -address wkbContains_point -comment "Returns true if the Geometry a 'spatially contains' Geometry b"; - - -command Translate3D(g:wkb, dx:dbl, dy:dbl, dz:dbl) :wkb address wkbTranslate -comment "Moves all points of the geometry by dx, dy, dz"; - -command Contains(a:wkb, px:bat[:dbl], py:bat[:dbl]) :bat[:bit] -address wkbContains_point_bat -comment "Returns true if the Geometry-BAT a 'spatially contains' Geometry-B b"; - - -command PointsNum(w:wkb, check:int) :int address wkbNumPoints -comment "The number of points in the Geometry. If check=1, the geometry should be a linestring"; - -command MakeLine(a:wkb, b:wkb) :wkb address wkbMakeLine -comment "Gets two point or linestring geometries and returns a linestring geometry"; -command MakeLine(a:bat[:wkb]) :wkb address wkbMakeLineAggr -comment "Gets a BAT with point or linestring geometries and returns a single linestring geometry"; - -command PointOnSurface(w:wkb) :wkb address wkbPointOnSurface -comment "Returns a point guaranteed to lie on the surface. Similar to postGIS it works for points and lines in addition to surfaces and for 3d geometries."; - -command mbr(:wkb) :mbr address wkbMBR -comment "Creates the mbr for the given wkb."; -command MakeBox2D(:wkb,:wkb) :mbr address wkbBox2D -comment "Creates an mbr from the two 2D points"; - -command mbrOverlaps(geom1:wkb, geom2:wkb) :bit address mbrOverlaps_wkb -comment "Returns true if the mbr of geom1 overlaps the mbr of geom2"; -command mbrOverlaps(box1:mbr, box2:mbr) :bit address mbrOverlaps -comment "Returns true if box1 overlaps box2"; -command mbrOverlapOrLeft(geom1:wkb, geom2:wkb) :bit address mbrOverlapOrLeft_wkb -comment "Returns true if the mbr of geom1 overlaps or is to the left of thr mbr of geom2"; -command mbrOverlapOrLeft(box1:mbr, box2:mbr) :bit address mbrOverlapOrLeft -comment "Returns true if box1 overlaps or is to the left of box2"; -command mbrOverlapOrBelow(geom1:wkb, geom2:wkb) :bit address mbrOverlapOrBelow_wkb -comment "Returns true if the mbr of geom1 overlaps or is below the mbr of geom2"; -command mbrOverlapOrBelow(box1:mbr, box2:mbr) :bit address mbrOverlapOrBelow -comment "Returns true if box1 overlaps or is below box2"; -command mbrOverlapOrRight(geom1:wkb, geom2:wkb) :bit address mbrOverlapOrRight_wkb -comment "Returns true if the mbr of geom1 overlalps or is right of the mbr of geom2"; -command mbrOverlapOrRight(box1:mbr, box2:mbr) :bit address mbrOverlapOrRight -comment "Returns true if box1 overlalps or is right of box2"; -command mbrLeft(geom1:wkb, geom2:wkb) :bit address mbrLeft_wkb -comment "Returns true if the mbr of geom1 is left of the mbr of geom2"; -command mbrLeft(box1:mbr, box2:mbr) :bit address mbrLeft -comment "Returns true if box1 is left of box2"; -command mbrBelow(geom1:wkb, geom2:wkb) :bit address mbrBelow_wkb -comment "Returns true if the mbr of geom1 is below the mbr of geom2"; -command mbrBelow(box1:mbr, box2:mbr) :bit address mbrBelow -comment "Returns true if box1 is below box2"; -command mbrEqual(geom1:wkb, geom2:wkb) :bit address mbrEqual_wkb -comment "Returns true if the mbr of geom1 is the same as the mbr of geom2"; -command mbrEqual(box1:mbr, box2:mbr) :bit address mbrEqual -comment "Returns true if box1 is the same as box2"; -command mbrRight(geom1:wkb, geom2:wkb) :bit address mbrRight_wkb -comment "Returns true if the mbr of geom1 is right of the mbr of geom2"; -command mbrRight(box1:mbr, box2:mbr) :bit address mbrRight -comment "Returns true if box1 is right of box2"; -command mbrContained(geom1:wkb, geom2:wkb) :bit address mbrContained_wkb -comment "Returns true if the mbr of geom1 is contained by the mbr of geom2"; -command mbrContained(box1:mbr, box2:mbr) :bit address mbrContained -comment "Returns true if box1 is contained by box2"; -command mbrOverlapOrAbove(geom1:wkb, geom2:wkb) :bit address mbrOverlapOrAbove_wkb -comment "Returns true if the mbr of geom1 overlaps or is above the mbr of geom2"; -command mbrOverlapOrAbove(box1:mbr, box2:mbr) :bit address mbrOverlapOrAbove -comment "Returns true if box1 overlaps or is above box2"; -command mbrAbove(geom1:wkb, geom2:wkb) :bit address mbrAbove_wkb -comment "Returns true if the mbr of geom1 is above the mbr of geom2"; -command mbrAbove(box1:mbr, box2:mbr) :bit address mbrAbove -comment "Returns true if box1 is above box2"; -command mbrContains(geom1:wkb, geom2:wkb) :bit address mbrContains_wkb -comment "Returns true if the mbr of geom1 contains the mbr of geom2"; -command mbrContains(box1:mbr, box2:mbr) :bit address mbrContains _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
