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,      1 # length
-[ "frame ",    12752,  0.02823086642,  0,      0       ]
-[ "prefix ",   12788,  0.02815139107,  0,      0       ]
-[ "linear ",   12856,  0.02800248936,  0,      0       ]
-[ "runlength ",        12856,  0.02800248936,  0,      0       ]
-[ "delta ",    12872,  0.02796768211,  0,      0       ]
-[ "dictionary ",       12924,  0.02785515413,  0,      0       ]
-[ "calendar ", 13032,  0.02762430906,  1,      0       ]
 #alter table mix0 alter column i set storage 'mosaic';
 #select * from mosaic_layout('sys','mix0','i') ;
 % .L4, .L4,    .L4,    .L4,    .L4 # table_name
 % technique,   count,  inputsize,      outputsize,     properties # name
 % clob,        bigint, bigint, bigint, clob # type
 % 17,  2,      3,      2,      9 # length
-[ "ratio",     0,      0,      0,      "0.0282309"     ]
+[ "ratio",     0,      0,      0,      "0.0282575"     ]
 [ "raw blocks",        0,      0,      0,      ""      ]
 [ "runlength blocks",  0,      0,      0,      ""      ]
-[ "dictionary blocks", 0,      0,      0,      ""      ]
+[ "dictionary blocks", 1,      90,     0,      ""      ]
 [ "delta blocks",      0,      0,      0,      ""      ]
 [ "linear blocks",     0,      0,      0,      ""      ]
-[ "frame blocks",      1,      90,     0,      ""      ]
+[ "frame blocks",      0,      0,      0,      ""      ]
 [ "prefix blocks",     0,      0,      0,      ""      ]
 [ "calendar blocks",   0,      0,      0,      ""      ]
-[ "frame[0]",  0,      0,      4,      "0"     ]
-[ "frame[1]",  1,      0,      1,      "1"     ]
-[ "frame[2]",  2,      0,      1,      "2"     ]
-[ "frame[3]",  3,      0,      1,      "3"     ]
-[ "frame[4]",  4,      0,      1,      "5"     ]
-[ "frame[5]",  5,      0,      1,      "7"     ]
-[ "frame[6]",  6,      0,      21,     "9"     ]
-[ "frame[7]",  7,      0,      1,      "13"    ]
-[ "frame[8]",  8,      0,      2,      "48"    ]
-[ "frame[9]",  9,      0,      2,      "49"    ]
-[ "frame[10]", 10,     0,      6,      "50"    ]
-[ "frame[11]", 11,     0,      1,      "70"    ]
-[ "frame[12]", 12,     0,      1,      "90"    ]
-[ "frame[13]", 13,     0,      1,      "94"    ]
-[ "frame[14]", 14,     0,      1,      "95"    ]
-[ "frame[15]", 15,     0,      1,      "99"    ]
-[ "frame[16]", 16,     0,      1,      "188"   ]
-[ "frame[17]", 17,     0,      1,      "190"   ]
-[ "frame[18]", 18,     0,      2,      "192"   ]
-[ "frame[19]", 19,     0,      1,      "324"   ]
-[ "frame[20]", 20,     0,      1,      "800"   ]
-[ "frame[21]", 21,     0,      1,      "1000"  ]
-[ "frame[22]", 22,     0,      1,      "1001"  ]
-[ "frame[23]", 23,     0,      2,      "1002"  ]
-[ "frame[24]", 24,     0,      2,      "1003"  ]
-[ "frame[25]", 25,     0,      1,      "1125"  ]
-[ "frame[26]", 26,     0,      1,      "1297"  ]
-[ "frame[27]", 27,     0,      1,      "4096"  ]
-[ "frame[28]", 28,     0,      1,      "4136"  ]
-[ "frame[29]", 29,     0,      1,      "6240"  ]
-[ "frame[30]", 30,     0,      1,      "6654"  ]
-[ "frame[31]", 31,     0,      1,      "9002"  ]
-[ "frame[32]", 32,     0,      1,      "9536"  ]
-[ "frame[33]", 33,     0,      2,      "9999"  ]
-[ "frame[34]", 34,     0,      1,      "10380" ]
-[ "frame[35]", 35,     0,      1,      "10757" ]
-[ "frame[36]", 36,     0,      1,      "1049873"       ]
-[ "frame[37]", 37,     0,      1,      "16777216"      ]
-[ "frame[38]", 38,     0,      18,     "19531025"      ]
+[ "dictionary[0]",     0,      0,      2,      "0"     ]
+[ "dictionary[1]",     0,      0,      2,      "1"     ]
+[ "dictionary[2]",     0,      0,      2,      "2"     ]
+[ "dictionary[3]",     0,      0,      2,      "3"     ]
+[ "dictionary[4]",     0,      0,      2,      "5"     ]
+[ "dictionary[5]",     0,      0,      2,      "7"     ]
+[ "dictionary[6]",     0,      0,      60,     "9"     ]
+[ "dictionary[7]",     0,      0,      2,      "48"    ]
+[ "dictionary[8]",     0,      0,      2,      "49"    ]
+[ "dictionary[9]",     0,      0,      6,      "50"    ]
+[ "dictionary[10]",    0,      0,      2,      "70"    ]
+[ "dictionary[11]",    0,      0,      2,      "90"    ]
+[ "dictionary[12]",    0,      0,      2,      "91"    ]
+[ "dictionary[13]",    0,      0,      2,      "92"    ]
+[ "dictionary[14]",    0,      0,      2,      "93"    ]
+[ "dictionary[15]",    0,      0,      2,      "94"    ]
+[ "dictionary[16]",    0,      0,      2,      "95"    ]
+[ "dictionary[17]",    0,      0,      2,      "96"    ]
+[ "dictionary[18]",    0,      0,      2,      "97"    ]
+[ "dictionary[19]",    0,      0,      2,      "98"    ]
+[ "dictionary[20]",    0,      0,      2,      "99"    ]
+[ "dictionary[21]",    0,      0,      2,      "188"   ]
+[ "dictionary[22]",    0,      0,      2,      "190"   ]
+[ "dictionary[23]",    0,      0,      2,      "192"   ]
+[ "dictionary[24]",    0,      0,      2,      "1000"  ]
+[ "dictionary[25]",    0,      0,      2,      "1001"  ]
+[ "dictionary[26]",    0,      0,      2,      "1002"  ]
+[ "dictionary[27]",    0,      0,      2,      "1003"  ]
+[ "dictionary[28]",    0,      0,      2,      "1100"  ]
+[ "dictionary[29]",    0,      0,      2,      "1110"  ]
+[ "dictionary[30]",    0,      0,      2,      "1120"  ]
+[ "dictionary[31]",    0,      0,      2,      "1130"  ]
+[ "dictionary[32]",    0,      0,      2,      "1140"  ]
+[ "dictionary[33]",    0,      0,      2,      "1250"  ]
+[ "dictionary[34]",    0,      0,      2,      "1260"  ]
+[ "dictionary[35]",    0,      0,      2,      "1270"  ]
+[ "dictionary[36]",    0,      0,      2,      "1280"  ]
+[ "dictionary[37]",    0,      0,      2,      "1290"  ]
+[ "dictionary[38]",    0,      0,      2,      "9999"  ]
+[ "dictionary[39]",    0,      0,      21,     "19531025"      ]
 [ "========",  0,      0,      0,      ""      ]
-[ "frame",     90,     360,    80,     ""      ]
+[ "dictionary blk",    90,     360,    76,     ""      ]
+#drop table mix0;
 
 # 21:39:24 >  
 # 21:39:24 >  "Done."
diff --git a/sql/test/mosaic/Tests/prefix.stable.err 
b/sql/test/mosaic/Tests/prefix.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/mosaic/Tests/prefix.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'prefix` in directory 'sql/test/mosaic` itself:
+
+
+# 12:53:32 >  
+# 12:53:32 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=35122" "--set" 
"mapi_usock=/var/tmp/mtest-21664/.s.monetdb.35122" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic"
+# 12:53:32 >  
+
+# 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 = 50000
+# 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 = 35122
+# cmdline opt  mapi_usock = /var/tmp/mtest-21664/.s.monetdb.35122
+# cmdline opt  monet_prompt = 
+# cmdline opt  gdk_dbpath = 
/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic
+# cmdline opt  gdk_debug = 536870922
+
+# 12:53:32 >  
+# 12:53:32 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21664" "--port=35122"
+# 12:53:32 >  
+
+
+# 12:53:32 >  
+# 12:53:32 >  "Done."
+# 12:53:32 >  
+
diff --git a/sql/test/mosaic/Tests/prefix.stable.out 
b/sql/test/mosaic/Tests/prefix.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/mosaic/Tests/prefix.stable.out
@@ -0,0 +1,88 @@
+stdout of test 'prefix` in directory 'sql/test/mosaic` itself:
+
+
+# 12:53:32 >  
+# 12:53:32 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=35122" "--set" 
"mapi_usock=/var/tmp/mtest-21664/.s.monetdb.35122" "--set" "monet_prompt=" 
"--forcemito" 
"--dbpath=/export/scratch1/mk/mosaic//Linux/var/MonetDB/mTests_sql_test_mosaic"
+# 12:53:32 >  
+
+# MonetDB 5 server v11.26.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:35122/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-21664/.s.monetdb.35122
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 12:53:32 >  
+# 12:53:32 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-21664" "--port=35122"
+# 12:53:32 >  
+
+#set optimizer='sequential_pipe';
+#create table tmpPrefix( i integer);
+#insert into tmpPrefix values (1), (1), (1), (1), (1), (1), (2), (2);
+[ 8    ]
+#select * from tmpPrefix;
+% sys.tmpprefix # table_name
+% i # name
+% int # type
+% 1 # length
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 2    ]
+[ 2    ]
+#alter table tmpPrefix alter column i set storage 'prefix';
+#select * from tmpPrefix;
+% sys.tmpprefix # table_name
+% i # name
+% int # type
+% 1 # length
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
+[ 1    ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to