Changeset: 99cd4cdf17b4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=99cd4cdf17b4
Modified Files:
sql/backends/monet5/vaults/lidar/lidar.c
Branch: data-vaults
Log Message:
We are headless now
diffs (62 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -1158,9 +1158,9 @@ str LIDARloadTable_(mvc *m, sql_schema *
error_code = 5;
}
/* ||||||| base */
-/* x = BATnew(TYPE_void, TYPE_dbl, rows, PERSISTENT); */
-/* y = BATnew(TYPE_void, TYPE_dbl, rows, PERSISTENT); */
-/* z = BATnew(TYPE_void, TYPE_dbl, rows, PERSISTENT); */
+/* x = COLnew(0, TYPE_dbl, rows, PERSISTENT); */
+/* y = COLnew(0, TYPE_dbl, rows, PERSISTENT); */
+/* z = COLnew(0, TYPE_dbl, rows, PERSISTENT); */
/* ======= */
/* x = COLnew(0, TYPE_dbl, rows, PERSISTENT); */
/* y = COLnew(0, TYPE_dbl, rows, PERSISTENT); */
@@ -1200,9 +1200,9 @@ str LIDARloadTable_(mvc *m, sql_schema *
/* <<<<<<< local */
/* ||||||| base */
-/* BATseqbase(x, 0); */
-/* BATseqbase(y, 0); */
-/* BATseqbase(z, 0); */
+/* BAThseqbase(x, 0); */
+/* BAThseqbase(y, 0); */
+/* BAThseqbase(z, 0); */
/* px = (dbl *) Tloc(x, BUNfirst(x)); */
/* py = (dbl *) Tloc(y, BUNfirst(y)); */
@@ -1594,7 +1594,7 @@ mvc_lidar_bind_wrap(Client cntxt, MalBlk
if (*access == 0) {
psz = cnt ? (cnt / nr_parts) : 0;
bn = BATslice(b, part_nr * psz, (part_nr + 1 == nr_parts) ?
cnt : ((part_nr + 1) * psz));
- BATseqbase(bn, part_nr * psz);
+ BAThseqbase(bn, part_nr * psz);
} else {
/* BAT b holds the UPD_ID bat */
oid l, h;
@@ -1717,12 +1717,11 @@ LIDARTid(Client cntxt, MalBlkPtr mb, Mal
}
/* create void,void bat with length and oid's set */
- tids = BATnew(TYPE_void, TYPE_void, 0, TRANSIENT);
+ tids = COLnew(sb, TYPE_void, 0, TRANSIENT);
if (tids == NULL)
throw(SQL, "sql.tid", MAL_MALLOC_FAIL);
BATsetcount(tids, (BUN) nr);
- BATseqbase(tids, sb);
- BATseqbase(BATmirror(tids), sb);
+ BATtseqbase(tids, sb);
if (store_funcs.count_del(tr, t)) {
BAT *d = store_funcs.bind_del(tr, t, RD_INS);
@@ -1733,7 +1732,7 @@ LIDARTid(Client cntxt, MalBlkPtr mb, Mal
diff = BATdiff(tids, d, NULL, NULL, 0, BUN_NONE);
BBPunfix(d->batCacheid);
BBPunfix(tids->batCacheid);
- BATseqbase(diff, sb);
+ BAThseqbase(diff, sb);
tids = diff;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
