MonetDB: context - merged with default

[Niels Nes]

Changeset: 94e275012d4a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94e275012d4a
Modified Files:
        gdk/gdk_hash.c
        sql/backends/monet5/rel_bin.c
        sql/server/rel_sequence.c
        sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.err
        sql/test/BugTracker-2018/Tests/lateral-join-crash.Bug-6613.stable.out
        sql/test/BugTracker-2019/Tests/All
        
sql/test/BugTracker-2019/Tests/duplicates-not-eliminated-long-CASE-stmt.Bug-6697.stable.out
Branch: context
Log Message:

merged with default


diffs (63 lines):

diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -76,7 +76,7 @@ HASHmask(BUN cnt)
        return m;
 }
 
-static void
+static inline void
 HASHclear(Hash *h)
 {
        /* since BUN2_NONE, BUN4_NONE, BUN8_NONE
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -2902,6 +2902,11 @@ rel2bin_select(backend *be, sql_rel *rel
                if (s->nrcols == 0){
                        if (!predicate && sub)
                                predicate = stmt_const(be, bin_first_column(be, 
sub), stmt_bool(be, 1));
+                       if (e->type != e_cmp) {
+                               sql_subtype *bt = sql_bind_localtype("bit");
+
+                               s = stmt_convert(be, s, exp_subtype(e), bt);
+                       }
                        sel = stmt_uselect(be, predicate, s, cmp_equal, sel, 0);
                } else if (e->type != e_cmp) {
                        sel = stmt_uselect(be, s, stmt_bool(be, 1), cmp_equal, 
NULL, 0);
diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -261,6 +261,11 @@ rel_alter_seq(
                val = rel_value_exp2(query, &r, start_list->h->next->data.sym, 
sql_sel, ek, &is_last);
                if (!val || !(val = rel_check_type(sql, lng_t, val, 
type_equal)))
                        return NULL;
+               if (val && r && r->op == op_project) {
+                       exp_label(sql->sa, val, ++sql->label);
+                       val = rel_project_add_exp(sql, r, val);
+                       val = exp_ref(sql->sa, val);
+               }
        } else if (start_type == 2) {
                assert (start_list->h->next->type == type_lng);
                val = exp_atom_lng(sql->sa, start_list->h->next->data.l_val);
diff --git a/sql/test/BugTracker-2019/Tests/All 
b/sql/test/BugTracker-2019/Tests/All
--- a/sql/test/BugTracker-2019/Tests/All
+++ b/sql/test/BugTracker-2019/Tests/All
@@ -2,13 +2,13 @@ copy-into-from-stdin-empty-line.Bug-6669
 HAVE_LIBR?r-date.Bug-6674
 date_trunc
 date_trunc_bulk
-KNOWNFAIL?subselect-contradiction.Bug-6683
+subselect-contradiction.Bug-6683
 insert-replica-table.Bug-6684
-KNOWNFAIL?subselect-count.Bug-6686
-KNOWNFAIL?subselect.Bug-6688
+subselect-count.Bug-6686
+subselect.Bug-6688
 timestamptransformation.Bug-6695
 duplicates-not-eliminated-long-CASE-stmt.Bug-6697
-KNOWNFAIL?subselect.Bug-6700
+subselect.Bug-6700
 alter_table_set_schema.Bug-6701
 crash-in-rel_dependencies.Bug-6703
 prepared-merge-statement.Bug-6706
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list