Changeset: e6eb722152e3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6eb722152e3
Branch: Oct2020
Log Message:
merged
diffs (154 lines):
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -141,7 +141,7 @@ VIEWcreate(oid seq, BAT *b)
GDKfree(bn);
return NULL;
}
- TRC_DEBUG(ALGO, "VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT "\n",
+ TRC_DEBUG(ALGO, ALGOBATFMT " -> " ALGOBATFMT "\n",
ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
}
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -842,7 +842,7 @@ COLcopy(BAT *b, int tt, bool writable, r
}
if (!writable)
bn->batRestricted = BAT_READ;
- TRC_DEBUG(ALGO, "COLcopy(" ALGOBATFMT ")=" ALGOBATFMT "\n",
+ TRC_DEBUG(ALGO, ALGOBATFMT " -> " ALGOBATFMT "\n",
ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
bunins_failed:
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1767,11 +1767,11 @@ BATsort(BAT **sorted, BAT **order, BAT *
}
*groups = gn;
}
- TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",o="
ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
",reverse=%d,nilslast=%d,stable=%d) = ("
ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- trivial (" LLFMT
+ ALGOOPTBATFMT " -- trivial (" LLFMT
" usec)\n",
ALGOBATPAR(b), ALGOOPTBATPAR(o),
ALGOOPTBATPAR(g), reverse, nilslast, stable,
@@ -1854,11 +1854,11 @@ BATsort(BAT **sorted, BAT **order, BAT *
BBPunfix(on->batCacheid);
on = NULL;
}
- TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",o="
ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
",reverse=%d,nilslast=%d,stable=%d) = ("
ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- orderidx (" LLFMT
+ ALGOOPTBATFMT " -- orderidx (" LLFMT
" usec)\n",
ALGOBATPAR(b), ALGOOPTBATPAR(o),
ALGOOPTBATPAR(g), reverse, nilslast, stable,
@@ -1956,12 +1956,12 @@ BATsort(BAT **sorted, BAT **order, BAT *
goto error;
*groups = gn;
}
- TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT
",o=" ALGOOPTBATFMT ",g=" ALGOBATFMT
",reverse=%d,nilslast=%d,stable=%d"
") = (" ALGOOPTBATFMT ","
ALGOOPTBATFMT "," ALGOOPTBATFMT
- ") -- key group (" LLFMT " usec)\n",
+ " -- key group (" LLFMT " usec)\n",
ALGOBATPAR(b), ALGOOPTBATPAR(o),
ALGOBATPAR(g), reverse, nilslast,
stable, ALGOOPTBATPAR(bn),
@@ -2078,10 +2078,10 @@ BATsort(BAT **sorted, BAT **order, BAT *
bn = NULL;
}
- TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o=" ALGOOPTBATFMT
+ TRC_DEBUG(ALGO, "b=" ALGOBATFMT ",o=" ALGOOPTBATFMT
",g=" ALGOOPTBATFMT ",reverse=%d,nilslast=%d,"
"stable=%d) = (" ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- %ssort (" LLFMT " usec)\n",
+ ALGOOPTBATFMT " -- %ssort (" LLFMT " usec)\n",
ALGOBATPAR(b), ALGOOPTBATPAR(o), ALGOOPTBATPAR(g),
reverse, nilslast, stable, ALGOOPTBATPAR(bn),
ALGOOPTBATPAR(gn), ALGOOPTBATPAR(on),
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -265,8 +265,8 @@ BAT *virtualize(BAT *bn)
BATcount(b), \
b->hseqbase, \
ATOMname(b->ttype), \
- !b->batTransient ? "P" : isVIEW(b) ? "V" : "T", \
- BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :"", \
+ !b->batTransient ? "P" : b->theap.parentid ? "V" : b->tvheap &&
b->tvheap->parentid != b->batCacheid ? "v" : "T", \
+ BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :
ATOMstorage(b->ttype) == TYPE_str && GDK_ELIMDOUBLES(b->tvheap) ? "E" : "", \
b->tsorted ? "S" : b->tnosorted ? "!s" : "", \
b->trevsorted ? "R" : b->tnorevsorted ? "!r" : "", \
b->tkey ? "K" : b->tnokey[1] ? "!k" : "", \
@@ -285,8 +285,8 @@ BAT *virtualize(BAT *bn)
b ? "[" : "", \
b ? ATOMname(b->ttype) : "", \
b ? "]" : "", \
- b ? !b->batTransient ? "P" : isVIEW(b) ? "V" : "T" : "", \
- b ? BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" : ""
: "", \
+ b ? !b->batTransient ? "P" : b->theap.parentid ? "V" : b->tvheap &&
b->tvheap->parentid != b->batCacheid ? "v" : "T" : "", \
+ b ? BATtdense(b) ? "D" : b->ttype == TYPE_void && b->tvheap ? "X" :
ATOMstorage(b->ttype) == TYPE_str && GDK_ELIMDOUBLES(b->tvheap) ? "E" : "" :
"", \
b ? b->tsorted ? "S" : b->tnosorted ? "!s" : "" : "", \
b ? b->trevsorted ? "R" : b->tnorevsorted ? "!r" : "" : "", \
b ? b->tkey ? "K" : b->tnokey[1] ? "!k" : "" : "", \
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -580,8 +580,7 @@ BATproject2(BAT *restrict l, BAT *restri
} else if (l->tnonil &&
r2 != NULL &&
(r1->tvheap == r2->tvheap ||
- (!GDK_ELIMDOUBLES(r1->tvheap) &&
- !GDK_ELIMDOUBLES(r2->tvheap) /* && size tests
*/))) {
+ (!GDK_ELIMDOUBLES(r1->tvheap) /* && size tests
*/))) {
/* r1 and r2 may explicitly share their vheap,
* if they do, the result will also share the
* vheap; this also means that for this case we
diff --git a/sql/server/sql_privileges.c b/sql/server/sql_privileges.c
--- a/sql/server/sql_privileges.c
+++ b/sql/server/sql_privileges.c
@@ -532,7 +532,7 @@ sql_grant_role(mvc *m, str grantee, str
rid = table_funcs.column_find_row(m->session->tr, auths_name, role,
NULL);
if (is_oid_nil(rid))
- throw(SQL, "sql.grant_role", SQLSTATE(M1M05) "GRANT: Cannot
grant ROLE '%s' to user '%s'", role, grantee);
+ throw(SQL, "sql.grant_role", SQLSTATE(M1M05) "GRANT: no such
role '%s' or grantee '%s'", role, grantee);
role_id = table_funcs.column_find_sqlid(m->session->tr, auths_id, rid);
if (backend_find_user(m, role) >= 0)
throw(SQL,"sql.grant_role", SQLSTATE(M1M05) "GRANT: '%s' is a
USER not a ROLE", role);
@@ -540,7 +540,7 @@ sql_grant_role(mvc *m, str grantee, str
throw(SQL,"sql.grant_role", SQLSTATE(0P000) "GRANT:
Insufficient privileges to grant ROLE '%s'", role);
rid = table_funcs.column_find_row(m->session->tr, auths_name, grantee,
NULL);
if (is_oid_nil(rid))
- throw(SQL,"sql.grant_role", SQLSTATE(M1M05) "GRANT: Cannot
grant ROLE '%s' to user '%s'", role, grantee);
+ throw(SQL,"sql.grant_role", SQLSTATE(M1M05) "GRANT: no such
role '%s' or grantee '%s'", role, grantee);
grantee_id = table_funcs.column_find_sqlid(m->session->tr, auths_id,
rid);
rid = table_funcs.column_find_row(m->session->tr,
find_sql_column(roles, "login_id"), &grantee_id, find_sql_column(roles,
"role_id"), &role_id, NULL);
if (!is_oid_nil(rid))
diff --git a/sql/test/Users/Tests/schema.stable.err
b/sql/test/Users/Tests/schema.stable.err
--- a/sql/test/Users/Tests/schema.stable.err
+++ b/sql/test/Users/Tests/schema.stable.err
@@ -12,7 +12,7 @@ stderr of test 'schema` in directory 'sq
MAPI = (monetdb) /var/tmp/mtest-26250/.s.monetdb.37381
QUERY = GRANT my_owner to my_user; -- error wrong non existing role
-ERROR = !GRANT: Cannot grant ROLE 'my_owner' to user 'my_user'
+ERROR = !GRANT: no such role 'my_owner' or grantee 'my_user'
CODE = M1M05
# 14:00:57 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
