Changeset: f17184ea3a56 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f17184ea3a56
Modified Files:
monetdb5/modules/atoms/Tests/contains.test
monetdb5/modules/atoms/Tests/contains_join.test
monetdb5/modules/atoms/Tests/ends_with_join.test
monetdb5/modules/atoms/Tests/endswith.test
monetdb5/modules/atoms/Tests/starts_with_join.test
monetdb5/modules/atoms/Tests/startswith.test
monetdb5/modules/kernel/Tests/batstr_asciify.test
monetdb5/modules/kernel/Tests/batstr_contains.test
monetdb5/modules/kernel/Tests/batstr_endswith.test
monetdb5/modules/kernel/Tests/batstr_startswith.test
Branch: sw_ew_c_sorting
Log Message:
Merge with Dec2023 and fix conflicts
diffs (truncated from 18255 to 300 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -217,6 +217,7 @@ HEAPalloc(Heap *h, size_t nitems, size_t
return GDK_FAIL;
}
GDKfree(nme);
+ TRC_DEBUG(HEAP, "%s %zu %p (mmap)\n", h->filename, size,
h->base);
}
h->newstorage = h->storage;
return GDK_SUCCEED;
diff --git a/geom/monetdb5/geom_atoms.c b/geom/monetdb5/geom_atoms.c
--- a/geom/monetdb5/geom_atoms.c
+++ b/geom/monetdb5/geom_atoms.c
@@ -272,8 +272,8 @@ wkbFROMSTR_withSRID(const char *geomWKT,
{
GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed
from the src string. */
GEOSWKTReader *WKT_reader;
- const char *polyhedralSurface = "POLYHEDRALSURFACE";
- const char *multiPolygon = "MULTIPOLYGON";
+ static const char polyhedralSurface[] = "POLYHEDRALSURFACE";
+ static const char multiPolygon[] = "MULTIPOLYGON";
char *geomWKT_new = NULL;
size_t parsedCharacters = 0;
diff --git a/geom/sql/functions/Tests/ST_DWithin.test
b/geom/sql/functions/Tests/ST_DWithin.test
--- a/geom/sql/functions/Tests/ST_DWithin.test
+++ b/geom/sql/functions/Tests/ST_DWithin.test
@@ -48,7 +48,7 @@ SELECT
FROM geometries
WHERE
[ST_POINT(17.5,17.5)]
- ST_DWITHIN
+ ST_DWITHIN
[geom,2]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -61,7 +61,7 @@ SELECT
FROM geometries
WHERE
[ST_POINT(5,15)]
- ST_DWITHIN
+ ST_DWITHIN
[geom,3]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -73,7 +73,7 @@ SELECT
FROM geometries
WHERE
[ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
- ST_DWITHIN
+ ST_DWITHIN
[geom,0]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -94,3 +94,4 @@ POLYGON ((0 20, 10 20, 20 20, 20 10, 0 2
POLYGON ((10 10, 20 10, 10 20, 10 10))
POLYGON ((10 10, 20 10, 20 20, 10 20, 10 10))
POLYGON ((10 20, 20 10, 20 20, 10 20))
+
diff --git a/geom/sql/functions/Tests/ST_DWithin2.test
b/geom/sql/functions/Tests/ST_DWithin2.test
--- a/geom/sql/functions/Tests/ST_DWithin2.test
+++ b/geom/sql/functions/Tests/ST_DWithin2.test
@@ -1,7 +1,7 @@
# TODO: Those test must be part of the ST_DWithin.test
# for gbox, hbox let us define
-# ambiguous_zone_min = dist(gbox, hbox) - diagonal(gbox)/2 - diagonal(hbox)/2
+# ambiguous_zone_min = dist(gbox, hbox) - diagonal(gbox)/2 - diagonal(hbox)/2
# ambiguous_zone_max = dist(gbox, hbox)
# for every distance d in the ST_DWithin (last arg) that falls in the
# zone we need to calculate the exact distance between for each
@@ -13,7 +13,7 @@
# - distance < ambiguous_zone_min expect false
# - dstance in ambiguous_zone AND distance > actual_distance expect true
# - distance > ambiguous_zone_max expect true
-query T rowsort
+query I rowsort
SELECT
ST_DWithin2(g, h, mbr(g), mbr(h), dist)
FROM (
@@ -23,16 +23,16 @@ FROM (
(ST_WKTToSQL('LINESTRING(1 1, 2 2)'), ST_WKTToSQL('LINESTRING(3 3, 4
4)'), 3)
) AS REL(g, h, dist)
----
-False
-True
-True
+0
+1
+1
# ambiguous_zone = [sqrt(2), 2 * sqrt(2)]
# actual_distance = 2 * sqrt(2)
# - distance < ambiguous_zone_min expect false
# - dstance in ambiguous_zone AND distance < actual_distance expect false
# - distance > ambiguous_zone_max expect true
-query T rowsort
+query I rowsort
SELECT
ST_DWithin2(g, h, mbr(g), mbr(h), dist)
FROM (
@@ -42,9 +42,9 @@ FROM (
(ST_WKTToSQL('LINESTRING(1 2, 2 1)'), ST_WKTToSQL('LINESTRING(3 4, 4
3)'), 3)
) AS REL(g, h, dist)
----
-False
-False
-True
+0
+0
+1
# the shapes are equilateral rhombuses
# ambiguous_zone = [sqrt(2), 2 * sqrt(2)]
@@ -53,7 +53,7 @@ True
# - distance in ambiguous_zone AND distance < actual_distance expect false
# - distance in ambiguous_zone AND distance > actual_distance expect true
# - distance > ambiguous_zone_max expect true
-query T rowsort
+query I rowsort
SELECT
ST_DWithin2(g, h, mbr(g), mbr(h), dist)
FROM (
@@ -80,8 +80,8 @@ FROM (
)
) AS REL(g, h, dist)
----
-False
-False
-True
-True
+0
+0
+1
+1
diff --git a/geom/sql/functions/Tests/ST_DWithinRTree.test
b/geom/sql/functions/Tests/ST_DWithinRTree.test
--- a/geom/sql/functions/Tests/ST_DWithinRTree.test
+++ b/geom/sql/functions/Tests/ST_DWithinRTree.test
@@ -48,7 +48,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(17.5,17.5)]
- ST_DWITHIN
+ ST_DWITHIN
[geom,2]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -61,7 +61,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(5,15)]
- ST_DWITHIN
+ ST_DWITHIN
[geom,3]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -73,7 +73,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
- ST_DWITHIN
+ ST_DWITHIN
[geom,0]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
diff --git a/geom/sql/functions/Tests/ST_Intersects.test
b/geom/sql/functions/Tests/ST_Intersects.test
--- a/geom/sql/functions/Tests/ST_Intersects.test
+++ b/geom/sql/functions/Tests/ST_Intersects.test
@@ -7,7 +7,7 @@ SELECT
FROM geometries
WHERE
[ST_POINT(10,10)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -19,7 +19,7 @@ SELECT
FROM geometries
WHERE
[ST_POINT(15,10)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -31,7 +31,7 @@ SELECT
FROM geometries
WHERE
[ST_POINT(15,15)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -45,7 +45,7 @@ SELECT
FROM geometries
WHERE
[ST_POINT(17.5,17.5)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -58,11 +58,10 @@ SELECT
FROM geometries
WHERE
[ST_POINT(5,15)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
-
## Line - Polygon
query T rowsort
SELECT
@@ -70,7 +69,7 @@ SELECT
FROM geometries
WHERE
[ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
diff --git a/geom/sql/functions/Tests/ST_IntersectsRTree.test
b/geom/sql/functions/Tests/ST_IntersectsRTree.test
--- a/geom/sql/functions/Tests/ST_IntersectsRTree.test
+++ b/geom/sql/functions/Tests/ST_IntersectsRTree.test
@@ -7,7 +7,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(10,10)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -19,7 +19,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(15,10)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((10 10, 20 10, 10 20, 10 10))
@@ -31,7 +31,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(15,15)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -45,7 +45,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(17.5,17.5)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
@@ -58,11 +58,10 @@ SELECT
FROM geometries_rtree
WHERE
[ST_POINT(5,15)]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
-
## Line - Polygon
query T rowsort
SELECT
@@ -70,7 +69,7 @@ SELECT
FROM geometries_rtree
WHERE
[ST_GEOMFROMTEXT('LINESTRING (0 0, 15 15)')]
- ST_INTERSECTS
+ ST_INTERSECTS
[geom]
----
POLYGON ((0 20, 10 20, 20 20, 20 10, 0 20))
diff --git a/geom/sql/functions/Tests/ST_MakeLine.test
b/geom/sql/functions/Tests/ST_MakeLine.test
--- a/geom/sql/functions/Tests/ST_MakeLine.test
+++ b/geom/sql/functions/Tests/ST_MakeLine.test
@@ -44,3 +44,4 @@ FROM (
----
LINESTRING (0 0, 10 10)
LINESTRING (20 20, 5 5)
+
diff --git a/geom/sql/functions/Tests/createRTreeIndex.test
b/geom/sql/functions/Tests/createRTreeIndex.test
--- a/geom/sql/functions/Tests/createRTreeIndex.test
+++ b/geom/sql/functions/Tests/createRTreeIndex.test
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
