date:20240407

MonetDB: no_type_bat - single threaded gets different output

2024-04-07 Thread Niels Nes via checkin-list

Changeset: 6a195f418d51 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6a195f418d51
Modified Files:
clients/odbc/tests/ODBCmetadata.c
Branch: no_type_bat
Log Message:

single threaded gets different output


diffs (12 lines):

diff --git a/clients/odbc/tests/ODBCmetadata.c 
b/clients/odbc/tests/ODBCmetadata.c
--- a/clients/odbc/tests/ODBCmetadata.c
+++ b/clients/odbc/tests/ODBCmetadata.c
@@ -1611,7 +1611,7 @@ main(int argc, char **argv)
"Resultset with 2 columns\n"
"Resultset with 11 rows\n"
"usec   statement\n"
-   "BIGINT WVARCHAR(249)\n"
+   "BIGINT WVARCHAR(240)\n"
"4  variable output\n"
"4  variable output\n"
"4  variable output\n"
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: default - changed RTREEsearch export

2024-04-07 Thread Niels Nes via checkin-list

Changeset: de3320b2d5d1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/de3320b2d5d1
Modified Files:
clients/Tests/exports.stable.out
Branch: default
Log Message:

changed RTREEsearch export


diffs (12 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -404,7 +404,7 @@ void RTREEdestroy(BAT *b);
 bool RTREEexists(BAT *b);
 bool RTREEexists_bid(bat bid);
 void RTREEfree(BAT *b);
-BUN *RTREEsearch(BAT *b, mbr_t *inMBR, int result_limit);
+BUN *RTREEsearch(BAT *b, const void *inMBR, int result_limit);
 BUN SORTfnd(BAT *b, const void *v);
 BUN SORTfndfirst(BAT *b, const void *v);
 BUN SORTfndlast(BAT *b, const void *v);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: no_type_bat - fix overwriting names

2024-04-07 Thread Niels Nes via checkin-list

Changeset: 3ac0f374f59b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3ac0f374f59b
Modified Files:
monetdb5/mal/mal_namespace.c
Branch: no_type_bat
Log Message:

fix overwriting names


diffs (13 lines):

diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -127,7 +127,8 @@ findName(const char *nme, size_t len, bo
namespace = ns;
}
m = &namespace->data[namespace->count++];
-   strncpy(m->nme, nme, len);
+   if (m->nme != nme)
+   strncpy(m->nme, nme, len);
m->nme[len] = 0;
m->length = (unsigned short) len;
m->next = *n;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: no_type_bat - merged with default

2024-04-07 Thread Niels Nes via checkin-list

Changeset: 15c345a6b882 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/15c345a6b882
Modified Files:
clients/Tests/exports.stable.out
Branch: no_type_bat
Log Message:

merged with default


diffs (12 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -404,7 +404,7 @@ void RTREEdestroy(BAT *b);
 bool RTREEexists(BAT *b);
 bool RTREEexists_bid(bat bid);
 void RTREEfree(BAT *b);
-BUN *RTREEsearch(BAT *b, mbr_t *inMBR, int result_limit);
+BUN *RTREEsearch(BAT *b, const void *inMBR, int result_limit);
 BUN SORTfnd(BAT *b, const void *v);
 BUN SORTfndfirst(BAT *b, const void *v);
 BUN SORTfndlast(BAT *b, const void *v);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: default - we need to allocate now that the exp_setname ...

2024-04-07 Thread Niels Nes via checkin-list

Changeset: dc4b070e9529 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dc4b070e9529
Modified Files:
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_rel.c
sql/server/rel_select.c
Branch: default
Log Message:

we need to allocate now that the exp_setname just uses the sql_allocator 
allocated strings


diffs (80 lines):

diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -1639,7 +1639,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
if (r[*pos] != '.') {
cname = tname;
tname = NULL;
-   exp_setname(sql->sa, exp, NULL, cname);
+   exp_setname(sql->sa, exp, NULL, sa_strdup(sql->sa, 
cname));
skipWS(r, pos);
} else {
(*pos)++;
@@ -1648,7 +1648,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
convertIdent(cname);
(*pos)++;
skipWS(r, pos);
-   exp_setname(sql->sa, exp, tname, cname);
+   exp_setname(sql->sa, exp, sa_strdup(sql->sa, tname), 
sa_strdup(sql->sa, cname));
}
rlabel = try_update_label_count(sql, tname);
nlabel = try_update_label_count(sql, cname);
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -951,10 +951,11 @@ exp_exception(sql_allocator *sa, sql_exp
 void
 exp_setname(sql_allocator *sa, sql_exp *e, const char *rname, const char *name 
)
 {
+   (void)sa;
e->alias.label = 0;
if (name)
-   e->alias.name = sa_strdup(sa, name);
-   e->alias.rname = (rname)?sa_strdup(sa, rname):NULL;
+   e->alias.name = name;
+   e->alias.rname = (rname);
 }
 
 void
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
@@ -793,7 +793,7 @@ rel_label( mvc *sql, sql_rel *r, int all
char tname[16], *tnme;
char cname[16], *cnme = NULL;
 
-   tnme = number2name(tname, sizeof(tname), nr);
+   tnme = sa_strdup(sql->sa, number2name(tname, sizeof(tname), nr));
if (!is_simple_project(r->op))
r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 1, 
1));
if (!list_empty(r->exps)) {
@@ -804,7 +804,7 @@ rel_label( mvc *sql, sql_rel *r, int all
if (!is_freevar(e)) {
if (all) {
nr = ++sql->label;
-   cnme = number2name(cname, 
sizeof(cname), nr);
+   cnme = sa_strdup(sql->sa, 
number2name(cname, sizeof(cname), nr));
}
exp_setname(sql->sa, e, tnme, cnme );
}
@@ -815,7 +815,7 @@ rel_label( mvc *sql, sql_rel *r, int all
for (node *ne = ((list*)r->r)->h; ne; ne = ne->next) {
if (all) {
nr = ++sql->label;
-   cnme = number2name(cname, sizeof(cname), nr);
+   cnme = sa_strdup(sql->sa, number2name(cname, 
sizeof(cname), nr));
}
exp_setname(sql->sa, ne->data, tnme, cnme );
}
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -5870,7 +5870,7 @@ rel_joinquery_(sql_query *query, symbol 
list *outexps = new_exp_list(sql->sa), *exps;
node *m;
 
-   rnme = number2name(rname, sizeof(rname), ++sql->label);
+   rnme = sa_strdup(sql->sa, number2name(rname, sizeof(rname), 
++sql->label));
for (; n; n = n->next) {
char *nm = n->data.sval;
sql_exp *cond, *ls, *rs;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: no_type_bat - merged with default

2024-04-07 Thread Niels Nes via checkin-list

Changeset: 51041ada91fa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/51041ada91fa
Modified Files:
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_rel.c
sql/server/rel_select.c
Branch: no_type_bat
Log Message:

merged with default


diffs (80 lines):

diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -1639,7 +1639,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
if (r[*pos] != '.') {
cname = tname;
tname = NULL;
-   exp_setname(sql->sa, exp, NULL, cname);
+   exp_setname(sql->sa, exp, NULL, sa_strdup(sql->sa, 
cname));
skipWS(r, pos);
} else {
(*pos)++;
@@ -1648,7 +1648,7 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
convertIdent(cname);
(*pos)++;
skipWS(r, pos);
-   exp_setname(sql->sa, exp, tname, cname);
+   exp_setname(sql->sa, exp, sa_strdup(sql->sa, tname), 
sa_strdup(sql->sa, cname));
}
rlabel = try_update_label_count(sql, tname);
nlabel = try_update_label_count(sql, cname);
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -951,10 +951,11 @@ exp_exception(allocator *sa, sql_exp *co
 void
 exp_setname(allocator *sa, sql_exp *e, const char *rname, const char *name )
 {
+   (void)sa;
e->alias.label = 0;
if (name)
-   e->alias.name = sa_strdup(sa, name);
-   e->alias.rname = (rname)?sa_strdup(sa, rname):NULL;
+   e->alias.name = name;
+   e->alias.rname = (rname);
 }
 
 void
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
@@ -793,7 +793,7 @@ rel_label( mvc *sql, sql_rel *r, int all
char tname[16], *tnme;
char cname[16], *cnme = NULL;
 
-   tnme = number2name(tname, sizeof(tname), nr);
+   tnme = sa_strdup(sql->sa, number2name(tname, sizeof(tname), nr));
if (!is_simple_project(r->op))
r = rel_project(sql->sa, r, rel_projections(sql, r, NULL, 1, 
1));
if (!list_empty(r->exps)) {
@@ -804,7 +804,7 @@ rel_label( mvc *sql, sql_rel *r, int all
if (!is_freevar(e)) {
if (all) {
nr = ++sql->label;
-   cnme = number2name(cname, 
sizeof(cname), nr);
+   cnme = sa_strdup(sql->sa, 
number2name(cname, sizeof(cname), nr));
}
exp_setname(sql->sa, e, tnme, cnme );
}
@@ -815,7 +815,7 @@ rel_label( mvc *sql, sql_rel *r, int all
for (node *ne = ((list*)r->r)->h; ne; ne = ne->next) {
if (all) {
nr = ++sql->label;
-   cnme = number2name(cname, sizeof(cname), nr);
+   cnme = sa_strdup(sql->sa, number2name(cname, 
sizeof(cname), nr));
}
exp_setname(sql->sa, ne->data, tnme, cnme );
}
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -5870,7 +5870,7 @@ rel_joinquery_(sql_query *query, symbol 
list *outexps = new_exp_list(sql->sa), *exps;
node *m;
 
-   rnme = number2name(rname, sizeof(rname), ++sql->label);
+   rnme = sa_strdup(sql->sa, number2name(rname, sizeof(rname), 
++sql->label));
for (; n; n = n->next) {
char *nm = n->data.sval;
sql_exp *cond, *ls, *rs;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: no_type_bat - single threaded gets different output

MonetDB: default - changed RTREEsearch export

MonetDB: no_type_bat - fix overwriting names

MonetDB: no_type_bat - merged with default

MonetDB: default - we need to allocate now that the exp_setname ...

MonetDB: no_type_bat - merged with default

6 matches

Site Navigation

Mail list logo

Footer information