Changeset: 37dcf3802751 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=37dcf3802751
Modified Files:
gdk/gdk_join.c
sql/storage/bat/bat_storage.c
Branch: arrays
Log Message:
commened some code that was used in previous arrays implementation
diffs (37 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -3234,7 +3234,7 @@ BATproject(BAT *l, BAT *r)
assert(BAThdense(l));
assert(BAThdense(r));
assert(ATOMtype(l->ttype) == TYPE_oid);
-
+#if 0
if(isBATarray(r)) {
if(dimensionBATproject(&bn, l, r) != GDK_SUCCEED)
return NULL;
@@ -3243,7 +3243,7 @@ BATproject(BAT *l, BAT *r)
//otherwise it is cannot be expressed as an array and we
proceed as if it is any other BAT
r = materialiseDimensionBAT(r);
}
-
+#endif
if (BATtdense(l) && BATcount(l) > 0) {
lo = l->tseqbase;
hi = l->tseqbase + BATcount(l);
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -213,10 +213,11 @@ delta_update_bat( sql_delta *bat, BAT *t
bat->cached = NULL;
}
+#if 0
//materialise the dimension
if(isBATarray(updates))
updates = materialiseDimensionBAT(updates);
-
+#endif
if (!is_new && bat->uibid && bat->uvbid) {
BAT *ib = temp_descriptor(bat->ibid), *otids = tids;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
