Changeset: 431f0275e69a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=431f0275e69a
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geomBulk.c
geom/monetdb5/sfcgalBulk.c
Branch: sfcgal
Log Message:
BAThdense is gone, fix compilation once again
diffs (101 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -4507,11 +4507,6 @@ wkbUnionAggr(wkb **outWKB, bat *inBAT_id
}
return MAL_SUCCEED;
}
- //check if the BATs are dense and aligned
- if (!BAThdense(inBAT)) {
- BBPunfix(inBAT->batCacheid);
- throw(MAL, "geom.Union", "BATs must have dense heads");
- }
if (BATcount(inBAT) == 0) {
BBPunfix(inBAT->batCacheid);
@@ -4625,11 +4620,6 @@ wkbUnionCascade(wkb **outWKB, bat *inBAT
}
return MAL_SUCCEED;
}
- //check if the BATs are dense and aligned
- if (!BAThdense(inBAT)) {
- BBPunfix(inBAT->batCacheid);
- throw(MAL, "geom.Collect", "BATs must have dense heads");
- }
//iterator over the BATs
inBAT_iter = bat_iterator(inBAT);
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -1397,10 +1397,6 @@ wkbAsX3D_bat(bat *outBAT_id, bat *inBAT_
throw(MAL, "batgeom.SetSRID", "Problem retrieving BAT");
}
- if (!BAThdense(inBAT)) {
- BBPunfix(inBAT->batCacheid);
- throw(MAL, "batgeom.SetSRID", "The BAT must have dense head");
- }
//create a new BAT for the output
if ((outBAT = COLnew(inBAT->hseqbase, ATOMindex("str"),
BATcount(inBAT), TRANSIENT)) == NULL) {
BBPunfix(inBAT->batCacheid);
@@ -1446,22 +1442,11 @@ wkbIntersection_bat(bat *outBAT_id, bat
throw(MAL, "batgeom.Intersection", "Problem retrieving BAT");
}
- if (!BAThdense(aBAT)) {
- BBPunfix(aBAT->batCacheid);
- throw(MAL, "batgeom.Intersection", "The BAT must have dense
head");
- }
-
if ((bBAT = BATdescriptor(*bBAT_id)) == NULL) {
BBPunfix(aBAT->batCacheid);
throw(MAL, "batgeom.Intersection", "Problem retrieving BAT");
}
- if (!BAThdense(bBAT)) {
- BBPunfix(aBAT->batCacheid);
- BBPunfix(bBAT->batCacheid);
- throw(MAL, "batgeom.Intersection", "The BAT must have dense
head");
- }
-
if (BATcount(aBAT) != BATcount(bBAT)) {
BBPunfix(aBAT->batCacheid);
BBPunfix(bBAT->batCacheid);
@@ -1519,22 +1504,11 @@ wkbIntersection_bat_s(bat *outBAT_id, ba
throw(MAL, "batgeom.Intersection", "Problem retrieving BAT");
}
- if (!BAThdense(aBAT)) {
- BBPunfix(aBAT->batCacheid);
- throw(MAL, "batgeom.Intersection", "The BAT must have dense
head");
- }
-
if ((bBAT = BATdescriptor(*bBAT_id)) == NULL) {
BBPunfix(aBAT->batCacheid);
throw(MAL, "batgeom.Intersection", "Problem retrieving BAT");
}
- if (!BAThdense(bBAT)) {
- BBPunfix(aBAT->batCacheid);
- BBPunfix(bBAT->batCacheid);
- throw(MAL, "batgeom.Intersection", "The BAT must have dense
head");
- }
-
if (BATcount(aBAT) != BATcount(bBAT)) {
BBPunfix(aBAT->batCacheid);
BBPunfix(bBAT->batCacheid);
diff --git a/geom/monetdb5/sfcgalBulk.c b/geom/monetdb5/sfcgalBulk.c
--- a/geom/monetdb5/sfcgalBulk.c
+++ b/geom/monetdb5/sfcgalBulk.c
@@ -25,10 +25,6 @@ geom_sfcgal_triangulate2DZ_bat(bat *outB
throw(MAL, "batgeom.geom_sfcgal_triangle2DZ", "Problem
retrieving BAT");
}
- if (!BAThdense(inBAT)) {
- BBPunfix(inBAT->batCacheid);
- throw(MAL, "batgeom.geom_sfcgal_triangle2DZ", "The BAT must
have dense head");
- }
//create a new BAT for the output
if ((outBAT = COLnew(inBAT->hseqbase, ATOMindex("wkb"),
BATcount(inBAT), TRANSIENT)) == NULL) {
BBPunfix(inBAT->batCacheid);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
