Changeset: f359c1ce553e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f359c1ce553e
Modified Files:
monetdb5/mal/mal_namespace.c
monetdb5/optimizer/opt_support.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (48 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
@@ -160,6 +160,7 @@ const char dense_rankRef[] = "dense_rank
const char dependRef[] = "depend";
const char deregisterRef[] = "deregister";
const char dictRef[] = "dict";
+const char diffRef[] = "diff";
const char diffcandRef[] = "diffcand";
const char differenceRef[] = "difference";
const char disconnectRef[] = "disconnect";
@@ -426,6 +427,7 @@ initNamespace(void)
fixName(dependRef);
fixName(deregisterRef);
fixName(dictRef);
+ fixName(diffRef);
fixName(diffcandRef);
fixName(differenceRef);
fixName(disconnectRef);
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -411,7 +411,7 @@ isOrderDepenent(InstrPtr p)
{
if (getModuleId(p) != batsqlRef)
return 0;
- if (getFunctionId(p) == differenceRef || getFunctionId(p) ==
window_boundRef
+ if (getFunctionId(p) == diffRef || getFunctionId(p) == window_boundRef
|| getFunctionId(p) == row_numberRef || getFunctionId(p) ==
rankRef
|| getFunctionId(p) == dense_rankRef
|| getFunctionId(p) == percent_rankRef
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -4285,7 +4285,12 @@ def main(argv) :
print()
print(f'failed={Failed}, skipped={len(Failure[F_SKIP])}')
if produce_html and (Failed or errseen):
- print(f'see {urllib.parse.urlunsplit(("file", "",
urllib.request.pathname2url(os.path.join(TSTTRGBASE, TSTPREF, "index.html")),
"", ""))}')
+ f = os.path.join(TSTTRGBASE, TSTPREF, "index.html")
+ if sys.version_info[1] >= 14:
+ u = urllib.request.pathname2url(f, add_scheme=True)
+ else:
+ u = urllib.parse.urlunsplit(("file", "",
urllib.request.pathname2url(f), "", ""))
+ print(f'see {u}')
print(f'Ran {num_tests - len(Failure[F_SKIP])} tests in {t_:.3f}s')
elif Failed:
print('''\
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
