Changeset: b729c688d7d7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b729c688d7d7
Modified Files:
gdk/gdk_bbp.c
Branch: default
Log Message:
Merged with Jan2022
diffs (51 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1878,7 +1878,7 @@ heap_entry(FILE *fp, BATiter *bi, BUN si
b->tvarsized,
(unsigned short) b->tsorted |
((unsigned short) b->trevsorted << 7) |
- (((unsigned short) b->tkey & 0x01) << 8) |
+ ((unsigned short) b->tkey << 8) |
((unsigned short) BATtdense(b) << 9) |
((unsigned short) b->tnonil << 10) |
((unsigned short) b->tnil << 11),
diff --git a/sql/backends/monet5/generator/generator.c
b/sql/backends/monet5/generator/generator.c
--- a/sql/backends/monet5/generator/generator.c
+++ b/sql/backends/monet5/generator/generator.c
@@ -419,7 +419,7 @@ VLTgenerator_subselect(Client cntxt, Mal
}
if (cand)
BBPunfix(cand->batCacheid);
- BATsetcount(bn, (BUN) n);
+ BATsetcount(bn, n);
bn->tsorted = true;
bn->trevsorted = BATcount(bn) <= 1;
bn->tkey = true;
@@ -567,11 +567,11 @@ VLTgenerator_subselect(Client cntxt, Mal
str VLTgenerator_thetasubselect(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
{
- int c= 0, anti =0,tpe;
+ int anti =0,tpe;
bat cndid =0;
BAT *cand = 0, *bn = NULL;
struct canditer ci = (struct canditer) {.tpe = cand_dense};
- BUN cap,j;
+ BUN cap,j, c = 0;
oid o = 0;
InstrPtr p;
str oper;
@@ -741,10 +741,10 @@ str VLTgenerator_thetasubselect(Client c
str VLTgenerator_projection(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci)
{
- int c= 0, tpe;
+ int tpe;
bat *ret;
BAT *b, *bn = NULL;
- BUN cnt;
+ BUN cnt, c = 0;
oid *ol = NULL, o= 0;
InstrPtr p;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
