Changeset: 660945657d8b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=660945657d8b
Modified Files:
sql/common/sql_list.c
sql/include/sql_list.h
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_rewriter.c
sql/server/rel_rewriter.h
sql/server/rel_unnest.c
sql/test/miscellaneous/Tests/groupby_error.stable.out
sql/test/miscellaneous/Tests/simple_plans.stable.out
sql/test/miscellaneous/Tests/simple_plans.stable.out.single
testing/Mtest.py.bat
testing/Mtest.py.in
Branch: default
Log Message:
Merged with oscar
diffs (72 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1652,7 +1652,6 @@ rel_push_count_down(visitor *v, sql_rel
return rel;
}
-
static sql_rel *
rel_simplify_project_fk_join(mvc *sql, sql_rel *r, list *pexps, int *changes)
{
@@ -3684,7 +3683,6 @@ merge_notequal(mvc *sql, list *exps, int
return nexps;
}
-
static sql_rel *
rel_select_cse(visitor *v, sql_rel *rel)
{
diff --git a/testing/Mtest.py.bat b/testing/Mtest.py.bat
--- a/testing/Mtest.py.bat
+++ b/testing/Mtest.py.bat
@@ -4,4 +4,4 @@
@REM
@REM Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-@python3 "%~dpn0" %*
+@python "%~dpn0" %*
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -104,22 +104,37 @@ if isatty:
left, top, right, bottom, maxx, maxy) =
struct.unpack("hhhhHhhhhhh", csbi.raw)
return wattr
reset = get_csbi_attributes(handle)
- def prred(str, write = sys.stdout.write, scta =
ctypes.windll.kernel32.SetConsoleTextAttribute):
+ def prred(str,
+ write=sys.stdout.write,
+ flush=sys.stdout.flush,
+ scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
+ flush()
scta(handle, 0x4)
write(str)
+ flush()
finally:
scta(handle, reset)
- def prgreen(str, write = sys.stdout.write, scta =
ctypes.windll.kernel32.SetConsoleTextAttribute):
+ def prgreen(str,
+ write=sys.stdout.write,
+ flush=sys.stdout.flush,
+
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
+ flush()
scta(handle, 0x2)
write(str)
+ flush()
finally:
scta(handle, reset)
- def prpurple(str, write = sys.stdout.write, scta =
ctypes.windll.kernel32.SetConsoleTextAttribute):
+ def prpurple(str,
+ write=sys.stdout.write,
+ flush=sys.stdout.flush,
+
scta=ctypes.windll.kernel32.SetConsoleTextAttribute):
try:
+ flush()
scta(handle, 0x5)
write(str)
+ flush()
finally:
scta(handle, reset)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
