MonetDB: Aug2018 - make sure we know the types to insert/update ...

[Niels Nes]

Changeset: d13c812eb9f9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d13c812eb9f9
Modified Files:
        gdk/gdk_logger.c
Branch: Aug2018
Log Message:

make sure we know the types to insert/update (needed for snapshot inserted bats)


diffs (27 lines):

diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -388,11 +388,23 @@ log_read_updates(logger *lg, trans *tr, 
                                        tt = TYPE_void;
                                }
                                break;
+                       } else if (tr->changes[i].type == LOG_USE && 
strcmp(tr->changes[i].name, name) == 0) {
+                               log_bid bid = (log_bid) tr->changes[i].nr;
+                               BAT *b = BATdescriptor(bid);
+
+                               if (b) {
+                                       ht = TYPE_void;
+                                       tt = b->ttype;
+                               }
+                               break;
                        }
                }
        }
        assert((ht == TYPE_void && l->flag == LOG_INSERT) ||
               ((ht == TYPE_oid || !ht) && l->flag == LOG_UPDATE));
+       if ((ht != TYPE_void && l->flag == LOG_INSERT) ||
+          ((ht != TYPE_void && ht != TYPE_oid) && l->flag == LOG_UPDATE))
+               return LOG_ERR;
        if (ht >= 0 && tt >= 0) {
                BAT *uid = NULL;
                BAT *r;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list