Changeset: a6795a00d4c2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a6795a00d4c2
Modified Files:
clients/Tests/exports.stable.out
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/mal_profiler.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/server/rel_exp.c
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
sql/test/mapi/Tests/sql_int128.stable.out.int128
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (283 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1801,7 +1801,6 @@ str SYSmem_usage(bat *ret, bat *ret2, co
str SYSsetmem_maxsize(void *ret, const lng *num);
str SYSsetvm_maxsize(void *ret, const lng *num);
str SYSvm_usage(bat *ret, bat *ret2, const lng *minsize);
-int TABLETadt_toStr(void *extra, char **buf, int *len, int type, ptr a);
str TABLETcollect(BAT **bats, Tablet *as);
str TABLETcollect_parts(BAT **bats, Tablet *as, BUN offset);
str TABLETcreate_bats(Tablet *as, BUN est);
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,22 +55,22 @@ Ready.
% .L1 # table_name
% def # name
% clob # type
-% 538 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.garbageCollector();"
]
+% 503 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
#explain copy into ttt from 'a:\tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 149 # length
+% 161 # length
function user.s10_1():void;
- X_0:void := querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';","sequential_pipe",4:int);
- X_3 := sql.mvc();
- (X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","a:\\tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
- X_28 := sql.append(X_3,"sys","ttt","a",X_24);
- X_33 := sql.append(X_28,"sys","ttt","b",X_25);
- X_36 := sql.append(X_33,"sys","ttt","c",X_26);
- X_38 := aggr.count(X_26);
- sql.affectedRows(X_36,X_38);
+ X_1:void := querylog.define("explain copy into ttt from
\\'a:\\\\tmp/xyz\\';", "sequential_pipe", 21:int);
+ X_4 := sql.mvc();
+ (X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr,
"|", "\\n", nil:str, "null", "a:\\tmp/xyz", -1:lng, 0:lng, 0:int, 0:int,
nil:str);
+ X_29 := sql.append(X_4, "sys", "ttt", "a", X_25);
+ X_34 := sql.append(X_29, "sys", "ttt", "b", X_26);
+ X_37 := sql.append(X_34, "sys", "ttt", "c", X_27);
+ X_39 := aggr.count(X_27);
+ sql.affectedRows(X_37, X_39);
end user.s10_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=5 usec
@@ -109,22 +109,22 @@ end user.s10_1;
% .L1 # table_name
% def # name
% clob # type
-% 561 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.jit();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 526 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from 'Z:/tmp/xyz';
% .explain # table_name
% mal # name
% clob # type
-% 148 # length
+% 160 # length
function user.s26_1():void;
- X_0:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';","user_1",4:int);
- X_3 := sql.mvc();
- (X_24:bat[:int],X_25:bat[:int],X_26:bat[:int]) :=
sql.copy_from(nil:ptr,"|","\\n",nil:str,"null","Z:/tmp/xyz",-1:lng,0:lng,0:int,0:int,nil:str);
- X_28 := sql.append(X_3,"sys","ttt","a",X_24);
- X_33 := sql.append(X_28,"sys","ttt","b",X_25);
- X_38 := aggr.count(X_26);
- X_36 := sql.append(X_33,"sys","ttt","c",X_26);
- sql.affectedRows(X_36,X_38);
+ X_1:void := querylog.define("explain copy into ttt from
\\'Z:/tmp/xyz\\';", "user_1", 21:int);
+ X_4 := sql.mvc();
+ (X_25:bat[:int], X_26:bat[:int], X_27:bat[:int]) := sql.copy_from(nil:ptr,
"|", "\\n", nil:str, "null", "Z:/tmp/xyz", -1:lng, 0:lng, 0:int, 0:int,
nil:str);
+ X_29 := sql.append(X_4, "sys", "ttt", "a", X_25);
+ X_34 := sql.append(X_29, "sys", "ttt", "b", X_26);
+ X_39 := aggr.count(X_27);
+ X_37 := sql.append(X_34, "sys", "ttt", "c", X_27);
+ sql.affectedRows(X_37, X_39);
end user.s26_1;
#inline actions= 0 time=1 usec
#remap actions= 0 time=4 usec
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -712,6 +712,8 @@ static void
CLEANUPprofile(TRACE_id_event);
CLEANUPprofile(TRACE_id_time);
CLEANUPprofile(TRACE_id_pc);
+ CLEANUPprofile(TRACE_id_thread);
+ CLEANUPprofile(TRACE_id_ticks);
CLEANUPprofile(TRACE_id_rssMB);
CLEANUPprofile(TRACE_id_tmpspace);
CLEANUPprofile(TRACE_id_inblock);
@@ -719,7 +721,6 @@ static void
CLEANUPprofile(TRACE_id_minflt);
CLEANUPprofile(TRACE_id_majflt);
CLEANUPprofile(TRACE_id_nvcsw);
- CLEANUPprofile(TRACE_id_thread);
CLEANUPprofile(TRACE_id_stmt);
TRACE_init = 0;
}
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -79,36 +79,6 @@ void_bat_create(int adt, BUN nr)
return b;
}
-int
-TABLETadt_toStr(void *extra, char **buf, int *len, int type, ptr a)
-{
- (void) extra;
- if (type == TYPE_str) {
- char *dst, *src = a;
- int l;
-
- if (GDK_STRNIL(src)) {
- src = "nil";
- }
- l = (int) strlen(src);
- if (l + 3 > *len) {
- GDKfree(*buf);
- *len = 2 * l + 3;
- *buf = GDKzalloc(*len);
- if( *buf == NULL)
- return 0;
- }
- dst = *buf;
- dst[0] = '"';
- strncpy(dst + 1, src, l);
- dst[l + 1] = '"';
- dst[l + 2] = 0;
- return l + 2;
- } else {
- return (*BATatoms[type].atomToStr) (buf, len, a);
- }
-}
-
void
TABLETdestroy_format(Tablet *as)
{
diff --git a/monetdb5/modules/mal/tablet.h b/monetdb5/modules/mal/tablet.h
--- a/monetdb5/modules/mal/tablet.h
+++ b/monetdb5/modules/mal/tablet.h
@@ -79,7 +79,6 @@ mal_export str TABLETcollect(BAT **bats,
mal_export str TABLETcollect_parts(BAT **bats, Tablet *as, BUN offset);
mal_export void TABLETdestroy_format(Tablet *as);
mal_export int TABLEToutput_file(Tablet *as, BAT *order, stream *s);
-mal_export int TABLETadt_toStr(void *extra, char **buf, int *len, int type,
ptr a);
mal_export str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
mal_export str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
diff --git a/sql/benchmarks/tpch/Tests/01-22.stable.out
b/sql/benchmarks/tpch/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/Tests/01-22.stable.out
@@ -701,31 +701,13 @@ Ready.
% decimal # type
% 20 # length
[ 15.48654 ]
-#select * from optimizer_stats() stats;
-% .stats, .stats # table_name
-% rewrite, count # name
-% clob, int # type
-% 7, 1 # length
-[ "joinidx", 0 ]
-
-# 11:48:06 >
-# 11:48:06 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb
--host=localhost --port=35781
-# 11:48:06 >
% sys.supplier, sys.supplier, sys.supplier, sys.supplier,
sys.revenue0 # table_name
% s_suppkey, s_name, s_address, s_phone, total_revenue # name
% int, char, varchar, char, decimal # type
% 2, 25, 36, 15, 20 # length
[ 21, "Supplier#000000021", "81CavellcrJ0PQ3CPBID0Z0JwyJm0ka5igEs",
"12-253-590-5816", 1161099.4636 ]
-% .stats, .stats # table_name
-% rewrite, count # name
-% clob, int # type
-% 7, 1 # length
-[ "joinidx", 0 ]
-
-# 00:16:03 >
-# 00:16:03 > Mtimeout -timeout 60 mclient -lsql -ftest -i -e --host=alf
--port=39190 <
/net/alf.ins.cwi.nl/export/scratch1/niels/rc/MonetDB/sql/src/benchmarks/tpch/16.sql
-# 00:16:03 >
+#drop view revenue0;
#select
# p_brand,
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -1291,7 +1291,7 @@ exp_is_zero(mvc *sql, sql_exp *e)
if (e->type == e_atom) {
if (e->l) {
return atom_is_zero(e->l);
- } else if(sql->emode == m_normal &&
EC_COMPUTE(exp_subtype(e)->type->eclass)) {
+ } else if(sql->emode == m_normal && sql->argc > e->flag &&
EC_COMPUTE(exp_subtype(e)->type->eclass)) {
return atom_is_zero(sql->args[e->flag]);
}
}
diff --git a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
--- a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
+++ b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.err
@@ -27,9 +27,6 @@ stderr of test 'sys_tracelog.Bug-3887` i
# cmdline opt gdk_debug = 536870922
-MAPI = (monetdb) /var/tmp/mtest-25081/.s.monetdb.33961
-QUERY = select count(*) from "sys"."tracelog";
-ERROR = !Profiler not started
# 12:53:39 >
# 12:53:39 > "Done."
diff --git a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
--- a/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
+++ b/sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
@@ -65,6 +65,12 @@ Ready.
# 14:11:11 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17906" "--port=36024"
# 14:11:11 >
+#select count(*) from "sys"."tracelog";
+% .L11 # table_name
+% L10 # name
+% bigint # type
+% 1 # length
+[ 0 ]
# 14:11:11 >
# 14:11:11 > "Done."
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out.int128
b/sql/test/mapi/Tests/sql_int128.stable.out.int128
--- a/sql/test/mapi/Tests/sql_int128.stable.out.int128
+++ b/sql/test/mapi/Tests/sql_int128.stable.out.int128
@@ -61,9 +61,7 @@ Ready.
% 95 # length
function user.s4_1():void;
X_2:void := querylog.define("explain set a = 1234567890987654321;",
"default_pipe", 7:int);
-barrier X_55 := language.dataflow();
X_5 := sql.mvc();
-exit X_55;
sql.setVariable(X_5, "a", 1234567890987654321:hge);
sql.exportOperation();
end user.s4_1;
@@ -101,9 +99,7 @@ end user.s4_1;
% 87 # length
function user.s6_1():void;
X_2:void := querylog.define("explain set b = 10000000000;",
"default_pipe", 7:int);
-barrier X_55 := language.dataflow();
X_5 := sql.mvc();
-exit X_55;
sql.setVariable(X_5, "b", 10000000000:hge);
sql.exportOperation();
end user.s6_1;
@@ -141,9 +137,7 @@ end user.s6_1;
% 82 # length
function user.s8_1():void;
X_1:void := querylog.define("explain set c = a * b;", "default_pipe",
10:int);
-barrier X_58 := language.dataflow();
X_4 := sql.mvc();
-exit X_58;
X_5:hge := sql.getVariable(X_4, "a");
X_7:hge := sql.getVariable(X_4, "b");
X_9:hge := calc.*(X_5, X_7);
@@ -184,9 +178,7 @@ end user.s8_1;
% 82 # length
function user.s10_1():void;
X_1:void := querylog.define("explain set d = c * b;", "default_pipe",
10:int);
-barrier X_58 := language.dataflow();
X_4 := sql.mvc();
-exit X_58;
X_5:hge := sql.getVariable(X_4, "c");
X_7:hge := sql.getVariable(X_4, "b");
X_9:hge := calc.*(X_5, X_7);
@@ -227,9 +219,7 @@ end user.s10_1;
% 82 # length
function user.s12_1():void;
X_1:void := querylog.define("explain set e = d + a;", "default_pipe",
11:int);
-barrier X_59 := language.dataflow();
X_4 := sql.mvc();
-exit X_59;
X_5:hge := sql.getVariable(X_4, "d");
X_8:hge := sql.getVariable(X_4, "a");
X_11:hge := calc.+(X_5, X_8);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
