MonetDB: mosaic - Approve output
Changeset: 545ca1f81b90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=545ca1f81b90
Modified Files:
sql/test/mosaic/Tests/compression.stable.out
sql/test/mosaic/Tests/compressionRLE.stable.out
sql/test/mosaic/Tests/compressionRLE2.stable.out
sql/test/mosaic/Tests/session_exit.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 696 to 300 lines):
diff --git a/sql/test/mosaic/Tests/compression.stable.out
b/sql/test/mosaic/Tests/compression.stable.out
--- a/sql/test/mosaic/Tests/compression.stable.out
+++ b/sql/test/mosaic/Tests/compression.stable.out
@@ -48,41 +48,41 @@ Ready.
function user.s10_1():void;
X_1:void := querylog.define("explain select * from tmp3;",
"sequential_pipe", 39:int);
X_22 := bat.new(nil:str);
-X_29 := bat.append(X_22, "sys.tmp3");
-X_37 := bat.append(X_29, "sys.tmp3");
-X_45 := bat.append(X_37, "sys.tmp3");
-X_52 := bat.append(X_45, "sys.tmp3");
+X_28 := bat.new(nil:int);
+X_26 := bat.new(nil:int);
+X_25 := bat.new(nil:str);
X_24 := bat.new(nil:str);
-X_31 := bat.append(X_24, "i");
-X_38 := bat.append(X_31, "b");
-X_46 := bat.append(X_38, "f");
-X_53 := bat.append(X_46, "t");
-X_25 := bat.new(nil:str);
-X_32 := bat.append(X_25, "int");
-X_39 := bat.append(X_32, "boolean");
-X_47 := bat.append(X_39, "real");
-X_55 := bat.append(X_47, "timestamp");
-X_26 := bat.new(nil:int);
-X_34 := bat.append(X_26, 32:int);
-X_41 := bat.append(X_34, 1:int);
-X_49 := bat.append(X_41, 24:int);
-X_57 := bat.append(X_49, 7:int);
-X_28 := bat.new(nil:int);
-X_36 := bat.append(X_28, 0:int);
-X_43 := bat.append(X_36, 0:int);
-X_51 := bat.append(X_43, 0:int);
-X_59 := bat.append(X_51, 0:int);
X_4 := sql.mvc();
C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3");
X_5:bat[:oid] := mosaic.decompress(C_103);
+X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int);
+X_20 := mosaic.projection(X_5, X_18);
+X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int);
+X_17 := mosaic.projection(X_5, X_15);
+X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int);
+X_14 := mosaic.projection(X_5, X_12);
X_8:bat[:int] := sql.bind(X_4, "sys", "tmp3", "i", 0:int);
X_11 := mosaic.projection(X_5, X_8);
-X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int);
-X_14 := mosaic.projection(X_5, X_12);
-X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int);
-X_17 := mosaic.projection(X_5, X_15);
-X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int);
-X_20 := mosaic.projection(X_5, X_18);
+X_29 := bat.append(X_22, "sys.tmp3");
+X_31 := bat.append(X_24, "i");
+X_32 := bat.append(X_25, "int");
+X_34 := bat.append(X_26, 32:int);
+X_36 := bat.append(X_28, 0:int);
+X_37 := bat.append(X_29, "sys.tmp3");
+X_38 := bat.append(X_31, "b");
+X_39 := bat.append(X_32, "boolean");
+X_41 := bat.append(X_34, 1:int);
+X_43 := bat.append(X_36, 0:int);
+X_45 := bat.append(X_37, "sys.tmp3");
+X_46 := bat.append(X_38, "f");
+X_47 := bat.append(X_39, "real");
+X_49 := bat.append(X_41, 24:int);
+X_51 := bat.append(X_43, 0:int);
+X_52 := bat.append(X_45, "sys.tmp3");
+X_53 := bat.append(X_46, "t");
+X_55 := bat.append(X_47, "timestamp");
+X_57 := bat.append(X_49, 7:int);
+X_59 := bat.append(X_51, 0:int);
sql.resultSet(X_52, X_53, X_55, X_57, X_59, X_11, X_14, X_17, X_20);
end user.s10_1;
#inline actions= 0 time=1 usec
@@ -221,41 +221,41 @@ end user.s10_1;
function user.s22_1():void;
X_1:void := querylog.define("explain select * from tmp3;",
"sequential_pipe", 39:int);
X_22 := bat.new(nil:str);
-X_29 := bat.append(X_22, "sys.tmp3");
-X_37 := bat.append(X_29, "sys.tmp3");
-X_45 := bat.append(X_37, "sys.tmp3");
-X_52 := bat.append(X_45, "sys.tmp3");
+X_28 := bat.new(nil:int);
+X_26 := bat.new(nil:int);
+X_25 := bat.new(nil:str);
X_24 := bat.new(nil:str);
-X_31 := bat.append(X_24, "i");
-X_38 := bat.append(X_31, "b");
-X_46 := bat.append(X_38, "f");
-X_53 := bat.append(X_46, "t");
-X_25 := bat.new(nil:str);
-X_32 := bat.append(X_25, "int");
-X_39 := bat.append(X_32, "boolean");
-X_47 := bat.append(X_39, "real");
-X_55 := bat.append(X_47, "timestamp");
-X_26 := bat.new(nil:int);
-X_34 := bat.append(X_26, 32:int);
-X_41 := bat.append(X_34, 1:int);
-X_49 := bat.append(X_41, 24:int);
-X_57 := bat.append(X_49, 7:int);
-X_28 := bat.new(nil:int);
-X_36 := bat.append(X_28, 0:int);
-X_43 := bat.append(X_36, 0:int);
-X_51 := bat.append(X_43, 0:int);
-X_59 := bat.append(X_51, 0:int);
X_4 := sql.mvc();
C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3");
X_5:bat[:oid] := mosaic.decompress(C_103);
+X_18:bat[:timestamp] := sql.bind(X_4,
MonetDB: mosaic - Approve output
Changeset: 8d07fab26584 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d07fab26584
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/Tests/setoptimizer.stable.out
sql/test/mosaic/Tests/xqueries.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 544 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% .L1 # table_name
% def # name
% clob # type
-% 563 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
+% 522 # 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.mosaic();optimizer.profiler();optimizer.candidates();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -64,8 +64,6 @@ Ready.
% 158 # length
function user.s10_1():void;
X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"sequential_pipe", 21:int);
-function user.s8_1():void;
-X_1:void := querylog.define("explain copy into ttt from \\'/tmp/xyz\\';",
"default_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", "/tmp/xyz", -1:lng, 0:lng, 0:int, 0:int, nil:str);
X_29 := sql.append(X_4, "sys", "ttt", "a", X_25);
@@ -116,8 +114,8 @@ end user.s10_1;
% .L1 # table_name
% def # name
% clob # type
-% 586 # length
-[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.dataflow();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.mosaic();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 545 # 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.mosaic();optimizer.profiler();optimizer.candidates();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
diff --git
a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
--- a/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
+++ b/sql/test/BugTracker-2008/Tests/extract_bug.SF-2075266.stable.out.int128
@@ -29,17 +29,18 @@ Ready.
[ 1]
#SELECT EXTRACT (SECOND FROM FIPS2)
#* 100 - 90 FROM A;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% decimal # type
% 41 # length
-[ -990.00 ]
+[ 10.00]
#select EXTRACT (SECOND FROM FIPS2) FROM A;
-% sys.L1 # table_name
-% L1 # name
+% sys.L2 # table_name
+% L2 # name
% decimal # type
% 11 # length
-[ 0.999]
+[
MonetDB: mosaic - Approve output
Changeset: 5dd8b8deeaea for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5dd8b8deeaea
Modified Files:
sql/test/mosaic/Tests/session_exit.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (246 lines):
diff --git a/sql/test/mosaic/Tests/session_exit.stable.out
b/sql/test/mosaic/Tests/session_exit.stable.out
--- a/sql/test/mosaic/Tests/session_exit.stable.out
+++ b/sql/test/mosaic/Tests/session_exit.stable.out
@@ -36,43 +36,44 @@ Ready.
% clob # type
% 90 # length
function user.s4_1():void;
-X_0:void := querylog.define("explain select * from tmp3;",
"sequential_pipe", 39:int);
-X_21 := bat.new(nil:str);
-X_28 := bat.append(X_21, "sys.tmp3");
-X_36 := bat.append(X_28, "sys.tmp3");
-X_44 := bat.append(X_36, "sys.tmp3");
-X_51 := bat.append(X_44, "sys.tmp3");
-X_23 := bat.new(nil:str);
-X_30 := bat.append(X_23, "i");
-X_37 := bat.append(X_30, "b");
-X_45 := bat.append(X_37, "f");
-X_52 := bat.append(X_45, "t");
+X_1:void := querylog.define("explain select * from tmp3;",
"sequential_pipe", 39:int);
+X_22 := bat.new(nil:str);
+X_29 := bat.append(X_22, "sys.tmp3");
+X_37 := bat.append(X_29, "sys.tmp3");
+X_45 := bat.append(X_37, "sys.tmp3");
+X_52 := bat.append(X_45, "sys.tmp3");
X_24 := bat.new(nil:str);
-X_31 := bat.append(X_24, "int");
-X_38 := bat.append(X_31, "boolean");
-X_46 := bat.append(X_38, "real");
-X_54 := bat.append(X_46, "timestamp");
-X_25 := bat.new(nil:int);
-X_33 := bat.append(X_25, 32:int);
-X_40 := bat.append(X_33, 1:int);
-X_48 := bat.append(X_40, 24:int);
-X_56 := bat.append(X_48, 7:int);
-X_27 := bat.new(nil:int);
-X_35 := bat.append(X_27, 0:int);
-X_42 := bat.append(X_35, 0:int);
-X_50 := bat.append(X_42, 0:int);
-X_58 := bat.append(X_50, 0:int);
-X_3 := sql.mvc();
-C_4:bat[:oid] := sql.tid(X_3, "sys", "tmp3");
-X_7:bat[:int] := sql.bind(X_3, "sys", "tmp3", "i", 0:int);
-X_10 := mosaic.projection(C_4, X_7);
-X_11:bat[:bit] := sql.bind(X_3, "sys", "tmp3", "b", 0:int);
-X_13 := mosaic.projection(C_4, X_11);
-X_14:bat[:flt] := sql.bind(X_3, "sys", "tmp3", "f", 0:int);
-X_16 := mosaic.projection(C_4, X_14);
-X_17:bat[:timestamp] := sql.bind(X_3, "sys", "tmp3", "t", 0:int);
-X_19 := mosaic.projection(C_4, X_17);
-sql.resultSet(X_51, X_52, X_54, X_56, X_58, X_10, X_13, X_16, X_19);
+X_31 := bat.append(X_24, "i");
+X_38 := bat.append(X_31, "b");
+X_46 := bat.append(X_38, "f");
+X_53 := bat.append(X_46, "t");
+X_25 := bat.new(nil:str);
+X_32 := bat.append(X_25, "int");
+X_39 := bat.append(X_32, "boolean");
+X_47 := bat.append(X_39, "real");
+X_55 := bat.append(X_47, "timestamp");
+X_26 := bat.new(nil:int);
+X_34 := bat.append(X_26, 32:int);
+X_41 := bat.append(X_34, 1:int);
+X_49 := bat.append(X_41, 24:int);
+X_57 := bat.append(X_49, 7:int);
+X_28 := bat.new(nil:int);
+X_36 := bat.append(X_28, 0:int);
+X_43 := bat.append(X_36, 0:int);
+X_51 := bat.append(X_43, 0:int);
+X_59 := bat.append(X_51, 0:int);
+X_4 := sql.mvc();
+C_103:bat[:oid] := sql.tid(X_4, "sys", "tmp3");
+X_5:bat[:oid] := mosaic.decompress(C_103);
+X_8:bat[:int] := sql.bind(X_4, "sys", "tmp3", "i", 0:int);
+X_11 := mosaic.projection(X_5, X_8);
+X_12:bat[:bit] := sql.bind(X_4, "sys", "tmp3", "b", 0:int);
+X_14 := mosaic.projection(X_5, X_12);
+X_15:bat[:flt] := sql.bind(X_4, "sys", "tmp3", "f", 0:int);
+X_17 := mosaic.projection(X_5, X_15);
+X_18:bat[:timestamp] := sql.bind(X_4, "sys", "tmp3", "t", 0:int);
+X_20 := mosaic.projection(X_5, X_18);
+sql.resultSet(X_52, X_53, X_55, X_57, X_59, X_11, X_14, X_17, X_20);
end user.s4_1;
#inline actions= 0 time=1 usec
#remapactions= 0 time=2 usec
@@ -196,43 +197,44 @@ end user.s4_1;
% clob # type
% 90 # length
function user.s12_1():void;
-X_0:void := querylog.define("explain select * from tmp3;",
"sequential_pipe", 39:int);
-X_21 := bat.new(nil:str);
-X_28 := bat.append(X_21, "sys.tmp3");
-X_36 := bat.append(X_28, "sys.tmp3");
-X_44 := bat.append(X_36, "sys.tmp3");
-X_51 := bat.append(X_44, "sys.tmp3");
-X_23 := bat.new(nil:str);
-X_30 := bat.append(X_23, "i");
-X_37 := bat.append(X_30, "b");
-X_45 := bat.append(X_37, "f");
-X_52 := bat.append(X_45, "t");
+X_1:void := querylog.define("explain select * from tmp3;",
"sequential_pipe", 39:int);
+X_22 := bat.new(nil:str);
+X_29 := bat.append(X_22, "sys.tmp3");
+X_37 := bat.append(X_29, "sys.tmp3");
+X_45 := bat.append(X_37, "sys.tmp3");
+X_52 := bat.append(X_45, "sys.tmp3");
X_24 := bat.new(nil:str);
-X_31 := bat.append(X_24, "int");
-X_38 := bat.append(X_31, "boolean");
-X_46 := bat.append(X_38, "real");
-X_54 := bat.append(X_46, "timestamp");
-X_25 := bat.new(nil:int);
-
MonetDB: mosaic - Approve output
Changeset: f159744bf97f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f159744bf97f
Added Files:
sql/test/mosaic/Tests/prefix.stable.err
sql/test/mosaic/Tests/prefix.stable.out
Modified Files:
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/mosaic/Tests/compressionRLE.sql
sql/test/mosaic/Tests/mix.sql
sql/test/mosaic/Tests/mix.stable.err
sql/test/mosaic/Tests/mix.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 335 to 300 lines):
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-0.Bug-3063.stable.out
@@ -36,6 +36,7 @@ Ready.
[ "tmp"]
[ "json" ]
[ "profiler" ]
+[ "mosaic" ]
[ "bam"]
[ "ft" ]
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart-1.Bug-3063.stable.out
@@ -32,6 +32,7 @@ Ready.
[ "tmp"]
[ "json" ]
[ "profiler" ]
+[ "mosaic" ]
[ "bam"]
[ "ft" ]
#drop function ft.func;
diff --git
a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
--- a/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
+++ b/sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
@@ -39,6 +39,7 @@ Ready.
[ "tmp", 3, 10 ]
[ "json", 4, 10 ]
[ "profiler", 8, 10 ]
+[ "mosaic",6, 10 ]
[ "bam", 3, 10 ]
# 12:48:35 >
diff --git a/sql/test/mosaic/Tests/compressionRLE.sql
b/sql/test/mosaic/Tests/compressionRLE.sql
--- a/sql/test/mosaic/Tests/compressionRLE.sql
+++ b/sql/test/mosaic/Tests/compressionRLE.sql
@@ -97,13 +97,13 @@ explain select * from tmp3RLE;
--select * from tmp3RLE;
alter table tmp3RLE alter column i set storage 'runlength';
-select * from mosaic_layout('sys','tmp3RLE','i') limit 25;
+select * from mosaic.layout('sys','tmp3RLE','i') limit 25;
alter table tmp3RLE alter column b set storage 'runlength';
-select * from mosaic_layout('sys','tmp3RLE','b') limit 25;
+select * from mosaic.layout('sys','tmp3RLE','b') limit 25;
alter table tmp3RLE alter column f set storage 'runlength';
-select * from mosaic_layout('sys','tmp3RLE','f') limit 25;
+select * from mosaic.layout('sys','tmp3RLE','f') limit 25;
alter table tmp3RLE alter column t set storage 'runlength';
-select * from mosaic_layout('sys','tmp3RLE','t') limit 25;
+select * from mosaic.layout('sys','tmp3RLE','t') limit 25;
explain select i from tmp3RLE;
diff --git a/sql/test/mosaic/Tests/mix.sql b/sql/test/mosaic/Tests/mix.sql
--- a/sql/test/mosaic/Tests/mix.sql
+++ b/sql/test/mosaic/Tests/mix.sql
@@ -21,7 +21,7 @@ alter table mix0 set read only;
select * from mosaic_analysis('sys','mix0','i') order by factor desc;
alter table mix0 alter column i set storage 'mosaic';
-select * from mosaic_layout('sys','mix0','i') ;
+select * from mosaic.layout('sys','mix0','i') ;
drop table mix0;
diff --git a/sql/test/mosaic/Tests/mix.stable.err
b/sql/test/mosaic/Tests/mix.stable.err
--- a/sql/test/mosaic/Tests/mix.stable.err
+++ b/sql/test/mosaic/Tests/mix.stable.err
@@ -27,6 +27,9 @@ stderr of test 'mix` in directory 'sql/t
# 21:39:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-2828" "--port=35648"
# 21:39:24 >
+MAPI = (monetdb) /var/tmp/mtest-24824/.s.monetdb.37469
+QUERY = select * from mosaic_analysis('sys','mix0','i') order by factor desc;
+ERROR = !SELECT: no such operator 'mosaic_analysis'
# 21:39:24 >
# 21:39:24 > "Done."
diff --git a/sql/test/mosaic/Tests/mix.stable.out
b/sql/test/mosaic/Tests/mix.stable.out
--- a/sql/test/mosaic/Tests/mix.stable.out
+++ b/sql/test/mosaic/Tests/mix.stable.out
@@ -133,75 +133,64 @@ Ready.
[ 9]
[ 9]
#alter table mix0 set read only;
-#select * from mosaic_analysis('sys','mix0','i') order by factor desc;
-#incompatible compression for type 5 ratio 0.028151
-% .L4, .L4,.L4,.L4,.L4 # table_name
-% technique, outputsize, factor, compress, decompress # name
-% clob,bigint, double, bigint, bigint # type
-% 11, 5, 24, 1,
MonetDB: mosaic - Approve output
Changeset: 31e97b8b886e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31e97b8b886e
Modified Files:
sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 581 to 300 lines):
diff --git a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
--- a/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
+++ b/sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
@@ -79,8 +79,8 @@ Ready.
% owner, query, pipe, plan, mal # name
% clob,clob, clob, clob, int # type
% 7, 63, 12, 10, 2 # length
-[ "monetdb", "select 1;","default_pipe", "user.s10_1", 44 ]
-[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 77 ]
+[ "monetdb", "select 1;","default_pipe", "user.s10_1", 45 ]
+[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 78 ]
#select arguments, tuples from sys.querylog_calls;
% .querylog_calls, .querylog_calls # table_name
% arguments, tuples # name
@@ -93,9 +93,9 @@ Ready.
% owner, query, pipe, plan, mal,arguments, tuples # name
% clob,clob, clob, clob, int,clob, bigint # type
% 7, 63, 12, 10, 2, 18, 1 # length
-[ "monetdb", "select 1;","default_pipe", "user.s10_1", 44,
"user.s10_1():void;", 1 ]
-[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 77,
"user.s12_1():void;", 5 ]
-[ "monetdb", "select arguments, tuples from sys.querylog_calls;",
"default_pipe", "user.s14_1", 62, "user.s14_1():void;", 2 ]
+[ "monetdb", "select 1;","default_pipe", "user.s10_1", 45,
"user.s10_1():void;", 1 ]
+[ "monetdb", "select owner, query, pipe, plan, mal from
sys.querylog_catalog;", "default_pipe", "user.s12_1", 78,
"user.s12_1():void;", 5 ]
+[ "monetdb", "select arguments, tuples from sys.querylog_calls;",
"default_pipe", "user.s14_1", 63, "user.s14_1():void;", 2 ]
#select * from sys.querylog_history;
% .querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history, .querylog_history, .querylog_history,
.querylog_history # table_name
% id, owner, defined,query, pipe, plan, mal,optimize,
start, stop, arguments, tuples, run,ship, cpu,io # name
diff --git a/sql/test/remote/Tests/partition_elim.stable.out
b/sql/test/remote/Tests/partition_elim.stable.out
--- a/sql/test/remote/Tests/partition_elim.stable.out
+++ b/sql/test/remote/Tests/partition_elim.stable.out
@@ -136,63 +136,63 @@ Ready.
% clob # type
% 118 # length
function user.main():void;
-X_1207:void := querylog.define("explain select x,y from test where x
between 4.0 and 6.0;","default_pipe",49:int);
-barrier X_1326 := language.dataflow();
-X_1250 := bat.new(nil:str);
-X_1257 := bat.append(X_1250,".test");
-X_1267 := bat.append(X_1257,".test");
-X_1252 := bat.new(nil:str);
-X_1259 := bat.append(X_1252,"x");
-X_1268 := bat.append(X_1259,"y");
-X_1253 := bat.new(nil:str);
-X_1261 := bat.append(X_1253,"double");
-X_1270 := bat.append(X_1261,"double");
-X_1254 := bat.new(nil:int);
-X_1263 := bat.append(X_1254,53:int);
-X_1271 := bat.append(X_1263,53:int);
-X_1256 := bat.new(nil:int);
-X_1265 := bat.append(X_1256,0:int);
-X_1272 := bat.append(X_1265,0:int);
-X_1242:bat[:dbl] := bat.new(nil:dbl);
-X_1210 := sql.mvc();
-X_1331:bat[:dbl] := sql.bind(X_1210,"sys","test2","x",0:int,0:int,2:int);
-X_1296:bat[:dbl] := mosaic.decompress(X_1331);
-C_1293:bat[:oid] := sql.tid(X_1210,"sys","test2",0:int,2:int);
-C_1301 := algebra.select(X_1296,C_1293,4:dbl,6:dbl,true,true,false);
-X_1303 := algebra.projection(C_1301,X_1296);
-X_1332:bat[:dbl] := sql.bind(X_1210,"sys","test2","x",0:int,1:int,2:int);
-X_1297:bat[:dbl] := mosaic.decompress(X_1332);
-C_1295:bat[:oid] := sql.tid(X_1210,"sys","test2",1:int,2:int);
-C_1302 := algebra.select(X_1297,C_1295,4:dbl,6:dbl,true,true,false);
-X_1304 := algebra.projection(C_1302,X_1297);
-X_1315 := mat.packIncrement(X_1303,2:int);
-X_1227 := mat.packIncrement(X_1315,X_1304);
-X_1244 := bat.append(X_1242,X_1227,true);
-X_1333:bat[:dbl] := sql.bind(X_1210,"sys","test3","x",0:int);
-X_1232:bat[:dbl] :=
MonetDB: mosaic - Approve output
Changeset: f408e6e656bf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f408e6e656bf Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/opt_mosaic.c sql/jdbc/tests/Tests/Test_JdbcClient.stable.out sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 sql/test/remote/Tests/partition_elim.stable.out Branch: mosaic Log Message: Approve output diffs (truncated from 2503 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -60,7 +60,7 @@ Ready. % ., ., ., ., . # table_name % module, function, signature, address,comment # name % clob,clob, clob, clob, clob # type -% 11, 28, 346,44, 874 # length +% 11, 28, 367,44, 874 # length [ "aggr", "avg", "command aggr.avg(b:bat[:bte],g:bat[:oid],e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on bte" ] [ "aggr", "avg", "command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on dbl" ] [ "aggr", "avg", "command aggr.avg(b:bat[:flt],g:bat[:oid],e:bat[:any_1]):bat[:dbl] ", "AGGRavg13_dbl;", "Grouped tail average on flt" ] @@ -8034,6 +8034,81 @@ Ready. [ "mmath", "tan", "command mmath.tan(x:flt):flt ", "MATHunary_TANflt;","" ] [ "mmath", "tanh", "command mmath.tanh(x:dbl):dbl ", "MATHunary_TANHdbl;", "The tanh() function returns the hyperbolic tangent of x, which is \n\tdefined mathematically as sinh(x) / cosh(x)."] [ "mmath", "tanh", "command mmath.tanh(x:flt):flt ", "MATHunary_TANHflt;", "" ] +[ "mosaic","analyse", "pattern mosaic.analyse():void ", "MOSanalyse;", "Apply heap compression on all" ] +[ "mosaic","analyse", "pattern mosaic.analyse(b:int):void ", "MOSanalyse;", "Apply default heap compression on a specific column" ] +[ "mosaic","analyse", "pattern mosaic.analyse(properties:str):void ", "MOSanalyse;", "Apply heap compression on all with minimum threshold" ] +[ "mosaic","analyse", "pattern mosaic.analyse(properties:str,b:int):void ", "MOSanalyse;", "Apply heap compression on a single column" ] +[ "mosaic","compress", "pattern mosaic.compress(b:bat[:any_1]):bat[:any_1] ", "MOScompress;", "Apply dynamic compression producing a temporary" ] +[ "mosaic","compress", "pattern mosaic.compress(b:bat[:any_1],prop:str):bat[:any_1] ", "MOScompress;", "Apply dynamic compression over chunks" ] +[ "mosaic","decompress", "pattern mosaic.decompress(b:bat[:any_1]):bat[:any_1] ","MOSdecompress;", "Apply dynamic decompression over chunks producing a temporary version" ] +[ "mosaic","decompressStorage","pattern mosaic.decompressStorage(b:bat[:any_1]):bat[:any_1] ", "MOSdecompressStorage;", "Apply dynamic decompression, changing the storage layout permanently" ] +[ "mosaic","dump", "pattern mosaic.dump(b:bat[:any]):void ", "MOSdump;", "Dump the compressed structure" ] +[ "mosaic",
MonetDB: mosaic - Approve output
Changeset: 5236fb638aaa for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5236fb638aaa Modified Files: clients/Tests/exports.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Branch: mosaic Log Message: Approve output diffs (261 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 @@ -395,7 +395,7 @@ int geomversion_get(void); void geomversion_set(void); bat getBBPsize(void); int getBitVector(BitVector vector, BUN i, int bits); -lng getBitVectorSize(const BUN cnt, const int width); +size_t getBitVectorSize(const BUN cnt, const int width); char *get_bin_path(void); int gettimeofday(struct timeval *tv, int *ignore_zone); int gprof_pthread_create(pthread_t *__restrict, __const pthread_attr_t *__restrict, void *( *fcn)(void *), void *__restrict); @@ -1404,6 +1404,7 @@ str MKEYconstbulk_rotate_xor_hash(bat *r str MKEYhash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MKEYrotate(lng *ret, const lng *v, const int *nbits); str MKEYrotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +void MOSadvance_calendar(Client cntxt, MOStask task); void MOSadvance_delta(Client cntxt, MOStask task); void MOSadvance_dictionary(Client cntxt, MOStask task); void MOSadvance_frame(Client cntxt, MOStask task); @@ -1413,11 +1414,12 @@ void MOSadvance_prefix(Client cntxt, MOS void MOSadvance_runlength(Client cntxt, MOStask task); str MOSanalyse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int MOSanalyseInternal(Client cntxt, int threshold, MOStask task, bat bid); -void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT *factor, BAT *run, str compressions); +void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT *factor, BAT *compress, BAT *decompress, str compressions); void MOSblk(MosaicBlk blk); BUN MOSblocklimit; str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MOScompressInternal(Client cntxt, bat *bid, MOStask task, int debug); +void MOScompress_calendar(Client cntxt, MOStask task); void MOScompress_delta(Client cntxt, MOStask task); void MOScompress_dictionary(Client cntxt, MOStask task); void MOScompress_frame(Client cntxt, MOStask task); @@ -1425,11 +1427,13 @@ void MOScompress_linear(Client cntxt, MO void MOScompress_literal(Client cntxt, MOStask task); void MOScompress_prefix(Client cntxt, MOStask task); void MOScompress_runlength(Client cntxt, MOStask task); +void MOScreatecalendar(Client cntxt, MOStask task); void MOScreatedictionary(Client cntxt, MOStask task); void MOScreateframeDictionary(Client cntxt, MOStask task); str MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MOSdecompressInternal(Client cntxt, bat *bid); str MOSdecompressStorage(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +void MOSdecompress_calendar(Client cntxt, MOStask task); void MOSdecompress_delta(Client cntxt, MOStask task); void MOSdecompress_dictionary(Client cntxt, MOStask task); void MOSdecompress_frame(Client cntxt, MOStask task); @@ -1439,6 +1443,7 @@ void MOSdecompress_prefix(Client cntxt, void MOSdecompress_runlength(Client cntxt, MOStask task); str MOSdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void MOSdumpHeader(Client cntxt, MOStask task); +void MOSdump_calendar(Client cntxt, MOStask task); void MOSdump_delta(Client cntxt, MOStask task); void MOSdump_dictionary(Client cntxt, MOStask task); void MOSdump_frame(Client cntxt, MOStask task); @@ -1446,6 +1451,7 @@ void MOSdump_linear(Client cntxt, MOStas void MOSdump_literal(Client cntxt, MOStask task); void MOSdump_prefix(Client cntxt, MOStask task); void MOSdump_runlength(Client cntxt, MOStask task); +flt MOSestimate_calendar(Client cntxt, MOStask task); flt MOSestimate_delta(Client cntxt, MOStask task); flt MOSestimate_dictionary(Client cntxt, MOStask task); flt MOSestimate_frame(Client cntxt, MOStask task); @@ -1456,6 +1462,8 @@ char *MOSfiltername[]; void MOSinitHeader(MOStask task); void MOSinitializeScan(Client cntxt, MOStask task, int startblk, int stopblk); str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); +void MOSlayout_calendar(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); +void MOSlayout_calendar_hdr(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_delta(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_dictionary(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_dictionary_hdr(Client cntxt, MOStask task, BAT *btech, BAT
MonetDB: mosaic - Approve output
Changeset: bfd6b64528ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bfd6b64528ed Added Files: sql/test/mosaic/Tests/mix.stable.err sql/test/mosaic/Tests/mix.stable.out Branch: mosaic Log Message: Approve output diffs (253 lines): diff --git a/sql/test/mosaic/Tests/mix.stable.err b/sql/test/mosaic/Tests/mix.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/mosaic/Tests/mix.stable.err @@ -0,0 +1,34 @@ +stderr of test 'mix` in directory 'sql/test/mosaic` itself: + + +# 21:39:24 > +# 21:39:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35648" "--set" "mapi_usock=/var/tmp/mtest-2828/.s.monetdb.35648" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic" +# 21:39:24 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 35648 +# cmdline opt mapi_usock = /var/tmp/mtest-2828/.s.monetdb.35648 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic +# cmdline opt gdk_debug = 536870922 + +# 21:39:24 > +# 21:39:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-2828" "--port=35648" +# 21:39:24 > + + +# 21:39:24 > +# 21:39:24 > "Done." +# 21:39:24 > + diff --git a/sql/test/mosaic/Tests/mix.stable.out b/sql/test/mosaic/Tests/mix.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/mosaic/Tests/mix.stable.out @@ -0,0 +1,209 @@ +stdout of test 'mix` in directory 'sql/test/mosaic` itself: + + +# 21:39:24 > +# 21:39:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=35648" "--set" "mapi_usock=/var/tmp/mtest-2828/.s.monetdb.35648" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic" +# 21:39:24 > + +# MonetDB 5 server v11.24.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_mosaic', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:35648/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-2828/.s.monetdb.35648 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 21:39:24 > +# 21:39:24 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-2828" "--port=35648" +# 21:39:24 > + +#create table mix0(i integer); +#declare o integer; +#set o = 19531025; +#insert into mix0 values +#(0), (1), (2), (3), (5), (7), (70), (188), (190), (192), (), +#(50), (49), (50), (50), (48), (1003), (1002), (1001), (1000), (95), (99), (96), +#(98), (97), (94), (90), (93), (91), (92), (1140), (1130), (1120), (1110), +#(1100), (1250), (1260), (1270), (1280), (1290), (o), (o), (o), (o), (o), +#(o), (o), (o), (o), (o), (o), (o), (o), (o), (o), (o), +#(o), (o), (o), (o), (9), (9), (9), (9), (9), (9), (9), +#(9), (9), (9), (9), (9), (9), (9), (9), (9), (9), (9), +#(9), (9), (9), (9), (9), (9), (9), (9), (9), (9), (9), +[ 90 ] +#select * from mix0; +% sys.mix0 # table_name +% i # name +% int # type +% 8 # length +[ 0] +[ 1] +[ 2] +[ 3] +[ 5] +[ 7] +[ 70 ] +[ 188 ] +[ 190 ] +[ 192 ] +[ ] +[ 50 ] +[ 49 ] +[ 50 ] +[ 50 ] +[ 48 ] +[ 1003 ] +[ 1002 ] +[ 1001 ] +[ 1000 ] +[ 95 ] +[ 99 ] +[ 96 ] +[ 98 ] +[ 97 ] +[ 94 ] +[ 90 ] +[ 93 ] +[ 91 ] +[ 92 ] +[ 1140 ] +[ 1130 ] +[ 1120 ] +[ 1110 ] +[ 1100 ] +[ 1250 ] +[ 1260 ] +[ 1270 ] +[ 1280 ] +[ 1290 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 19531025 ] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +[ 9] +#alter table mix0 set read only; +#select
MonetDB: mosaic - Approve output
Changeset: 784b70a8d73a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=784b70a8d73a Modified Files: sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/mosaic/Tests/session_exit.stable.out sql/test/mosaic/Tests/xqueries.stable.out sql/test/mosaic/Tests/xqueries_delta.stable.out sql/test/mosaic/Tests/xqueries_rle.stable.out Branch: mosaic Log Message: Approve output diffs (truncated from 820 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out --- a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out +++ b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out @@ -49,18 +49,18 @@ function user.s2_1(A0:str):void; X_52 := bat.append(X_45,0); X_0 := sql.mvc(); X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0); -X_1:bat[:oid] := sql.tid(X_0,"sys","functions"); -X_64 := algebra.likesubselect(X_4,X_1,A0,"",false); -(X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2); -X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false); +C_1:bat[:oid] := sql.tid(X_0,"sys","functions"); +C_64 := algebra.likesubselect(X_4,C_1,A0,"",false); +(C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2); +C_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false); X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1); -X_67 := algebra.likesubselect(X_10,X_1,A0,"",false); -X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67); -X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10); +C_67 := algebra.likesubselect(X_10,C_1,A0,"",false); +C_17 := sql.subdelta(C_64,C_1,C_7,C_65,C_67); +X_20 := sql.projectdelta(C_17,X_4,C_7,r1_9,X_10); X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0); -(X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2); +(C_23,r1_25) := sql.bind(X_0,"sys","functions","func",2); X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1); -X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25); +X_28 := sql.projectdelta(C_17,X_21,C_23,r1_25,X_25); sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28); end user.s2_1; #explain select name,func from functions where name not like '%optimizers%'; @@ -87,18 +87,18 @@ function user.s3_1(A0:str):void; X_52 := bat.append(X_45,0); X_0 := sql.mvc(); X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0); -X_1:bat[:oid] := sql.tid(X_0,"sys","functions"); -X_64 := algebra.likesubselect(X_4,X_1,A0,"",true); -(X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2); -X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",true); +C_1:bat[:oid] := sql.tid(X_0,"sys","functions"); +C_64 := algebra.likesubselect(X_4,C_1,A0,"",true); +(C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2); +C_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",true); X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1); -X_67 := algebra.likesubselect(X_10,X_1,A0,"",true); -X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67); -X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10); +C_67 := algebra.likesubselect(X_10,C_1,A0,"",true); +C_17 := sql.subdelta(C_64,C_1,C_7,C_65,C_67); +X_20 := sql.projectdelta(C_17,X_4,C_7,r1_9,X_10); X_21:bat[:str] := sql.bind(X_0,"sys","functions","func",0); -(X_23,r1_25) := sql.bind(X_0,"sys","functions","func",2); +(C_23,r1_25) := sql.bind(X_0,"sys","functions","func",2); X_25:bat[:str] := sql.bind(X_0,"sys","functions","func",1); -X_28 := sql.projectdelta(X_17,X_21,X_23,r1_25,X_25); +X_28 := sql.projectdelta(C_17,X_21,C_23,r1_25,X_25); sql.resultSet(X_47,X_48,X_49,X_50,X_52,X_20,X_28); end user.s3_1; #explain select name,func from functions where name ilike '%optimizers%'; @@ -125,18 +125,18 @@ function user.s4_1(A0:str):void; X_52 := bat.append(X_45,0); X_0 := sql.mvc(); X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0); -X_1:bat[:oid] := sql.tid(X_0,"sys","functions"); -X_64 := algebra.ilikesubselect(X_4,X_1,A0,"",false); -(X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2); -X_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",false); +C_1:bat[:oid] := sql.tid(X_0,"sys","functions"); +C_64 := algebra.ilikesubselect(X_4,C_1,A0,"",false); +(C_7,r1_9) := sql.bind(X_0,"sys","functions","name",2); +C_65 := algebra.ilikesubselect(r1_9,nil:bat[:oid],A0,"",false); X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1); -X_67 := algebra.ilikesubselect(X_10,X_1,A0,"",false); -X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67); -X_20 :=
MonetDB: mosaic - Approve output
Changeset: 31198df95014 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=31198df95014
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 628 to 300 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
@@ -262,6 +262,8 @@ gdk_return GDKreleasemmap(void *ptr, siz
gdk_return GDKreleasesem(int sem_id, str *msg);
void GDKreset(int status);
void GDKsetenv(str name, str value);
+void GDKsetmemorylimit(size_t nbytes);
+void GDKsetmemorylimit(size_t nbytes){ GDK_mallocedbytes_limit = nbytes;
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
@@ -1210,6 +1212,7 @@ str IOimport(void *ret, bat *bid, str *f
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str IOsetmemorylimit(void *res, lng *nbytes);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -31,37 +31,37 @@ Ready.
% clob # type
% 133 # length
function user.s2_1(A0:str):void;
-X_46:void := querylog.define("explain select name,func from functions
where name like \\'%optimizers%\\';","sequential_pipe",33);
-X_25 := bat.new(nil:str);
-X_32 := bat.append(X_25,"sys.functions");
-X_40 := bat.append(X_32,"sys.functions");
-X_27 := bat.new(nil:str);
-X_34 := bat.append(X_27,"name");
-X_41 := bat.append(X_34,"func");
-X_28 := bat.new(nil:str);
-X_35 := bat.append(X_28,"varchar");
-X_42 := bat.append(X_35,"varchar");
-X_29 := bat.new(nil:int);
-X_37 := bat.append(X_29,256);
-X_43 := bat.append(X_37,8196);
-X_31 := bat.new(nil:int);
-X_39 := bat.append(X_31,0);
-X_45 := bat.append(X_39,0);
-X_2 := sql.mvc();
-X_6:bat[:str] := sql.bind(X_2,"sys","functions","name",0);
-C_3:bat[:oid] := sql.tid(X_2,"sys","functions");
-C_63 := algebra.likesubselect(X_6,C_3,A0,"",false);
-(C_9,r1_9) := sql.bind(X_2,"sys","functions","name",2);
-C_64 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false);
-X_12:bat[:str] := sql.bind(X_2,"sys","functions","name",1);
-C_66 := algebra.likesubselect(X_12,C_3,A0,"",false);
-C_15 := sql.subdelta(C_63,C_3,C_9,C_64,C_66);
-X_17 := sql.projectdelta(C_15,X_6,C_9,r1_9,X_12);
-X_18:bat[:str] := sql.bind(X_2,"sys","functions","func",0);
-(C_20,r1_25) := sql.bind(X_2,"sys","functions","func",2);
-X_22:bat[:str] := sql.bind(X_2,"sys","functions","func",1);
-X_23 := sql.projectdelta(C_15,X_18,C_20,r1_25,X_22);
-sql.resultSet(X_40,X_41,X_42,X_43,X_45,X_17,X_23);
+X_53:void := querylog.define("explain select name,func from functions
where name like \\'%optimizers%\\';","sequential_pipe",33);
+X_30 := bat.new(nil:str);
+X_37 := bat.append(X_30,"sys.functions");
+X_47 := bat.append(X_37,"sys.functions");
+X_32 := bat.new(nil:str);
+X_39 := bat.append(X_32,"name");
+X_48 := bat.append(X_39,"func");
+X_33 := bat.new(nil:str);
+X_41 := bat.append(X_33,"varchar");
+X_49 := bat.append(X_41,"varchar");
+X_34 := bat.new(nil:int);
+X_43 := bat.append(X_34,256);
+X_50 := bat.append(X_43,8196);
+X_36 := bat.new(nil:int);
+X_45 := bat.append(X_36,0);
+X_52 := bat.append(X_45,0);
+X_0 := sql.mvc();
+X_4:bat[:str] := sql.bind(X_0,"sys","functions","name",0);
+X_1:bat[:oid] := sql.tid(X_0,"sys","functions");
+X_64 := algebra.likesubselect(X_4,X_1,A0,"",false);
+(X_7,r1_9) := sql.bind(X_0,"sys","functions","name",2);
+X_65 := algebra.likesubselect(r1_9,nil:bat[:oid],A0,"",false);
+X_10:bat[:str] := sql.bind(X_0,"sys","functions","name",1);
+X_67 := algebra.likesubselect(X_10,X_1,A0,"",false);
+X_17 := sql.subdelta(X_64,X_1,X_7,X_65,X_67);
+X_20 := sql.projectdelta(X_17,X_4,X_7,r1_9,X_10);
+X_21:bat[:str] :=
MonetDB: mosaic - Approve output
Changeset: 4a6515cc3665 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a6515cc3665 Modified Files: monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.err monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.out monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame.stable.err monetdb5/modules/mosaic/Tests/mosaic_frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_linear_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_linear_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_literal_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_literal_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_mix_subselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_mix_subselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_mix_thetasubselect.stable.err monetdb5/modules/mosaic/Tests/mosaic_mix_thetasubselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_runlength_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_runlength_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_zone_joins.stable.err monetdb5/modules/mosaic/Tests/mosaic_zone_joins.stable.out Branch: mosaic Log Message: Approve output diffs (truncated from 306 to 300 lines): diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_delta_joins` in directory 'monetdb5/modules/mal` itself: +stderr of test 'mosaic_delta_joins` in directory 'monetdb5/modules/mosaic` itself: # 19:38:40 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_delta_joins` in directory 'monetdb5/modules/mal` itself: +stdout of test 'mosaic_delta_joins` in directory 'monetdb5/modules/mosaic` itself: # 19:38:40 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_dictionary` in directory 'monetdb5/modules/mal` itself: +stderr of test 'mosaic_dictionary` in directory 'monetdb5/modules/mosaic` itself: # 00:21:55 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.stable.out @@ -1,4 +1,4 @@ -stdout of test 'mosaic_dictionary` in directory 'monetdb5/modules/mal` itself: +stdout of test 'mosaic_dictionary` in directory 'monetdb5/modules/mosaic` itself: # 00:21:55 > diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.err b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.err --- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.err +++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.err @@ -1,4 +1,4 @@ -stderr of test 'mosaic_dictionary_joins` in directory 'monetdb5/modules/mal` itself: +stderr of test 'mosaic_dictionary_joins` in directory 'monetdb5/modules/mosaic` itself: # 09:15:38 > diff
MonetDB: mosaic - Approve output
Changeset: dc439fc41837 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc439fc41837 Modified Files: clients/Tests/exports.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/mosaic/Tests/compression.stable.out sql/test/mosaic/Tests/compressionRLE.stable.out sql/test/mosaic/Tests/compressionRLE2.sql sql/test/mosaic/Tests/compressionRLE2.stable.out sql/test/mosaic/Tests/session_exit.stable.out sql/test/mosaic/Tests/xqueries.stable.out sql/test/mosaic/Tests/xqueries_delta.stable.out sql/test/mosaic/Tests/xqueries_rle.stable.out Branch: mosaic Log Message: Approve output diffs (truncated from 2456 to 300 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 @@ -101,6 +101,7 @@ dbl BATcalcvariance_population(dbl *avgp dbl BATcalcvariance_sample(dbl *avgp, BAT *b); BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s); BAT *BATcalcxorcst(BAT *b, const ValRecord *v, BAT *s); +int BATcheckmosaic(BAT *b); gdk_return BATclear(BAT *b, int force); void BATcommit(BAT *b); BAT *BATconstant(oid hseq, int tt, const void *val, BUN cnt, int role); @@ -283,6 +284,8 @@ size_t HEAPmemsize(Heap *h); size_t HEAPvmsize(Heap *h); void IMPSdestroy(BAT *b); lng IMPSimprintsize(BAT *b); +gdk_return MOSalloc(BAT *b, BUN cap); +void MOSdestroy(BAT *b); int MT_check_nr_cores(void); int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum MT_thr_detach d); void MT_exiting_thread(void); @@ -372,6 +375,7 @@ int bteFromStr(const char *src, int *len int bteToStr(str *dst, int *len, const bte *src); const bte bte_nil; int closedir(DIR *dir); +void clrBitVector(BitVector vector, BUN i, int bits); int dblFromStr(const char *src, int *len, dbl **dst); int dblToStr(str *dst, int *len, const dbl *src); const dbl dbl_nil; @@ -392,12 +396,14 @@ void geomsqlfix_set(geomsqlfix_fptr); int geomversion_get(void); void geomversion_set(void); bat getBBPsize(void); +int getBitVector(BitVector vector, BUN i, int bits); char *get_bin_path(void); int gettimeofday(struct timeval *tv, int *ignore_zone); int gprof_pthread_create(pthread_t *__restrict, __const pthread_attr_t *__restrict, void *( *fcn)(void *), void *__restrict); int hgeFromStr(const char *src, int *len, hge **dst); int hgeToStr(str *dst, int *len, const hge *src); const hge hge_nil; +void initBitMasks(void); int intFromStr(const char *src, int *len, int **dst); int intToStr(str *dst, int *len, const int *src); const int int_nil; @@ -450,6 +456,7 @@ char *msab_registerStop(void); char *msab_retreatScenario(const char *lang); char *msab_serialise(char **ret, const sabdb *db); char *msab_wildRetreat(void); +BitVector newBitVector(BUN cnt, int width); const oid oid_nil; DIR *opendir(const char *dirname); void print_trace(void); @@ -471,6 +478,7 @@ int ptrToStr(str *dst, int *len, const p const ptr ptr_nil; struct dirent *readdir(DIR *dir); void rewinddir(DIR *dir); +void setBitVector(BitVector vector, const BUN i, const int bits, const int value); int shtFromStr(const char *src, int *len, sht **dst); int shtToStr(str *dst, int *len, const sht *src); const sht sht_nil; @@ -480,6 +488,7 @@ int strLen(const char *s); int strNil(const char *s); int strToStr(str *dst, int *len, const char *src); const char str_nil[2]; +int tstBitVector(BitVector vector, BUN i, int bits); gdk_return void_inplace(BAT *b, oid id, const void *val, bit force); BUN void_replace_bat(BAT *b, BAT *p, BAT *u, bit force); int win_mkdir(const char *, const int mode); @@ -1348,6 +1357,7 @@ int MCactiveClients(void); str MCawakeClient(int id); void MCcloseClient(Client c); int MCdefault; +str MCexitMaintenance(Client cntxt); Client MCforkClient(Client father); Client MCgetClient(int id); void MCinit(void); @@ -1356,6 +1366,7 @@ Client MCinitClientRecord(Client c, oid int MCinitClientThread(Client c); int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt); int MCshutdowninprogress(void); +str MCstartMaintenance(Client cntxt, lng timeout, int abort); void MCstopClients(Client c); str MCsuspendClient(int id); int MCvalid(Client c); @@ -1397,6 +1408,111 @@ str MKEYconstbulk_rotate_xor_hash(bat *r str MKEYhash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MKEYrotate(lng *ret, const lng *v, const int *nbits); str MKEYrotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +void MOSadvance_delta(Client cntxt, MOStask task); +void MOSadvance_dictionary(Client cntxt, MOStask task); +void MOSadvance_frame(Client cntxt, MOStask task); +void MOSadvance_linear(Client cntxt, MOStask task); +void MOSadvance_literal(Client cntxt, MOStask task); +void
MonetDB: mosaic - Approve output
Changeset: 88236fa8ecf3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88236fa8ecf3
Modified Files:
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 1773 to 300 lines):
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out
@@ -41,7 +41,7 @@ Ready.
% clob # type
% 362 # length
function user.s2_1(A0:str,A1:str):void;
-X_130:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n from lineorder, dwdate, part, supplier\n where lo_orderdate =
d_datekey\n and lo_partkey = p_partkey\n and lo_suppkey = s_suppkey\n and
p_category = \\'MFGR#12\\' \n and s_region = \\'AMERICA\\'\n group by d_year,
p_brand1\n order by d_year, p_brand1;","sequential_pipe",86);
+X_130:void := querylog.define("explain\nselect sum(lo_revenue), d_year,
p_brand1\n from lineorder, dwdate, part, supplier\n where lo_orderdate =
d_datekey\n and lo_partkey = p_partkey\n and lo_suppkey = s_suppkey\n and
p_category = \\'MFGR#12\\' \n and s_region = \\'AMERICA\\'\n group by d_year,
p_brand1\n order by d_year, p_brand1;","sequential_pipe",85);
X_98 := bat.new(nil:oid,nil:str);
X_106 := bat.append(X_98,"sys.L1");
X_115 := bat.append(X_106,"sys.dwdate");
@@ -98,12 +98,11 @@ function user.s2_1(A0:str,A1:str):void;
X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52);
C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate");
(X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng);
-X_147:bat[:oid] := algebra.projectionpath(X_56,X_45);
X_58:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",0);
(C_60,r1_78) := sql.bind(X_3,"sys","part","p_brand1",2);
X_62:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",1);
X_63 := sql.projectdelta(C_23,X_58,C_60,r1_78,X_62);
-X_64:bat[:str] := algebra.projectionpath(X_147,r1_32,X_63);
+X_64:bat[:str] := algebra.projectionpath(X_56,X_45,r1_32,X_63);
X_65:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0);
(C_67,r1_89) := sql.bind(X_3,"sys","dwdate","d_year",2);
X_69:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",1);
diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
MonetDB: mosaic - Approve output
Changeset: 528e54251e30 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=528e54251e30 Modified Files: sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 Branch: mosaic Log Message: Approve output diffs (truncated from 1650 to 300 lines): diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out b/sql/benchmarks/ssbm/Tests/04-explain.stable.out --- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out +++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out @@ -98,12 +98,12 @@ function user.s2_1(A0:str,A1:str):void; X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52); C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate"); (X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng); -X_146:bat[:oid] := algebra.projectionpath(X_56,X_45); +X_147:bat[:oid] := algebra.projectionpath(X_56,X_45); X_58:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",0); (C_60,r1_78) := sql.bind(X_3,"sys","part","p_brand1",2); X_62:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",1); X_63 := sql.projectdelta(C_23,X_58,C_60,r1_78,X_62); -X_64:bat[:str] := algebra.projectionpath(X_146,r1_32,X_63); +X_64:bat[:str] := algebra.projectionpath(X_147,r1_32,X_63); X_65:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0); (C_67,r1_89) := sql.bind(X_3,"sys","dwdate","d_year",2); X_69:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",1); diff --git a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 --- a/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 +++ b/sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 @@ -98,12 +98,12 @@ function user.s2_1(A0:str,A1:str):void; X_53:bat[:oid] := algebra.projectionpath(X_45,X_26,X_52); C_54:bat[:oid] := sql.tid(X_3,"sys","dwdate"); (X_56,r1_70) := algebra.subjoin(X_53,C_54,nil:BAT,nil:BAT,false,nil:lng); -X_146:bat[:oid] := algebra.projectionpath(X_56,X_45); +X_147:bat[:oid] := algebra.projectionpath(X_56,X_45); X_58:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",0); (C_60,r1_78) := sql.bind(X_3,"sys","part","p_brand1",2); X_62:bat[:str] := sql.bind(X_3,"sys","part","p_brand1",1); X_63 := sql.projectdelta(C_23,X_58,C_60,r1_78,X_62); -X_64:bat[:str] := algebra.projectionpath(X_146,r1_32,X_63); +X_64:bat[:str] := algebra.projectionpath(X_147,r1_32,X_63); X_65:bat[:int] := sql.bind(X_3,"sys","dwdate","d_year",0); (C_67,r1_89) :=
MonetDB: mosaic - Approve output
Changeset: ac9e95f83a3b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ac9e95f83a3b
Modified Files:
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 1063 to 300 lines):
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -35,6 +35,7 @@ Resultset with 3 columns
TABLE_SCHEMTABLE_CATALOG TABLE_CAT
bamnullnull
json nullnull
+mosaic nullnull
profiler nullnull
sysnullnull
tmpnullnull
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -23,47 +23,8 @@ Ready.
Operation successful
-+--+
-| mal|
-+==+
-| function user.s2_1():void;
|
-| X_46:void := querylog.define("explain select \"name\" from
\"tables\"\n;","sequential_pipe",33); |
-| X_32 := bat.new(nil:oid,nil:str);
|
-| X_38 := bat.append(X_32,".tables");
|
-| X_33 := bat.new(nil:oid,nil:str);
|
-| X_40 := bat.append(X_33,"name");
|
-| X_34 := bat.new(nil:oid,nil:str);
|
-| X_41 := bat.append(X_34,"varchar");
|
-| X_35 := bat.new(nil:oid,nil:int);
|
-| X_43 := bat.append(X_35,1024);
|
-| X_37 := bat.new(nil:oid,nil:int);
|
-| X_45 := bat.append(X_37,0);
|
-| X_2:bat[:str] := bat.new(nil:oid,nil:str);
|
-| X_1 := sql.mvc();
|
-| X_8:bat[:sht] := sql.bind(X_1,"sys","_tables","type",0);
|
-| C_5:bat[:oid] := sql.tid(X_1,"sys","_tables");
|
-| C_55 := algebra.subselect(X_8,C_5,2,2,true,true,true);
|
-| (C_11,r1_11) := sql.bind(X_1,"sys","_tables","type",2);
|
-| C_56 := algebra.subselect(r1_11,nil:bat[:oid],2,2,true,true,true);
|
-| X_14:bat[:sht] := sql.bind(X_1,"sys","_tables","type",1);
|
-| C_58 := algebra.subselect(X_14,C_5,2,2,true,true,true);
|
-| C_17 := sql.subdelta(C_55,C_5,C_11,C_56,C_58);
|
-| X_19:bat[:str] := sql.bind(X_1,"sys","_tables","name",0);
|
-| (C_21,r1_25) := sql.bind(X_1,"sys","_tables","name",2);
MonetDB: mosaic - Approve output
Changeset: 38789ccf1a29 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38789ccf1a29 Modified Files: sql/test/mosaic/Tests/compressionRLE.stable.out Branch: mosaic Log Message: Approve output diffs (18 lines): diff --git a/sql/test/mosaic/Tests/compressionRLE.stable.out b/sql/test/mosaic/Tests/compressionRLE.stable.out --- a/sql/test/mosaic/Tests/compressionRLE.stable.out +++ b/sql/test/mosaic/Tests/compressionRLE.stable.out @@ -278,10 +278,10 @@ end user.s13_1; % schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, compress # name % clob,clob, clob, clob, clob, clob, bigint, int,bigint, bigint, bigint, boolean,bigint, boolean,boolean # type % 3, 7, 1, 9, 8, 7, 2, 1, 3, 1, 1, 5, 1, 5, 5 # length -[ "sys", "tmp3rle", "i","int", "readonly", "13/1307", 86, 4, 344,0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "b","boolean", "readonly", "13/1323", 86, 1, 86, 0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "f","real", "readonly", "13/1324", 86, 4, 344,0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "t","timestamp","readonly", "13/1325", 86, 8, 688,0, 0, false, 0, true, false ] +[ "sys", "tmp3rle", "i","int", "readonly", "13/1306", 86, 4, 344,0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "b","boolean", "readonly", "13/1322", 86, 1, 86, 0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "f","real", "readonly", "13/1323", 86, 4, 344,0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "t","timestamp","readonly", "13/1324", 86, 8, 688,0, 0, false, 0, true, false ] #select count(*) from tmp3RLE; % sys.L1 # table_name % L1 # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Approve output
Changeset: 27647300aa5c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27647300aa5c Modified Files: clients/Tests/exports.stable.out Branch: mosaic Log Message: Approve output diffs (35 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 @@ -1532,7 +1532,7 @@ void MOSadvance_prefix(Client cntxt, MOS void MOSadvance_runlength(Client cntxt, MOStask task); str MOSanalyse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int MOSanalyseInternal(Client cntxt, int threshold, MOStask task, bat bid); -void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT *factor, lng sample); +void MOSanalyseReport(Client cntxt, BAT *b, BAT *btech, BAT *output, BAT *factor, str compressions); void MOSblk(MosaicBlk blk); BUN MOSblocklimit; str MOScompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1545,7 +1545,7 @@ void MOScompress_literal(Client cntxt, M void MOScompress_prefix(Client cntxt, MOStask task); void MOScompress_runlength(Client cntxt, MOStask task); void MOScreatedictionary(Client cntxt, MOStask task); -void MOScreateframe(Client cntxt, MOStask task); +void MOScreateframeDictionary(Client cntxt, MOStask task); str MOSdecompress(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MOSdecompressInternal(Client cntxt, int *ret, int *bid, int inplace); str MOSdecompressStorage(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1582,10 +1582,12 @@ str MOSjoin_linear(Client cntxt, MOStask str MOSjoin_literal(Client cntxt, MOStask task); str MOSjoin_prefix(Client cntxt, MOStask task); str MOSjoin_runlength(Client cntxt, MOStask task); -str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); +str MOSlayout(Client cntxt, BAT *b, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties, str compressionscheme); void MOSlayout_delta(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_dictionary(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); +void MOSlayout_dictionary_hdr(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_frame(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); +void MOSlayout_frame_hdr(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_linear(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_literal(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); void MOSlayout_prefix(Client cntxt, MOStask task, BAT *btech, BAT *bcount, BAT *binput, BAT *boutput, BAT *bproperties); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Approve output
Changeset: 6bdc322393fe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bdc322393fe Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/mosaic_frame.c sql/backends/monet5/sql.mal sql/test/Tests/setoptimizer.stable.err sql/test/Tests/setoptimizer.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/drop3.stable.out.int128 sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select1.stable.out.int128 sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/select2.stable.out.int128 sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp1.stable.out.int128 sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp2.stable.out.int128 sql/test/leaks/Tests/temp3.stable.out sql/test/leaks/Tests/temp3.stable.out.int128 Branch: mosaic Log Message: Approve output diffs (truncated from 15132 to 300 lines): diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -60,6 +60,7 @@ Ready. SYSTEM SCHEMA bam SYSTEM SCHEMA json +SYSTEM SCHEMA mosaic SYSTEM SCHEMA sys SYSTEM SCHEMA tmp SYSTEM TABLE sys._columns @@ -155,6 +156,7 @@ SYSTEM FUNCTION sys.equals SYSTEM FUNCTION sys.evalalgebra SYSTEM FUNCTION sys.fitsattach SYSTEM FUNCTION sys.fitsload +SYSTEM FUNCTION sys.flush_log SYSTEM FUNCTION sys.fuse SYSTEM FUNCTION sys.generate_series SYSTEM FUNCTION sys.geomcollectionfromtext @@ -474,13 +476,13 @@ create function "abbrev" (p inet) return external name inet."abbrev"; create function alpha(pdec double, pradius double) returns double external name sql.alpha; -create procedure analyze(minmax int, "sample" bigint) +create procedure sys.analyze(minmax int, "sample" bigint) external name sql.analyze; -create procedure analyze(minmax int, "sample" bigint, sch string) +create procedure sys.analyze(minmax int, "sample" bigint, sch string) external name sql.analyze; -create procedure analyze(minmax int, "sample" bigint, sch string, tbl string) +create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl string) external name sql.analyze; -create procedure analyze(minmax int, "sample" bigint, sch string, tbl string, col string) +create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl string, col string) external name sql.analyze; -- ogc Spatial Analysis methods diff --git a/clients/Tests/SQL-dump.stable.out.int128 b/clients/Tests/SQL-dump.stable.out.int128 --- a/clients/Tests/SQL-dump.stable.out.int128 +++ b/clients/Tests/SQL-dump.stable.out.int128 @@ -52,6 +52,7 @@ Ready. SYSTEM SCHEMA bam SYSTEM SCHEMA json +SYSTEM SCHEMA mosaic SYSTEM SCHEMA sys SYSTEM SCHEMA tmp SYSTEM TABLE sys._columns @@ -147,6 +148,7 @@ SYSTEM FUNCTION sys.equals SYSTEM FUNCTION sys.evalalgebra SYSTEM FUNCTION sys.fitsattach SYSTEM FUNCTION sys.fitsload +SYSTEM FUNCTION sys.flush_log SYSTEM FUNCTION sys.fuse SYSTEM FUNCTION sys.generate_series SYSTEM FUNCTION sys.geomcollectionfromtext @@ -183,6 +185,7 @@ SYSTEM FUNCTION sys.like SYSTEM FUNCTION sys.linefromtext SYSTEM FUNCTION sys.listdir SYSTEM FUNCTION sys.listdirpat +SYSTEM FUNCTION sys.malfunctions SYSTEM FUNCTION sys.masklen SYSTEM FUNCTION sys.mbr SYSTEM FUNCTION sys.mbroverlaps @@ -465,13 +468,13 @@ create function "abbrev" (p inet) return external name inet."abbrev"; create function alpha(pdec double, pradius double) returns double external name sql.alpha; -create procedure analyze(minmax int, "sample" bigint) +create procedure sys.analyze(minmax int, "sample" bigint) external name sql.analyze; -create procedure analyze(minmax int, "sample" bigint, sch string) +create procedure sys.analyze(minmax int, "sample" bigint, sch string) external name sql.analyze; -create procedure analyze(minmax int, "sample" bigint, sch string, tbl string) +create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl string) external name sql.analyze; -create procedure analyze(minmax int, "sample" bigint, sch string, tbl string, col string) +create procedure sys.analyze(minmax int, "sample" bigint, sch string, tbl string, col string) external name sql.analyze; -- ogc Spatial Analysis methods @@ -479,7 +482,7 @@ create function area(g geometry) returns create function astext(g geometry) returns string external name geom."AsText"; -- The BAT buffer pool overview create function sys.bbp ()
MonetDB: mosaic - Approve output
Changeset: 6bbe0bdea1df for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bbe0bdea1df Modified Files: sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 Branch: mosaic Log Message: Approve output diffs (187 lines): diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out --- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out +++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out @@ -61,6 +61,7 @@ Resultset with 3 columns TABLE_SCHEMTABLE_CATALOG TABLE_CAT bammTests_sql_jdbc_tests mTests_sql_jdbc_tests json mTests_sql_jdbc_tests mTests_sql_jdbc_tests +mosaic mTests_sql_jdbc_tests mTests_sql_jdbc_tests sysmTests_sql_jdbc_tests mTests_sql_jdbc_tests tmpmTests_sql_jdbc_tests mTests_sql_jdbc_tests Resultset with 3 columns diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -58,7 +58,7 @@ Ready. % sys.L3, sys.L3, sys.L3, sys.L3, sys.L3 # table_name % schema, function, argno, argtype,definition # name % varchar, varchar,int,varchar,varchar # type -% 4, 35, 2, 15, 1328 # length +% 6, 35, 2, 15, 1328 # length [ "bam", "bam_drop_file",0, "bigint", "create procedure bam.bam_drop_file(file_id bigint, dbschema smallint)\nexternal name bam.bam_drop_file;" ] [ "bam", "bam_drop_file",1, "smallint", "" ] [ "bam", "bam_export", 0, "clob", "create procedure bam.bam_export(output_path string)\nexternal name bam.bam_export;"] @@ -129,6 +129,36 @@ Ready. [ "json", "tojsonarray", 1, "double", "" ] [ "json", "valuearray", 0, "json", "create function json.valuearray(js json)\nreturns json external name json.valuearray;"] [ "json", "valuearray", 1, "json", "" ] +[ "mosaic","analysis", 0, "clob", "-- provide an analysis of the possible mosaic storage layouts \ncreate function mosaic.analysis(sch string, tbl string, col string)\nreturns table(\n\ttechnique string, \t-- compression techniques being used\n\toutputsize bigint,\t-- after compression\n\tfactor double\t\t-- compression factor\n) external name sql.\"mosaicAnalysis\";" ] +[ "mosaic","analysis", 1, "bigint", "" ] +[ "mosaic","analysis", 2, "double", "" ] +[ "mosaic","analysis", 3, "clob", "" ] +[ "mosaic","analysis", 4, "clob", "" ] +[ "mosaic","analysis", 5, "clob", "" ] +[ "mosaic","analysis", 0, "clob", "create function mosaic.analysis(sch string, tbl string, col string, compressions string)\nreturns table(\n\ttechnique string, \t-- compression techniques being used\n\toutputsize bigint,\t-- after compression\n\tfactor double\t\t-- compression factor\n) external name sql.\"mosaicAnalysis\";" ] +[ "mosaic","analysis", 1, "bigint", "" ] +[ "mosaic","analysis", 2, "double", "" ] +[ "mosaic","analysis", 3, "clob", "" ] +[ "mosaic","analysis", 4, "clob", "" ] +[ "mosaic","analysis", 5, "clob", "" ] +[ "mosaic","analysis", 6, "clob", "" ] +[ "mosaic","layout", 0, "clob", "create function mosaic.layout(sch string, tbl string, col string)\nreturns table (\n\t\"technique\" string, \t-- any of the built-in compressors + header\n\t\"count\" bigint, \t-- entries covered \n\tinputsize bigint,\t-- original storage footprint\n\toutputsize bigint,\t-- after compression\n\tproperties string\t-- additional information\n\t) external name sql.\"mosaicLayout\";" ] +[ "mosaic","layout", 1, "bigint", "" ] +[ "mosaic","layout", 2, "bigint", "" ] +[ "mosaic","layout", 3, "bigint", "" ] +[ "mosaic","layout", 4, "clob", "" ] +[ "mosaic","layout", 5, "clob", "" ] +[ "mosaic","layout", 6, "clob", "" ] +[ "mosaic","layout", 7, "clob", "" ] +[ "mosaic","layout", 0, "clob", "create function mosaic.layout(sch string, tbl string, col string, compressionscheme string)\nreturns table (\n\t\"technique\" string, \t-- any of the built-in compressors + header\n\t\"count\" bigint, \t-- entries covered \n\tinputsize bigint,\t-- original storage footprint\n\toutputsize bigint,\t-- after compression\n\tproperties string\t-- additional information\n\t) external name sql.\"mosaicLayout\";" ] +[ "mosaic","layout", 1, "bigint", ""
MonetDB: mosaic - Approve output
Changeset: abadb064e88f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abadb064e88f Modified Files: sql/test/mosaic/Tests/compressionRLE.stable.out Branch: mosaic Log Message: Approve output diffs (18 lines): diff --git a/sql/test/mosaic/Tests/compressionRLE.stable.out b/sql/test/mosaic/Tests/compressionRLE.stable.out --- a/sql/test/mosaic/Tests/compressionRLE.stable.out +++ b/sql/test/mosaic/Tests/compressionRLE.stable.out @@ -278,10 +278,10 @@ end user.s13_1; % schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, compress # name % clob,clob, clob, clob, clob, clob, bigint, int,bigint, bigint, bigint, boolean,bigint, boolean,boolean # type % 3, 7, 1, 9, 8, 7, 2, 1, 3, 1, 1, 5, 1, 5, 5 # length -[ "sys", "tmp3rle", "i","int", "readonly", "13/1306", 86, 4, 344,0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "b","boolean", "readonly", "13/1322", 86, 1, 86, 0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "f","real", "readonly", "13/1323", 86, 4, 344,0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "t","timestamp","readonly", "13/1324", 86, 8, 688,0, 0, false, 0, true, false ] +[ "sys", "tmp3rle", "i","int", "readonly", "13/1307", 86, 4, 344,0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "b","boolean", "readonly", "13/1323", 86, 1, 86, 0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "f","real", "readonly", "13/1324", 86, 4, 344,0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "t","timestamp","readonly", "13/1325", 86, 8, 688,0, 0, false, 0, true, false ] #select count(*) from tmp3RLE; % sys.L1 # table_name % L1 # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Approve output
Changeset: ed560f990b36 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed560f990b36 Modified Files: sql/test/mosaic/Tests/compressionRLE.stable.out Branch: mosaic Log Message: Approve output diffs (18 lines): diff --git a/sql/test/mosaic/Tests/compressionRLE.stable.out b/sql/test/mosaic/Tests/compressionRLE.stable.out --- a/sql/test/mosaic/Tests/compressionRLE.stable.out +++ b/sql/test/mosaic/Tests/compressionRLE.stable.out @@ -278,10 +278,10 @@ end user.s13_1; % schema, table, column, type, mode, location, count, typewidth, columnsize, heapsize, hashes, phash, imprints, sorted, compress # name % clob,clob, clob, clob, clob, clob, bigint, int,bigint, bigint, bigint, boolean,bigint, boolean,boolean # type % 3, 7, 1, 9, 8, 7, 2, 1, 3, 1, 1, 5, 1, 5, 5 # length -[ "sys", "tmp3rle", "i","int", "readonly", "14/1401", 86, 4, 344,0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "b","boolean", "readonly", "14/1415", 86, 1, 86, 0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "f","real", "readonly", "14/1416", 86, 4, 344,0, 0, false, 0, false, false ] -[ "sys", "tmp3rle", "t","timestamp","readonly", "14/1417", 86, 8, 688,0, 0, false, 0, true, false ] +[ "sys", "tmp3rle", "i","int", "readonly", "13/1306", 86, 4, 344,0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "b","boolean", "readonly", "13/1322", 86, 1, 86, 0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "f","real", "readonly", "13/1323", 86, 4, 344,0, 0, false, 0, false, false ] +[ "sys", "tmp3rle", "t","timestamp","readonly", "13/1324", 86, 8, 688,0, 0, false, 0, true, false ] #select count(*) from tmp3RLE; % sys.L1 # table_name % L1 # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: mosaic - Approve output
Changeset: 361bab4b204c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=361bab4b204c Modified Files: monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_zone_subselect.mal monetdb5/modules/mal/Tests/mosaic_zone_subselect.stable.out Branch: mosaic Log Message: Approve output diffs (203 lines): diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal --- a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal +++ b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal @@ -59,7 +59,6 @@ io.print(xs); c:= bat.new(:oid,:oid); bat.append(c,1@0); bat.append(c,5@0); -io.print(c); s:= algebra.subselect(base,c,-1,4,false,false,false); io.print(s); diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out @@ -70,7 +70,6 @@ function user.main():void; c := bat.new(:oid,:oid); bat.append(c,1@0); bat.append(c,5@0); -io.print(c); s := algebra.subselect(base,c,-1,4,false,false,false); io.print(s); xs := mosaic.subselect(x,c,-1,4,false,false,false); @@ -263,7 +262,6 @@ end user.main; # void oid # type #--# [ 0@0, 1@0 ] -[ 1@0, 5@0 ] #--# # ht # name # void oid # type @@ -313,7 +311,6 @@ end user.main; # ht # name # void oid # type #--# -[ 0@0, 1@0 ] #--# # ht # name # void oid # type diff --git a/monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal b/monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal --- a/monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal +++ b/monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal @@ -52,10 +52,10 @@ xs:= mosaic.subselect(x,nil:int,nil:int, io.print(xs); # using candidatelists +io.print(candidate stuff); c:= bat.new(:oid,:oid); bat.append(c,2@0); bat.append(c,5@0); -io.print(c); s:= algebra.subselect(base,c,0,50,false,false,false); io.print(s); @@ -97,6 +97,8 @@ io.print(s); xs:= mosaic.subselect(x,c,nil:int,nil:int,false,false,true); io.print(xs); + +io.print(string stuff); bstr:= bat.new(:oid,:str); bat.append(bstr,the); bat.append(bstr,big); diff --git a/monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out @@ -61,10 +61,10 @@ function user.main():void; xs := mosaic.subselect(x,nil:int,nil:int,false,false,true); io.print(xs); # using candidatelists +io.print(candidate stuff); c := bat.new(:oid,:oid); bat.append(c,2@0); bat.append(c,5@0); -io.print(c); s := algebra.subselect(base,c,0,50,false,false,false); io.print(s); xs := mosaic.subselect(x,c,0,50,false,false,false); @@ -97,6 +97,7 @@ function user.main():void; io.print(s); xs := mosaic.subselect(x,c,nil:int,nil:int,false,false,true); io.print(xs); +io.print(string stuff); bstr := bat.new(:oid,:str); bat.append(bstr,the); bat.append(bstr,big); @@ -233,6 +234,7 @@ end user.main; # ht # name # void oid # type #--# +[ candidate stuff ] #--# # ht # name # void oid # type @@ -297,8 +299,6 @@ end user.main; # ht # name # void oid # type #--# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] #--# # ht # name # void oid # type @@ -327,6 +327,7 @@ end user.main; # ht # name # void oid # type #--# +[ string stuff ] #--# # ht # name # void void # type diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal --- a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal +++ b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal @@ -70,7 +70,6 @@ io.print(xs); c:= bat.new(:oid,:oid); bat.append(c,2@0); bat.append(c,5@0); -io.print(c); s:= algebra.subselect(base,c,0,50,false,false,false); io.print(s); diff --git a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out +++
MonetDB: mosaic - Approve output
Changeset: c570bbe3e75f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c570bbe3e75f Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/pg_regress/Tests/vacuum.stable.out sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/Tests/without_oid.stable.out Branch: mosaic Log Message: Approve output diffs (truncated from 478 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -684,7 +684,7 @@ Ready. [ sys, stddev_samp, 1, timestamp, ] [ sys, stop, 0, int, create procedure sys.stop(tag int)\nexternal name sql.sysmon_stop;] [ sys, stop, 0, bigint, create procedure sys.stop(tag bigint)\nexternal name sql.sysmon_stop; ] -[ sys, storage, 0, clob, -- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\storage\()\nreturns table (\sc hema\ string, \table\ string, \column\ string, \type\ string, \mode\ string, location string, \count\ bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean)\nexternal name sql.\storage\;] +[ sys, storage, 0, clob, -- This Source Code Form is subject to the terms of the Mozilla Public\n-- License, v. 2.0. If a copy of the MPL was not distributed with this\n-- file, You can obtain one at http://mozilla.org/MPL/2.0/.\n--\n-- Copyright 2008-2015 MonetDB B.V.\n\n-- Author M.Kersten\n-- This script gives the database administrator insight in the actual\n-- footprint of the persistent tables and the maximum playground used\n-- when indices are introduced upon them.\n-- By chancing the storagemodelinput table directly, the footprint for\n-- yet to be loaded databases can be assessed.\n\n-- The actual storage footprint of an existing database can be\n-- obtained by the table procuding function storage()\n-- It represents the actual state of affairs, i.e. storage on disk\n-- of columns and foreign key indices, and possible temporary hash indices.\n-- For strings we take a sample to determine their average length.\n\ncreate function sys.\storage\()\nreturns table (\sc hema\ string, \table\ string, \column\ string, \type\ string, \mode\ string, location string, \count\ bigint, typewidth int, columnsize bigint, heapsize bigint, hashes bigint, phash boolean, imprints bigint, sorted boolean, compress boolean)\nexternal name sql.\storage\; ] [ sys, storage, 1, clob, ] [ sys, storage, 2, clob, ] [ sys, storage, 3, clob, ] @@ -698,6 +698,7 @@ Ready. [ sys, storage, 11, boolean,] [ sys, storage, 12, bigint, ] [ sys, storage, 13, boolean,] +[ sys, storage, 14, boolean,] [ sys, storagemodel, 0, clob, create function sys.storagemodel()\nreturns table (\n\t\schema\ string,\n\t\table\ string,\n\t\column\ string,\n\t\type\ string,\n\t\count\\tbigint,\n\tcolumnsize bigint,\n\theapsize bigint,\n\thashes bigint,\n\timprints bigint,\n\tsorted boolean)\nbegin\n\treturn select i.\schema\, i.\table\, i.\column\, i.\type\, i.\count\,\n\tcolumnsize(i.\type\, i.count, i.\distinct\),\n\theapsize(i.\type\, i.\distinct\, i.\atomwidth\),\n\thashsize(i.\reference\, i.\count\),\n\timprintsize(i.\count\,i.\type\),\n\ti.sorted\n\tfrom sys.storagemodelinput i;\nend; ] [ sys, storagemodel, 1, clob, ] [ sys, storagemodel, 2, clob, ] diff --git
MonetDB: mosaic - Approve output
Changeset: 1c71cc97ae46 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c71cc97ae46
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
Branch: mosaic
Log Message:
Approve output
diffs (truncated from 543 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
@@ -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-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from 'a:\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: a:\tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from '\tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: \tmp/xyz
-MAPI = (monetdb) /var/tmp/mtest-28428/.s.monetdb.31099
+MAPI = (monetdb) /var/tmp/mtest-13169/.s.monetdb.36172
QUERY = explain copy into ttt from 'Z:/tmp/xyz';
ERROR = !COPY INTO: filename must have absolute path: Z:/tmp/xyz
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% .L # table_name
% def # name
% clob # type
-% 470 # 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.generator();optimizer.garbageCollector();
]
+% 489 # 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.generator();optimizer.mosaic();optimizer.garbageCollector();
]
#explain copy into ttt from '/tmp/xyz';
% .explain # table_name
% mal # name
@@ -64,10 +64,10 @@ Ready.
% 150 # length
function user.s4_1{autoCommit=true}():void;
X_25:void := querylog.define(explain copy into ttt from
\\'/tmp/xyz\\';,default_pipe);
-barrier X_34 := language.dataflow();
+barrier X_35 := 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,/tmp/xyz,-1:lng,0:lng,0);
-exit X_34;
+exit X_35;
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);
@@ -89,8 +89,8 @@ end user.s4_1;
% .L # table_name
% def # name
% clob # type
-% 493 # 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.generator();optimizer.sql_append();optimizer.garbageCollector();
]
+% 512 # length
+[
MonetDB: mosaic - Approve output after merge
Changeset: 6074e07bf71a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6074e07bf71a
Modified Files:
monetdb5/modules/mal/mosaic.mal
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/leaks/Tests/check1_bam.stable.out.int128
sql/test/leaks/Tests/check2_bam.stable.out.int128
sql/test/leaks/Tests/check3_bam.stable.out.int128
sql/test/leaks/Tests/check4_bam.stable.out.int128
sql/test/leaks/Tests/check5_bam.stable.out.int128
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/mosaic/Tests/xqueries_delta.stable.out
sql/test/mosaic/Tests/xqueries_rle.stable.out
Branch: mosaic
Log Message:
Approve output after merge
diffs (truncated from 1536 to 300 lines):
diff --git a/monetdb5/modules/mal/mosaic.mal b/monetdb5/modules/mal/mosaic.mal
--- a/monetdb5/modules/mal/mosaic.mal
+++ b/monetdb5/modules/mal/mosaic.mal
@@ -225,6 +225,9 @@ address MOSleftfetchjoin;
pattern leftfetchjoin(b:bat[:oid,:oid], cand:bat[:oid,:lng]) :bat[:oid,:lng]
address MOSleftfetchjoin;
+pattern leftfetchjoin(b:bat[:oid,:oid], cand:bat[:oid,:hge]) :bat[:oid,:hge]
+address MOSleftfetchjoin;
+
pattern leftfetchjoin(b:bat[:oid,:oid], cand:bat[:oid,:oid]) :bat[:oid,:oid]
address MOSleftfetchjoin;
diff --git
a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
@@ -49,11 +49,11 @@ function user.s4_1(A0:hge,A1:bte):void;
X_3 := sql.mvc();
X_4:bat[:oid,:oid] := sql.tid(X_3,sys,dbg);
X_7:bat[:oid,:int] := sql.bind(X_3,sys,dbg,a,0);
-X_10 := algebra.leftfetchjoin(X_4,X_7);
+X_10 := mosaic.leftfetchjoin(X_4,X_7);
(X_11,r1_11,r2_11) := group.subgroupdone(X_10);
X_14 := algebra.leftfetchjoin(r1_11,X_10);
X_15:bat[:oid,:int] := sql.bind(X_3,sys,dbg,b,0);
-X_17 := algebra.leftfetchjoin(X_4,X_15);
+X_17 := mosaic.leftfetchjoin(X_4,X_15);
X_18:bat[:oid,:hge] := aggr.subsum(X_17,X_11,r1_11,true,true);
X_20 := algebra.project(X_10,A1);
X_21 := algebra.leftfetchjoin(r1_11,X_20);
@@ -102,11 +102,11 @@ function user.s10_1(A0:hge,A1:bte):void;
X_3 := sql.mvc();
X_4:bat[:oid,:oid] := sql.tid(X_3,sys,dbg);
X_7:bat[:oid,:int] := sql.bind(X_3,sys,dbg,a,0);
-X_10 := algebra.leftfetchjoin(X_4,X_7);
+X_10 := mosaic.leftfetchjoin(X_4,X_7);
(X_11,r1_11,r2_11) := group.subgroupdone(X_10);
X_14 := algebra.leftfetchjoin(r1_11,X_10);
X_15:bat[:oid,:int] := sql.bind(X_3,sys,dbg,b,0);
-X_17 := algebra.leftfetchjoin(X_4,X_15);
+X_17 := mosaic.leftfetchjoin(X_4,X_15);
X_18:bat[:oid,:hge] := aggr.subsum(X_17,X_11,r1_11,true,true);
X_20 := algebra.project(X_10,A1);
X_21 := algebra.leftfetchjoin(r1_11,X_20);
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -42,9 +42,9 @@ function user.s5_1{autoCommit=true}(A0:f
X_15 := sql.delta(X_7,X_10,r1_10,X_13);
X_16 := X_15;
X_17 := batcalc.flt(X_16);
-X_41 := batmmath.log10(X_17);
+X_42 := batmmath.log10(X_17);
X_4:bat[:oid,:oid] := sql.tid(X_3,sys,tab_2826);
-X_18 := algebra.thetasubselect(X_41,X_4,A0,);
+X_18 := algebra.thetasubselect(X_42,X_4,A0,);
X_20 := sql.projectdelta(X_18,X_7,X_10,r1_10,X_13);
X_21 := sql.resultSet(1,1,X_20);
sql.rsColumn(X_21,sys.tab_2826,d,double,53,0,X_20);
diff --git
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
---
a/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
+++
b/sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
@@ -34,12 +34,12 @@ function user.s2_1(A0:str):void;
X_2 := sql.mvc();
X_6:bat[:oid,:str] := sql.bind(X_2,sys,functions,name,0);
X_3:bat[:oid,:oid] := sql.tid(X_2,sys,functions);
-X_47 := algebra.likesubselect(X_6,X_3,A0,,false);
+X_48 := algebra.likesubselect(X_6,X_3,A0,,false);
(X_9,r1_9) :=
MonetDB: mosaic - Approve output
Changeset: b566e0ea837c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b566e0ea837c Modified Files: monetdb5/modules/mal/Tests/mosaic_rle.stable.out Branch: mosaic Log Message: Approve output diffs (294 lines): diff --git a/monetdb5/modules/mal/Tests/mosaic_rle.stable.out b/monetdb5/modules/mal/Tests/mosaic_rle.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_rle.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_rle.stable.out @@ -79,6 +79,100 @@ function user.main():void; #mosaic.dump(x); z := mosaic.decompress(x); io.print(z); +# OID list compressions +o := 19531025:int; +f := bat.new(:oid,:flt); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.3141); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31615); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +bat.append(f,0.31702); +io.print(f); +xf := mosaic.compress(f,rle); +zf := mosaic.decompress(xf); +io.print(zf); end main; #--# # ht # name @@ -400,6 +494,189 @@ end main; [ 101@0, 9 ] [ 102@0, 9 ] [ 103@0, 9 ] +#--# +# ht # name +# void flt # type +#--# +[ 0@0, 0.3141 ] +[ 1@0, 0.3141 ] +[ 2@0, 0.3141 ] +[ 3@0, 0.3141 ] +[ 4@0, 0.3141 ] +[ 5@0, 0.3141 ] +[ 6@0, 0.3141 ] +[ 7@0, 0.3141 ] +[ 8@0, 0.3141 ] +[ 9@0, 0.3141 ] +[ 10@0,0.3141 ] +[ 11@0,0.3141 ] +[ 12@0,0.3141 ] +[ 13@0,0.3141 ] +[ 14@0,0.3141 ] +[ 15@0,0.3141 ] +[ 16@0,0.3141 ] +[ 17@0,0.3141 ] +[ 18@0,0.3141 ] +[ 19@0,0.3141 ] +[ 20@0,0.3141 ] +[ 21@0,0.31615 ] +[ 22@0,0.31615 ] +[ 23@0,0.31615 ] +[ 24@0,0.31615 ] +[ 25@0,0.31615 ] +[ 26@0,0.31615 ] +[ 27@0,0.31615 ] +[ 28@0,0.31615 ] +[ 29@0,0.31615 ] +[ 30@0,0.31615 ] +[ 31@0,0.31615 ] +[ 32@0,0.31615 ] +[ 33@0,0.31615 ] +[ 34@0,0.31615 ] +[ 35@0,0.31615 ] +[ 36@0,0.31615 ] +[ 37@0,0.31702 ] +[ 38@0,0.31702 ] +[ 39@0,0.31702 ] +[ 40@0,0.31702 ] +[ 41@0,0.31702 ] +[ 42@0,0.31702 ]
