Changeset: c8d68fe84672 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c8d68fe84672
Modified Files:
tools/merovingian/daemon/merovingian.c
Branch: default
Log Message:
Merge with Sep2022 branch.
diffs (truncated from 413 to 300 lines):
diff --git a/clients/odbc/ChangeLog.Sep2022 b/clients/odbc/ChangeLog.Sep2022
--- a/clients/odbc/ChangeLog.Sep2022
+++ b/clients/odbc/ChangeLog.Sep2022
@@ -1,3 +1,7 @@
# ChangeLog file for odbc
# This file is updated with Maddlog
+* Thu Oct 13 2022 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
+- Fixed issue with generated raw strings prefix when ODBC driver is used
+ against a server older than Jun2020 (11.37).
+
diff --git a/clients/odbc/driver/ODBCUtil.c b/clients/odbc/driver/ODBCUtil.c
--- a/clients/odbc/driver/ODBCUtil.c
+++ b/clients/odbc/driver/ODBCUtil.c
@@ -1074,6 +1074,7 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
* ESCAPE '\\'
*/
char esc;
+ const char *s;
p += 7;
while (*p == ' ')
p++;
@@ -1106,7 +1107,13 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
length = (size_t) snprintf(q, length, "%.*s
ESCAPE '''' %s", n, nquery, p);
break;
case '\\':
- length = (size_t) snprintf(q, length, "%.*s
ESCAPE r'\\' %s", n, nquery, p);
+ /* raw strings prefix syntax is only supported
by servers since Jun2020 (11.37) */
+ if (dbc->major == 11 && dbc->minor >= 37) {
+ s = "%.*s ESCAPE r'\\'";
+ } else {
+ s = "%.*s ESCAPE '\\\\'";
+ }
+ length = (size_t) snprintf(q, length, s, n,
nquery, p);
break;
default:
length = (size_t) snprintf(q, length, "%.*s
ESCAPE '%c' %s", n, nquery, esc, p);
@@ -1256,7 +1263,8 @@ ODBCTranslateSQL(ODBCDbc *dbc, const SQL
for (r = func->repl; *r; r++) {
if (*r == '\1' || *r ==
'\2' || *r == '\3' || *r == '\4') {
assert(*r <=
func->nargs);
- if (args[*r -
1].argstart[0] == '\'')
+ /* raw strings
prefix syntax is only supported by servers since Jun2020 (11.37) */
+ if (args[*r -
1].argstart[0] == '\'' && dbc->major == 11 && dbc->minor >= 37)
q[pr++]
= 'r';
strncpy(q + pr,
args[*r - 1].argstart, args[*r - 1].arglen);
pr += (int)
args[*r - 1].arglen;
@@ -1350,7 +1358,7 @@ ODBCParseOA(const char *tab, const char
}
char *
-ODBCParsePV(const char *tab, const char *col, const char *arg, size_t len)
+ODBCParsePV(const char *tab, const char *col, const char *arg, size_t len,
const ODBCDbc *dbc)
{
size_t i;
char *res;
@@ -1371,7 +1379,13 @@ ODBCParsePV(const char *tab, const char
res[i++] = *s;
res[i++] = *s;
}
- for (s = "' escape r'\\'"; *s; s++)
+ /* raw strings prefix syntax is only supported by servers since Jun2020
(11.37) */
+ if (dbc->major == 11 && dbc->minor >= 37) {
+ s = "' escape r'\\'";
+ } else {
+ s = "' escape '\\\\'";
+ }
+ for (; *s; s++)
res[i++] = *s;
res[i] = 0;
return res;
diff --git a/clients/odbc/driver/ODBCUtil.h b/clients/odbc/driver/ODBCUtil.h
--- a/clients/odbc/driver/ODBCUtil.h
+++ b/clients/odbc/driver/ODBCUtil.h
@@ -31,6 +31,7 @@
#define _H_ODBCUTIL
#include "ODBCGlobal.h"
+#include "ODBCDbc.h"
/*
@@ -145,7 +146,7 @@ extern const char *ODBCutf82wchar(const
#endif
char *ODBCParseOA(const char *tab, const char *col, const char *arg, size_t
len);
-char *ODBCParsePV(const char *tab, const char *col, const char *arg, size_t
len);
+char *ODBCParsePV(const char *tab, const char *col, const char *arg, size_t
len, const ODBCDbc *dbc);
char *ODBCParseID(const char *tab, const char *col, const char *arg, size_t
len);
/* SQL_DESC_CONCISE_TYPE, SQL_DESC_DATETIME_INTERVAL_CODE, and
diff --git a/clients/odbc/driver/SQLColumnPrivileges.c
b/clients/odbc/driver/SQLColumnPrivileges.c
--- a/clients/odbc/driver/SQLColumnPrivileges.c
+++ b/clients/odbc/driver/SQLColumnPrivileges.c
@@ -81,7 +81,8 @@ MNDBColumnPrivileges(ODBCStmt *stmt,
if (NameLength4 > 0) {
col = ODBCParsePV("tc", "cname",
(const char *) ColumnName,
- (size_t) NameLength4);
+ (size_t) NameLength4,
+ stmt->Dbc);
if (col == NULL)
goto nomem;
}
diff --git a/clients/odbc/driver/SQLColumns.c b/clients/odbc/driver/SQLColumns.c
--- a/clients/odbc/driver/SQLColumns.c
+++ b/clients/odbc/driver/SQLColumns.c
@@ -79,21 +79,24 @@ MNDBColumns(ODBCStmt *stmt,
if (NameLength2 > 0) {
sch = ODBCParsePV("s", "name",
(const char *) SchemaName,
- (size_t) NameLength2);
+ (size_t) NameLength2,
+ stmt->Dbc);
if (sch == NULL)
goto nomem;
}
if (NameLength3 > 0) {
tab = ODBCParsePV("t", "name",
(const char *) TableName,
- (size_t) NameLength3);
+ (size_t) NameLength3,
+ stmt->Dbc);
if (tab == NULL)
goto nomem;
}
if (NameLength4 > 0) {
col = ODBCParsePV("c", "name",
(const char *) ColumnName,
- (size_t) NameLength4);
+ (size_t) NameLength4,
+ stmt->Dbc);
if (col == NULL)
goto nomem;
}
diff --git a/clients/odbc/driver/SQLProcedureColumns.c
b/clients/odbc/driver/SQLProcedureColumns.c
--- a/clients/odbc/driver/SQLProcedureColumns.c
+++ b/clients/odbc/driver/SQLProcedureColumns.c
@@ -71,21 +71,24 @@ MNDBProcedureColumns(ODBCStmt *stmt,
if (NameLength2 > 0) {
sch = ODBCParsePV("s", "name",
(const char *) SchemaName,
- (size_t) NameLength2);
+ (size_t) NameLength2,
+ stmt->Dbc);
if (sch == NULL)
goto nomem;
}
if (NameLength3 > 0) {
prc = ODBCParsePV("p", "name",
(const char *) ProcName,
- (size_t) NameLength3);
+ (size_t) NameLength3,
+ stmt->Dbc);
if (prc == NULL)
goto nomem;
}
if (NameLength4 > 0) {
col = ODBCParsePV("a", "name",
(const char *) ColumnName,
- (size_t) NameLength4);
+ (size_t) NameLength4,
+ stmt->Dbc);
if (col == NULL)
goto nomem;
}
diff --git a/clients/odbc/driver/SQLProcedures.c
b/clients/odbc/driver/SQLProcedures.c
--- a/clients/odbc/driver/SQLProcedures.c
+++ b/clients/odbc/driver/SQLProcedures.c
@@ -79,14 +79,16 @@ MNDBProcedures(ODBCStmt *stmt,
if (NameLength2 > 0) {
sch = ODBCParsePV("s", "name",
(const char *) SchemaName,
- (size_t) NameLength2);
+ (size_t) NameLength2,
+ stmt->Dbc);
if (sch == NULL)
goto nomem;
}
if (NameLength3 > 0) {
pro = ODBCParsePV("p", "name",
(const char *) ProcName,
- (size_t) NameLength3);
+ (size_t) NameLength3,
+ stmt->Dbc);
if (pro == NULL)
goto nomem;
}
diff --git a/clients/odbc/driver/SQLTablePrivileges.c
b/clients/odbc/driver/SQLTablePrivileges.c
--- a/clients/odbc/driver/SQLTablePrivileges.c
+++ b/clients/odbc/driver/SQLTablePrivileges.c
@@ -66,14 +66,16 @@ MNDBTablePrivileges(ODBCStmt *stmt,
if (NameLength2 > 0) {
sch = ODBCParsePV("s", "name",
(const char *) SchemaName,
- (size_t) NameLength2);
+ (size_t) NameLength2,
+ stmt->Dbc);
if (sch == NULL)
goto nomem;
}
if (NameLength3 > 0) {
tab = ODBCParsePV("t", "name",
(const char *) TableName,
- (size_t) NameLength3);
+ (size_t) NameLength3,
+ stmt->Dbc);
if (tab == NULL)
goto nomem;
}
diff --git a/clients/odbc/driver/SQLTables.c b/clients/odbc/driver/SQLTables.c
--- a/clients/odbc/driver/SQLTables.c
+++ b/clients/odbc/driver/SQLTables.c
@@ -125,14 +125,16 @@ MNDBTables(ODBCStmt *stmt,
if (NameLength2 > 0) {
sch = ODBCParsePV("s", "name",
(const char *) SchemaName,
- (size_t) NameLength2);
+ (size_t) NameLength2,
+ stmt->Dbc);
if (sch == NULL)
goto nomem;
}
if (NameLength3 > 0) {
tab = ODBCParsePV("t", "name",
(const char *) TableName,
- (size_t) NameLength3);
+ (size_t) NameLength3,
+ stmt->Dbc);
if (tab == NULL)
goto nomem;
}
diff --git a/sql/server/rel_optimize_others.c b/sql/server/rel_optimize_others.c
--- a/sql/server/rel_optimize_others.c
+++ b/sql/server/rel_optimize_others.c
@@ -1033,7 +1033,7 @@ bind_dce(visitor *v, global_props *gp)
static int
-topn_sample_save_exps( list *exps )
+topn_sample_safe_exps( list *exps, bool nil_limit )
{
/* Limit only expression lists are always save */
if (list_length(exps) == 1)
@@ -1041,7 +1041,7 @@ topn_sample_save_exps( list *exps )
for (node *n = exps->h; n; n = n->next ) {
sql_exp *e = n->data;
- if (!e || e->type != e_atom)
+ if (!e || e->type != e_atom || (!nil_limit && exp_is_null(e)))
return 0;
}
return 1;
@@ -1081,9 +1081,9 @@ sum_limit_offset(mvc *sql, sql_rel *rel)
static sql_rel *
rel_push_topn_and_sample_down_(visitor *v, sql_rel *rel)
{
- sql_rel *rp = NULL, *r = rel->l;
+ sql_rel *rp = NULL, *r = rel->l, *rpp = NULL;
- if ((is_topn(rel->op) || is_sample(rel->op)) &&
topn_sample_save_exps(rel->exps)) {
+ if ((is_topn(rel->op) || is_sample(rel->op)) &&
topn_sample_safe_exps(rel->exps, true)) {
sql_rel *(*func) (sql_allocator *, sql_rel *, list *) =
is_topn(rel->op) ? rel_topn : rel_sample;
/* nested topN relations */
@@ -1152,6 +1152,9 @@ rel_push_topn_and_sample_down_(visitor *
return rel;
}
+ if (!topn_sample_safe_exps(rel->exps, false))
+ return rel;
+
/* duplicate topn/sample direct under union or crossproduct */
if (r && !rel_is_ref(r) && r->l && r->r && ((is_union(r->op) &&
r->exps) || (r->op == op_join && list_empty(r->exps)))) {
sql_rel *u = r, *x;
@@ -1185,7 +1188,7 @@ rel_push_topn_and_sample_down_(visitor *
}
/* duplicate topn/sample + [ project-order ] under union */
- if (r)
+ if (r && !rp)
rp = r->l;
if (r && r->exps && is_simple_project(r->op) && !rel_is_ref(r)
&& !list_empty(r->r) && r->l && is_union(rp->op)) {
sql_rel *u = rp, *ou = u, *x, *ul = u->l, *ur = u->r;
@@ -1268,6 +1271,50 @@ rel_push_topn_and_sample_down_(visitor *
v->changes++;
return rel;
}
+ /* a left outer join b order by a.* limit L, can be copied
into a */
+ /* topn ( project (orderby)( optional project ( left ())
+ * rel r rp */
+ if (r && !rp)
+ rp = r->l;
+ if (r && rp && is_simple_project(rp->op) && !rp->r && rp->l)
+ rpp = rp->l;
+ if (r && r->exps && is_simple_project(r->op) && !rel_is_ref(r)
&& r->r && r->l && ((!rpp && is_left(rp->op)) ||
+ (rpp && is_left(rpp->op)))) {
+ sql_rel *lj = rpp?rpp:rp;
+ sql_rel *l = lj->l;
+ list *obes = r->r, *nobes = sa_list(v->sql->sa);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
