Changeset: 784a68b637d6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=784a68b637d6
Modified Files:
        monetdb5/modules/mal/mal_init.mal
        monetdb5/modules/mosaic/Tests/mosaic_delta.malC
        monetdb5/modules/mosaic/Tests/mosaic_delta.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_delta.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
        monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_frame.malC
        monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_linear.malC
        monetdb5/modules/mosaic/Tests/mosaic_linear.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_linear.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_linear_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_linear_subselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_linear_subselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_linear_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_linear_thetasubselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_linear_thetasubselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_literal.malC
        monetdb5/modules/mosaic/Tests/mosaic_literal.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_literal.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_literal_double.malC
        monetdb5/modules/mosaic/Tests/mosaic_literal_double.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_literal_double.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_literal_inplace.malC
        monetdb5/modules/mosaic/Tests/mosaic_literal_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_literal_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_literal_subselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_literal_subselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_literal_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_literal_thetasubselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_literal_thetasubselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_mix.malC
        monetdb5/modules/mosaic/Tests/mosaic_mix_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_mix_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_mix_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_prefix.malC
        monetdb5/modules/mosaic/Tests/mosaic_prefix.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_prefix.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_prefix_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_prefix_subselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_prefix_subselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_prefix_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_prefix_thetasubselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_prefix_thetasubselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_runlength.malC
        monetdb5/modules/mosaic/Tests/mosaic_runlength.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_runlength.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_runlength_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_runlength_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_runlength_subselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_runlength_subselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_runlength_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_runlength_thetasubselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_runlength_thetasubselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_view_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_zone.malC
        monetdb5/modules/mosaic/Tests/mosaic_zone.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_zone.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_zone_joins.malC
        monetdb5/modules/mosaic/Tests/mosaic_zone_subselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_zone_subselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_zone_subselect.stable.out
        monetdb5/modules/mosaic/Tests/mosaic_zone_thetasubselect.malC
        monetdb5/modules/mosaic/Tests/mosaic_zone_thetasubselect.stable.err
        monetdb5/modules/mosaic/Tests/mosaic_zone_thetasubselect.stable.out
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_support.h
        monetdb5/optimizer/opt_wrapper.c
        sql/benchmarks/ssbm/Tests/01-explain.stable.out
        sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/02-explain.stable.out
        sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128
        sql/benchmarks/ssbm/Tests/03-explain.stable.out
        sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128
        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/tpch/Tests/01-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/02-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/06-explain.stable.out
        sql/benchmarks/tpch/Tests/06-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/08-explain.stable.out
        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/12-explain.stable.out
        sql/benchmarks/tpch/Tests/12-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/14-explain.stable.out.int128
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
        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/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/setoptimizer.stable.out.Windows
Branch: mosaic
Log Message:

First batch of output approvals


diffs (truncated from 3279 to 300 lines):

diff --git a/monetdb5/modules/mal/mal_init.mal 
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -96,6 +96,7 @@ include srvpool;
 
 include mal_mapi;
 
+include mosaic;
 # Any extensions (MAL scripts) that should be automatically loaded upon
 # startup can be placed in the autoload directory.  One typically finds
 # the SQL module in here, but it can also be used to load custom scripts.
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta.malC
@@ -1,5 +1,5 @@
 # Delta compression
-b:= bat.new(:oid,:int);
+b:= bat.new(:int);
 bat.append(b,0);
 bat.append(b,1);
 bat.append(b,4);
@@ -18,7 +18,7 @@ x:= mosaic.compress(b,"delta");
 z:= mosaic.decompress(x);
 io.print(z);
 
-bs:= bat.new(:oid,:timestamp);
+bs:= bat.new(:timestamp);
 bat.append(bs,"2014-08-14 12:00:00":timestamp);
 bat.append(bs,"2014-08-14 12:00:00":timestamp);
 bat.append(bs,"2014-08-14 12:00:00":timestamp);
@@ -34,7 +34,7 @@ xs:= mosaic.compress(bs,"delta");
 zs:= mosaic.decompress(xs);
 io.print(zs);
 
-d:= bat.new(:oid,:date);
+d:= bat.new(:date);
 bat.append(d,"2014-08-14":date);
 bat.append(d,"2014-08-14":date);
 bat.append(d,"2014-08-14":date);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.err 
b/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.err
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.err
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'mosaic_delta` in directory 'monetdb5/modules/mal` itself:
+stderr of test 'mosaic_delta` in directory 'monetdb5/modules/mosaic` itself:
 
 
 # 19:05:34 >  
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.out 
b/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.out
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.out
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'mosaic_delta` in directory 'monetdb5/modules/mal` itself:
+stdout of test 'mosaic_delta` in directory 'monetdb5/modules/mosaic` itself:
 
 
 # 19:05:34 >  
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC
@@ -1,5 +1,5 @@
 # Delta compression
-b:= bat.new(:oid,:int);
+b:= bat.new(:int);
 bat.append(b,0);
 bat.append(b,1);
 bat.append(b,4);
@@ -15,7 +15,7 @@ base:=algebra.copy(b);
 io.print(base);
 x:= mosaic.compress(b,"delta");
 
-c:= bat.new(:oid,:oid);
+c:= bat.new(:oid);
 bat.append(c,0@0);
 bat.append(c,2@0);
 bat.append(c,5@0);
@@ -27,7 +27,7 @@ io.print(s);
 xs:= mosaic.projection(c,x);
 io.print(xs);
 
-d:= bat.new(:oid,:int);
+d:= bat.new(:int);
 bat.append(d,4);
 bat.append(d,-1);
 bat.append(d,nil:int);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC
@@ -1,5 +1,5 @@
 # Delta compression
-b:= bat.new(:oid,:int);
+b:= bat.new(:int);
 bat.append(b,0);
 bat.append(b,1);
 bat.append(b,4);
@@ -56,7 +56,7 @@ xs:= mosaic.subselect(x,nil:int,nil:int,
 io.print(xs);
 
 # using candidatelists
-c:= bat.new(:oid,:oid);
+c:= bat.new(:oid);
 bat.append(c,1@0);
 bat.append(c,5@0);
 
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.err 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.err
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.err
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'mosaic_delta_subselect` in directory 'monetdb5/modules/mal` 
itself:
+stderr of test 'mosaic_delta_subselect` in directory 'monetdb5/modules/mosaic` 
itself:
 
 
 # 19:05:36 >  
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.out 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.out
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.out
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'mosaic_delta_subselect` in directory 'monetdb5/modules/mal` 
itself:
+stdout of test 'mosaic_delta_subselect` in directory 'monetdb5/modules/mosaic` 
itself:
 
 
 # 19:05:36 >  
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC
@@ -1,5 +1,5 @@
 # Delta compression
-b:= bat.new(:oid,:int);
+b:= bat.new(:int);
 bat.append(b,0);
 bat.append(b,1);
 bat.append(b,4);
@@ -45,7 +45,7 @@ io.print(s);
 xs:= mosaic.thetasubselect(x,4,"!=");
 io.print(xs);
 
-c:= bat.new(:oid,:oid);
+c:= bat.new(:oid);
 bat.append(c,0@0);
 bat.append(c,2@0);
 io.print(c);
diff --git 
a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.err 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.err
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.err
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'mosaic_delta_thetasubselect` in directory 
'monetdb5/modules/mal` itself:
+stderr of test 'mosaic_delta_thetasubselect` in directory 
'monetdb5/modules/mosaic` itself:
 
 
 # 19:31:26 >  
diff --git 
a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.out 
b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.out
--- a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.out
+++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'mosaic_delta_thetasubselect` in directory 
'monetdb5/modules/mal` itself:
+stdout of test 'mosaic_delta_thetasubselect` in directory 
'monetdb5/modules/mosaic` itself:
 
 
 # 19:31:26 >  
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC
@@ -1,4 +1,4 @@
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
@@ -13,7 +13,7 @@ x:= mosaic.compress(b,"dictionary");
 z:= mosaic.decompress(x);
 io.print(z);
 
-d:= bat.new(:oid,:date);
+d:= bat.new(:date);
 bat.append(d,"2014-08-14":date);
 bat.append(d,"2014-08-14":date);
 bat.append(d,"2014-08-14":date);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC
@@ -1,4 +1,4 @@
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
@@ -13,7 +13,7 @@ x:= mosaic.compress(b,"dictionary test 1
 z:= mosaic.decompress(x);
 io.print(z);
 
-c:= bat.new(:oid,:oid);
+c:= bat.new(:oid);
 bat.append(c,0@0);
 bat.append(c,2@0);
 bat.append(c,4@0);
@@ -25,7 +25,7 @@ io.print(s);
 xs:= mosaic.projection(c,x);
 io.print(xs);
 
-d:= bat.new(:oid,:timestamp);
+d:= bat.new(:timestamp);
 bat.append(d,"2014-08-14 12:01:00":timestamp);
 bat.append(d,"2014-08-14 12:02:00":timestamp);
 bat.append(d,nil:timestamp);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.malC
@@ -1,4 +1,4 @@
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
diff --git 
a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.malC
@@ -1,5 +1,5 @@
 # Compression of noncompressable column
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
@@ -44,7 +44,7 @@ io.print(s);
 xs:= mosaic.thetasubselect(x,"2014-08-14 12:01:00":timestamp,"!=");
 io.print(xs);
 
-c:= bat.new(:oid,:oid);
+c:= bat.new(:oid);
 bat.append(c,0@0);
 bat.append(c,3@0);
 io.print(c);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame.malC
@@ -1,4 +1,4 @@
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
@@ -12,7 +12,7 @@ x:= mosaic.compress(b,"frame");
 z:= mosaic.decompress(x);
 io.print(base,z);
 
-d:= bat.new(:oid,:date);
+d:= bat.new(:date);
 bat.append(d,"2014-08-14":date);
 bat.append(d,"2014-08-14":date);
 bat.append(d,"2014-08-14":date);
@@ -25,7 +25,7 @@ xd:= mosaic.compress(d,"frame");
 zd:= mosaic.decompress(xd);
 io.print(d,zd);
 
-e:= bat.new(:oid,:date);
+e:= bat.new(:date);
 bat.append(e,"1996-03-13":date);
 bat.append(e,"1996-04-12":date);
 bat.append(e,"1996-01-29":date);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC
@@ -1,4 +1,4 @@
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
@@ -13,7 +13,7 @@ x:= mosaic.compress(b,"frame");
 z:= mosaic.decompress(x);
 io.print(z);
 
-c:= bat.new(:oid,:oid);
+c:= bat.new(:oid);
 bat.append(c,0@0);
 bat.append(c,2@0);
 bat.append(c,4@0);
@@ -25,7 +25,7 @@ io.print(s);
 xs:= mosaic.projection(c,x);
 io.print(xs);
 
-d:= bat.new(:oid,:timestamp);
+d:= bat.new(:timestamp);
 bat.append(d,"2014-08-14 12:01:00":timestamp);
 bat.append(d,"2014-08-14 12:02:00":timestamp);
 bat.append(d,nil:timestamp);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.malC
@@ -1,4 +1,4 @@
-b:= bat.new(:oid,:timestamp);
+b:= bat.new(:timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:00:00":timestamp);
 bat.append(b,"2014-08-14 12:01:00":timestamp);
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.malC 
b/monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.malC
--- a/monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.malC
+++ b/monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.malC
@@ -1,5 +1,5 @@
 # Compression of noncompressable column
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to