Changeset: a41bea7f9d7b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a41bea7f9d7b
Modified Files:
monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out
monetdb5/modules/mal/mosaic_runlength.c
sql/test/mosaic/Tests/compression.sql
sql/test/mosaic/Tests/compressionRLE.sql
sql/test/mosaic/Tests/xqueries_delta.sql
Branch: mosaic
Log Message:
Sync commit
diffs (121 lines):
diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
b/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
--- a/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
+++ b/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal
@@ -37,7 +37,11 @@ io.print(jl,jr);
(ml,mr):= mosaic.join(x,d);
io.print(ml,mr);
-(jl,jr):= algebra.join(d,base);
-io.print(jl,jr);
-(ml,mr):= mosaic.join(d,x);
-io.print(ml,mr);
+(kl,kr):= algebra.join(d,base);
+io.print(kl);
+io.print(kr);
+io.print(kl,kr);
+(nl,nr):= mosaic.join(d,x);
+io.print(nl);
+io.print(nr);
+io.print(nl,nr);
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
@@ -97,6 +97,16 @@ function user.main():void;
io.print(s);
xs := mosaic.subselect(x,c,nil:int,nil:int,false,false,true);
io.print(xs);
+ bstr := bat.new(:oid,:str);
+ bat.append(bstr,"the");
+ bat.append(bstr,"big");
+ bat.append(bstr,"brown");
+ bat.append(bstr,"fox");
+ ystr := mosaic.compress(bstr,"literal");
+ tstr := algebra.subselect(bstr,"big","fox",true,true,false);
+ io.print(tstr);
+ tstr := mosaic.subselect(ystr,"big","fox",true,true,false);
+ io.print(tstr);
end main;
#--------------------------#
# h t # name
@@ -317,6 +327,20 @@ end main;
# h t # name
# void oid # type
#--------------------------#
+#--------------------------#
+# h t # name
+# void void # type
+#--------------------------#
+[ 0@0, 1@0 ]
+[ 1@0, 2@0 ]
+[ 2@0, 3@0 ]
+#--------------------------#
+# h t # name
+# void void # type
+#--------------------------#
+[ 0@0, 1@0 ]
+[ 1@0, 2@0 ]
+[ 2@0, 3@0 ]
# 17:19:36 >
# 17:19:36 > "Done."
diff --git a/monetdb5/modules/mal/mosaic_runlength.c
b/monetdb5/modules/mal/mosaic_runlength.c
--- a/monetdb5/modules/mal/mosaic_runlength.c
+++ b/monetdb5/modules/mal/mosaic_runlength.c
@@ -229,7 +229,7 @@ MOScompress_runlength(Client cntxt, MOSt
BUN lim = MOSgetCnt(blk);\
for(i = 0; i < lim; i++)\
((TYPE*)task->src)[i] = val;\
- hdr->checksum2.sum##TYPE += i * val;\
+ hdr->checksum2.sum##TYPE += (TYPE)(i * val);\
task->src += i * sizeof(TYPE);\
}
@@ -260,7 +260,7 @@ MOSdecompress_runlength(Client cntxt, MO
BUN lim= MOSgetCnt(blk);
for(i = 0; i < lim; i++)
((int*)task->src)[i] = val;
- hdr->checksum2.sumint += i * val;
+ hdr->checksum2.sumint += (int) (i * val);
task->src += i * sizeof(int);
}
break;
diff --git a/sql/test/mosaic/Tests/compression.sql
b/sql/test/mosaic/Tests/compression.sql
--- a/sql/test/mosaic/Tests/compression.sql
+++ b/sql/test/mosaic/Tests/compression.sql
@@ -101,7 +101,9 @@ alter table tmp3 alter column f set stor
explain select * from tmp3;
select * from tmp3;
---select * from storage where "table" = 'tmp3';
+select * from storage where "table" = 'tmp3';
+select count(*) from tmp3;
+
alter table tmp3 alter column i set storage NULL;
alter table tmp3 alter column b set storage NULL;
alter table tmp3 alter column f set storage NULL;
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
@@ -105,7 +105,9 @@ explain select f from tmp3;
explain select t from tmp3;
select * from tmp3;
---select * from storage where "table" = 'tmp3';
+select * from storage where "table" = 'tmp3';
+select count(*) from tmp3;
+
alter table tmp3 alter column i set storage NULL;
alter table tmp3 alter column b set storage NULL;
alter table tmp3 alter column f set storage NULL;
diff --git a/sql/test/mosaic/Tests/xqueries_delta.sql
b/sql/test/mosaic/Tests/xqueries_delta.sql
--- a/sql/test/mosaic/Tests/xqueries_delta.sql
+++ b/sql/test/mosaic/Tests/xqueries_delta.sql
@@ -103,6 +103,8 @@ alter table tmp3 alter column i set stor
alter table tmp3 alter column b set storage 'delta';
alter table tmp3 alter column f set storage 'delta';
+select count(*) from tmp3;
+
explain select count(*) from tmp3 where i <4;
select count(*) from tmp3 where i <4;
explain select count(*) from tmp3 where i = 7;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
