MonetDB: Jul2021 - make sure we use the same sized columns / cands

[Niels Nes]

Changeset: 1e1abb88c0b5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1e1abb88c0b5
Modified Files:
        sql/backends/monet5/sql.c
Branch: Jul2021
Log Message:

make sure we use the same sized columns / cands


diffs (23 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1226,6 +1226,9 @@ mvc_bind_wrap(Client cntxt, MalBlkPtr mb
                return msg;
        if ((msg = checkSQLContext(cntxt)) != NULL)
                return msg;
+       sql_schema *s = mvc_bind_schema(m, sname);
+       sql_table *t = mvc_bind_table(m, s, tname);
+       sql_column *c = mvc_bind_column(m, t, cname);
        b = mvc_bind(m, sname, tname, cname, access);
        if (b && b->ttype != coltype) {
                BBPunfix(b->batCacheid);
@@ -1233,7 +1236,9 @@ mvc_bind_wrap(Client cntxt, MalBlkPtr mb
        }
        if (b) {
                if (pci->argc == (8 + upd) && getArgType(mb, pci, 6 + upd) == 
TYPE_int) {
+                       sqlstore *store = m->session->tr->store;
                        BUN cnt = BATcount(b), psz;
+                       cnt = store->storage_api.count_col(m->session->tr, c, 
0);
                        /* partitioned access */
                        int part_nr = *getArgReference_int(stk, pci, 6 + upd);
                        int nr_parts = *getArgReference_int(stk, pci, 7 + upd);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list