Changeset: da1d455f3bb8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da1d455f3bb8
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (102 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
@@ -30,16 +30,16 @@ stderr of test 'opt_sql_append` in direc
# 22:58:57 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=rome"
"--port=36275"
# 22:58:57 >
-MAPI = (monetdb) /var/tmp/mtest-15953/.s.monetdb.31373
+MAPI = monetdb@LAB03:34769
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-15953/.s.monetdb.31373
+MAPI = monetdb@LAB03:34769
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-15953/.s.monetdb.31373
+MAPI = monetdb@LAB03:34769
QUERY = explain copy into ttt from '/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: /tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-15953/.s.monetdb.31373
+MAPI = monetdb@LAB03:34769
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
@@ -55,16 +55,18 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 448 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();"
]
+% 467 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.garbageCollector();"
]
#explain copy into ttt from 'a:\tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 153 # length
function user.s4_1{autoCommit=true}():void;
+barrier X_33 := language.dataflow();
X_2 := sql.mvc();
(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","a:\\tmp/xyz",-1:lng,0:lng,0);
+exit X_33;
X_16 := sql.append(X_2,"sys","ttt","a",X_13);
X_18 := sql.append(X_16,"sys","ttt","b",X_14);
X_20 := sql.append(X_18,"sys","ttt","c",X_15);
@@ -87,16 +89,18 @@ end s4_1;
% .L # table_name
% def # name
% clob # type
-% 471 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 490 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from 'Z:/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
% 152 # length
function user.s12_1{autoCommit=true}():void;
+barrier X_34 := language.dataflow();
X_2 := sql.mvc();
(X_13:bat[:oid,:int] ,X_14:bat[:oid,:int] ,X_15:bat[:oid,:int] ) :=
sql.copy_from("sys","ttt","|","\\n",nil:str,"null","Z:/tmp/xyz",-1:lng,0:lng,0);
+exit X_34;
X_16 := sql.append(X_2,"sys","ttt","a",X_13);
X_18 := sql.append(X_16,"sys","ttt","b",X_14);
X_22 := aggr.count(X_15);
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1339,7 +1339,7 @@ def ApproveOutput (env, TST) :
if os.path.getsize(patch + ".0"):
print "Approving %s -> stable.%s%s (%s file)" %
(os.path.join(TSTDIR, "%s.test.%s" % (TST, WHAT)), WHAT, SYSTEM, oc)
- f = open(patch + ".1", "w")
+ f = open(patch + ".1", "wb")
for l in open(patch + ".0"):
if TO.search(l):
f.write(l[:1] + '\n')
@@ -1359,7 +1359,9 @@ def ApproveOutput (env, TST) :
sem = 1
f.flush()
f.close()
- shutil.copy(stableOUTPUT, stableOUTPUT + ".ORG")
+ o = open(stableOUTPUT).read()
+ open(stableOUTPUT + ".ORG", 'wb').write(o)
+ open(stableOUTPUT, 'wb').write(o)
proc = process.Popen(['patch', stableOUTPUT, patch + '.1'])
proc.wait()
f = open(patch, 'w')
@@ -1370,6 +1372,9 @@ def ApproveOutput (env, TST) :
f.close()
remove(stableOUTPUT + ".ORG")
remove(patch + ".1")
+ o = open(stableOUTPUT).read()
+ open(stableOUTPUT, 'w').write(o)
+ o = None
else:
print "No differences detected between %s and stable.%s%s
that are not ignored by Mtest.py." % (os.path.join(TSTDIR, "%s.test.%s" % (TST,
WHAT)), WHAT, SYSTEM)
remove(patch + ".0")
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
