Changeset: 094b55abe4aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=094b55abe4aa
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geomBulk.c
Branch: sfcgal
Log Message:
When you do BUNappend no need to derive properties neither set count.
diffs (152 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -6735,10 +6735,12 @@ Intersectssubjoin_intern(bat *lres, bat
}
GDKfree(rGeometries);
}
+ /*
BATrmprops(xl)
BATsettrivprop(xl);
BATrmprops(xr)
BATsettrivprop(xr);
+ */
BBPunfix(*lid);
BBPunfix(*rid);
BBPkeepref(*lres = xl->batCacheid);
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -103,9 +103,9 @@ geom_2_geom_bat(bat *outBAT_id, bat *inB
fprintf(stdout, "batcalc.wkb BUNappend %llu ms\n", t);
#endif
- BATsetcount(outBAT, BATcount(inBAT));
- BATrmprops(outBAT)
- BATsettrivprop(outBAT);
+ //BATsetcount(outBAT, BATcount(inBAT));
+ //BATrmprops(outBAT)
+ //BATsettrivprop(outBAT);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
return MAL_SUCCEED;
@@ -149,7 +149,7 @@ wkbFromText_bat(bat *outBAT_id, bat *inB
}
//set the number of elements in the outBAT
- BATsetcount(outBAT, BATcount(inBAT));
+ //BATsetcount(outBAT, BATcount(inBAT));
BBPunfix(inBAT->batCacheid);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
@@ -273,7 +273,7 @@ WKBtoSTRflagINT_bat(bat *outBAT_id, bat
}
//set the number of elements in the outBAT
- BATsetcount(outBAT, BATcount(inBAT));
+ //BATsetcount(outBAT, BATcount(inBAT));
BBPunfix(inBAT->batCacheid);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
@@ -462,9 +462,9 @@ WKBtoWKB_bat(bat *outBAT_id, bat *inBAT_
#endif
//set the number of elements in the outBAT
- BATsetcount(outBAT, BATcount(inBAT));
- BATrmprops(outBAT)
- BATsettrivprop(outBAT);
+ //BATsetcount(outBAT, BATcount(inBAT));
+ //BATrmprops(outBAT)
+ //BATsettrivprop(outBAT);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
return MAL_SUCCEED;
@@ -568,9 +568,9 @@ WKBtoWKBflagINT_bat(bat *outBAT_id, bat
fprintf(stdout, "batcalc.wkb BUNappend %llu ms\n", t);
#endif
- BATsetcount(outBAT, BATcount(inBAT));
- BATrmprops(outBAT)
- BATsettrivprop(outBAT);
+ //BATsetcount(outBAT, BATcount(inBAT));
+ //BATrmprops(outBAT)
+ //BATsettrivprop(outBAT);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
return MAL_SUCCEED;
@@ -1307,9 +1307,9 @@ WKBtoWKBxyzDBL_bat(bat *outBAT_id, bat *
fprintf(stdout, "batcalc.wkb BUNappend %llu ms\n", t);
#endif
- BATsetcount(outBAT, BATcount(inBAT));
- BATrmprops(outBAT)
- BATsettrivprop(outBAT);
+ //BATsetcount(outBAT, BATcount(inBAT));
+ //BATrmprops(outBAT)
+ //BATsettrivprop(outBAT);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
return MAL_SUCCEED;
@@ -1624,8 +1624,6 @@ wkbMakePoint_bat(bat *outBAT_id, bat *xB
pointWKB = NULL;
}
- //set the number of elements in the outBAT
- BATsetcount(outBAT, BATcount(xBAT));
BBPkeepref(*outBAT_id = outBAT->batCacheid);
clean:
@@ -1891,6 +1889,7 @@ wkbDump_bat(bat *parentBAT_id, bat *idBA
BBPunfix(inParentBAT->batCacheid);
/*Set counts*/
+ /*
BATsetcount(idBAT, geometriesCnt);
BATrmprops(idBAT)
BATsettrivprop(idBAT);
@@ -1902,6 +1901,7 @@ wkbDump_bat(bat *parentBAT_id, bat *idBA
BATrmprops(parentBAT)
BATsettrivprop(parentBAT);
}
+ */
/*Keep refs for output BATs*/
BBPkeepref(*idBAT_id = idBAT->batCacheid);
@@ -1979,13 +1979,6 @@ wkbFilter_bat(bat *aBATfiltered_id, bat
}
}
- //set some properties of the new BATs
- BATsetcount(aBATfiltered, remainingElements);
- BATsettrivprop(aBATfiltered);
-
- BATsetcount(bBATfiltered, remainingElements);
- BATsettrivprop(bBATfiltered);
-
BBPunfix(aBAT->batCacheid);
BBPunfix(bBAT->batCacheid);
BBPkeepref(*aBATfiltered_id = aBATfiltered->batCacheid);
@@ -2064,8 +2057,8 @@ wkbFilter_geom_bat(bat *BATfiltered_id,
}
//set some properties of the new BATs
- BATsetcount(BATfiltered, remainingElements);
- BATsettrivprop(BATfiltered);
+ //BATsetcount(BATfiltered, remainingElements);
+ //BATsettrivprop(BATfiltered);
BBPunfix(BAToriginal->batCacheid);
BBPkeepref(*BATfiltered_id = BATfiltered->batCacheid);
@@ -2120,9 +2113,9 @@ wkbMBR_bat(bat *outBAT_id, bat *inBAT_id
}
//set some properties of the new BAT
- BATsetcount(outBAT, BATcount(inBAT));
- BATrmprops(outBAT)
- BATsettrivprop(outBAT);
+ //BATsetcount(outBAT, BATcount(inBAT));
+ //BATrmprops(outBAT)
+ //BATsettrivprop(outBAT);
BBPunfix(inBAT->batCacheid);
BBPkeepref(*outBAT_id = outBAT->batCacheid);
return MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
