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 ]
#--------------------------#
# h t # name
# void oid # type
@@ -313,7 +311,6 @@ end user.main;
# h t # name
# void oid # type
#--------------------------#
-[ 0@0, 1@0 ]
#--------------------------#
# h t # 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;
# h t # name
# void oid # type
#--------------------------#
+[ "candidate stuff" ]
#--------------------------#
# h t # name
# void oid # type
@@ -297,8 +299,6 @@ end user.main;
# h t # name
# void oid # type
#--------------------------#
-[ 0@0, 2@0 ]
-[ 1@0, 5@0 ]
#--------------------------#
# h t # name
# void oid # type
@@ -327,6 +327,7 @@ end user.main;
# h t # name
# void oid # type
#--------------------------#
+[ "string stuff" ]
#--------------------------#
# h t # 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
+++ b/monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out
@@ -78,7 +78,6 @@ function user.main():void;
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);
@@ -368,12 +367,6 @@ end user.main;
# void oid # type
#--------------------------#
[ 0@0, 2@0 ]
-[ 1@0, 5@0 ]
-#--------------------------#
-# h t # name
-# void oid # type
-#--------------------------#
-[ 0@0, 2@0 ]
#--------------------------#
# h t # name
# void oid # type
@@ -435,6 +428,10 @@ end user.main;
# h t # name
# void oid # type
#--------------------------#
+#--------------------------#
+# h t # name
+# void oid # type
+#--------------------------#
[ 0@0, 2@0 ]
[ 1@0, 5@0 ]
#--------------------------#
diff --git a/monetdb5/modules/mal/Tests/mosaic_zone_subselect.mal
b/monetdb5/modules/mal/Tests/mosaic_zone_subselect.mal
--- a/monetdb5/modules/mal/Tests/mosaic_zone_subselect.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_zone_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);
diff --git a/monetdb5/modules/mal/Tests/mosaic_zone_subselect.stable.out
b/monetdb5/modules/mal/Tests/mosaic_zone_subselect.stable.out
--- a/monetdb5/modules/mal/Tests/mosaic_zone_subselect.stable.out
+++ b/monetdb5/modules/mal/Tests/mosaic_zone_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);
@@ -224,6 +224,7 @@ end user.main;
# h t # name
# void oid # type
#--------------------------#
+[ "candidate stuff" ]
#--------------------------#
# h t # name
# void oid # type
@@ -288,8 +289,6 @@ end user.main;
# h t # name
# void oid # type
#--------------------------#
-[ 0@0, 2@0 ]
-[ 1@0, 5@0 ]
#--------------------------#
# h t # name
# void oid # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
