Changeset: a0d85d00c331 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a0d85d00c331
Modified Files:
gdk/gdk_rtree.c
geom/monetdb5/geom.c
Branch: geo-update-dev
Log Message:
Fixed jump-misses-init error in Collect, added HAVE_RTREE guards in gdk_rtree.c.
diffs (37 lines):
diff --git a/gdk/gdk_rtree.c b/gdk/gdk_rtree.c
--- a/gdk/gdk_rtree.c
+++ b/gdk/gdk_rtree.c
@@ -12,6 +12,7 @@
* - The heap is not dirty -> no new values
* - DB Farm is persistent i.e. not in memory
*/
+#ifdef HAVE_RTREE
static bool
RTREEpersistcheck (BAT *b) {
return ((BBP_status(b->batCacheid) & BBPEXISTING)
@@ -347,3 +348,4 @@ RTREEsearch(BAT *b, mbr_t *inMBR, int re
} else
return NULL;
}
+#endif
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -56,6 +56,8 @@ wkbCollectAggrSubGroupedCand(bat *outid,
const oid *gids = NULL;
str msg = MAL_SUCCEED;
const char *err;
+ //SRID for collection
+ int srid = 0;
oid min, max;
BUN ngrp;
@@ -129,8 +131,6 @@ wkbCollectAggrSubGroupedCand(bat *outid,
if (g && !BATtdense(g))
gids = (const oid *)Tloc(g, 0);
bi = bat_iterator(b);
- //SRID for collection
- int srid = 0;
for (BUN i = 0; i < ci.ncand; i++) {
oid o = canditer_next(&ci);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
