MonetDB: leftmart - Merge with default branch.

[Stefan Manegold]

Changeset: c8757336c17f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8757336c17f
Modified Files:
        monetdb5/modules/kernel/microbenchmark.c
        sql/include/sql_relation.h
        sql/server/rel_rel.c
        sql/server/rel_rel.h
        sql/server/rel_updates.c
        sql/server/rel_updates.h
Branch: leftmart
Log Message:

Merge with default branch.


diffs (101 lines):

diff --git a/monetdb5/modules/kernel/microbenchmark.c 
b/monetdb5/modules/kernel/microbenchmark.c
--- a/monetdb5/modules/kernel/microbenchmark.c
+++ b/monetdb5/modules/kernel/microbenchmark.c
@@ -260,10 +260,12 @@ BATnormal(BAT **bn, oid *base, wrd *size
 
        assert(sizeof(unsigned int) == sizeof(flt));
 
+#if SIZEOF_BUN > 4
        if (n >= ((ulng) 1 << 32)) {
                GDKerror("BATnormal: size must be less than 2^32 = "LLFMT, 
(lng) 1 << 32);
                return GDK_FAIL;
        }
+#endif
        if (*size > (wrd)BUN_MAX) {
                GDKerror("BATnormal: size must not exceed BUN_MAX");
                return GDK_FAIL;
@@ -307,7 +309,7 @@ BATnormal(BAT **bn, oid *base, wrd *size
                const dbl j_m = (dbl) j - m;
                const dbl tmp = j_m * j_m / s_s_2;
 
-               rel[j] = pow(M_E, -tmp) / s_sqrt_2_pi;
+               rel[j] = (flt) (pow(M_E, -tmp) / s_sqrt_2_pi);
                tot += rel[j];
        }
        /* just in case we get tot != 1 due to. e.g.,
diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -267,6 +267,8 @@ typedef enum operator_type {
        (rel->subquery)
 #define set_subquery(rel) \
        rel->subquery = 1
+#define reset_subquery(rel) \
+       rel->subquery = 0
 
 #define rel_is_ref(rel)        (((sql_rel*)rel)->ref.refcnt > 1)
 
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -1064,3 +1064,16 @@ rel_or(mvc *sql, sql_rel *l, sql_rel *r,
        }
        return rel;
 }
+
+sql_table *
+rel_ddl_table_get(sql_rel *r)
+{
+       if (r->flag == DDL_ALTER_TABLE || r->flag == DDL_CREATE_TABLE || 
r->flag == DDL_CREATE_VIEW) {
+               sql_exp *e = r->exps->t->data;
+               atom *a = e->l;
+
+               return a->data.val.pval;
+       }
+       return NULL;
+}
+
diff --git a/sql/server/rel_rel.h b/sql/server/rel_rel.h
--- a/sql/server/rel_rel.h
+++ b/sql/server/rel_rel.h
@@ -68,4 +68,6 @@ extern sql_rel *rel_push_select(mvc *sql
 extern sql_rel *rel_push_join(mvc *sql, sql_rel *rel, sql_exp *ls, sql_exp 
*rs, sql_exp *rs2, sql_exp *e);
 extern sql_rel *rel_or(mvc *sql, sql_rel *l, sql_rel *r, list *oexps, list 
*lexps, list *rexps);
 
+extern sql_table *rel_ddl_table_get(sql_rel *r);
+
 #endif /* _REL_REL_H_ */
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -53,18 +53,6 @@ insert_exp_array(mvc *sql, sql_table *t,
 
 #define get_basetable(rel) rel->l
 
-sql_table *
-rel_ddl_table_get(sql_rel *r)
-{
-       if (r->flag == DDL_ALTER_TABLE || r->flag == DDL_CREATE_TABLE || 
r->flag == DDL_CREATE_VIEW) {
-               sql_exp *e = r->exps->t->data;
-               atom *a = e->l;
-
-               return a->data.val.pval;
-       }
-       return NULL;
-}
-
 static sql_table *
 get_table( sql_rel *t)
 {
diff --git a/sql/server/rel_updates.h b/sql/server/rel_updates.h
--- a/sql/server/rel_updates.h
+++ b/sql/server/rel_updates.h
@@ -16,8 +16,6 @@
 #include "sql_mvc.h"
 #include <sql_relation.h>
 
-extern sql_table *rel_ddl_table_get(sql_rel *r);
-
 extern sql_exp **table_update_array(mvc *sql, sql_table *t);
 extern sql_rel *rel_update(mvc *sql, sql_rel *t, sql_rel *uprel, sql_exp 
**updates, list *exps);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list