Changeset: 4c2c24b5fb11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c2c24b5fb11
Modified Files:
monetdb5/mal/Tests/saveload.mal
monetdb5/mal/Tests/saveload.stable.out
monetdb5/mal/Tests/tst1200.mal
monetdb5/mal/Tests/tst610.mal
monetdb5/mal/Tests/tst610.stable.out
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/bbp.h
monetdb5/modules/mal/bbp.mal
monetdb5/modules/mal/mat.mal
monetdb5/optimizer/Tests/mat00.stable.out
monetdb5/optimizer/Tests/mat01.stable.out
monetdb5/optimizer/opt_mergetable.c
Branch: default
Log Message:
Mergetable and bbp move to headless
It added 3 errors to the sql test and 1 in modules mal.
Close enough to commit
diffs (truncated from 671 to 300 lines):
diff --git a/monetdb5/mal/Tests/saveload.mal b/monetdb5/mal/Tests/saveload.mal
--- a/monetdb5/mal/Tests/saveload.mal
+++ b/monetdb5/mal/Tests/saveload.mal
@@ -15,12 +15,12 @@ io.print(b);
bat.save(a);
bat.save(b);
-ar:bat[:int,:int]:= bat.load("aaa");
+ar:bat[:oid,:int]:= bat.load("aaa");
io.print(ar);
br:bat[:oid,:str]:= bat.load("bbb");
io.print(br);
#and an error
-er:bat[:int,:int]:= bbp.bind("bbb");
+er:bat[:oid,:int]:= bbp.bind("bbb");
io.print(er);
diff --git a/monetdb5/mal/Tests/saveload.stable.out
b/monetdb5/mal/Tests/saveload.stable.out
--- a/monetdb5/mal/Tests/saveload.stable.out
+++ b/monetdb5/mal/Tests/saveload.stable.out
@@ -52,12 +52,12 @@ function user.main():void;
io.print(b);
bat.save(a);
bat.save(b);
- ar:bat[:int,:int] := bat.load("aaa");
+ ar:bat[:oid,:int] := bat.load("aaa");
io.print(ar);
br:bat[:oid,:str] := bat.load("bbb");
io.print(br);
#and an error
- er:bat[:int,:int] := bbp.bind("bbb");
+ er:bat[:oid,:int] := bbp.bind("bbb");
io.print(er);
end main;
#-----------------#
diff --git a/monetdb5/mal/Tests/tst1200.mal b/monetdb5/mal/Tests/tst1200.mal
--- a/monetdb5/mal/Tests/tst1200.mal
+++ b/monetdb5/mal/Tests/tst1200.mal
@@ -531,7 +531,8 @@ io.print("daytime_bat,bh_a,dh_a,fh_a,hh_
#
rh_a := bat.setColumn(timestamp_bat,"timestamp");
#io.print(timestamp_bat.bat.setColumn("timestamp"),
- timezones:bat[:str,:timezone]:= bbp.bind("timezones");
+ tzz:bat[:oid,:timezone]:= bbp.bind("timezones");
+ timezones:= bat.reverse(tzz);
io.print("print(timezones)");
io.print(timezones);
sh_a:timezone := algebra.find(timezones,"Wake Island");
diff --git a/monetdb5/mal/Tests/tst610.mal b/monetdb5/mal/Tests/tst610.mal
--- a/monetdb5/mal/Tests/tst610.mal
+++ b/monetdb5/mal/Tests/tst610.mal
@@ -41,7 +41,7 @@ io.print(t);
catch MALException:str;
io.print("BAT was destroyed");
exit MALException;
-z:bat[:any_1,:any_2]:= bbp.bind("tasks");
+z:bat[:oid,:any_2]:= bbp.bind("tasks");
io.print(z);
#it is not in the box anymore either
catch MALException:str;
diff --git a/monetdb5/mal/Tests/tst610.stable.out
b/monetdb5/mal/Tests/tst610.stable.out
--- a/monetdb5/mal/Tests/tst610.stable.out
+++ b/monetdb5/mal/Tests/tst610.stable.out
@@ -104,7 +104,7 @@ exit MALException:str ;
catch MALException:str ;
io.print("BAT was destroyed");
exit MALException:str ;
- z:bat[:any,:any] := bbp.bind("tasks");
+ z:bat[:oid,:any] := bbp.bind("tasks");
io.print(z);
#it is not in the box anymore either
catch MALException:str ;
diff --git a/monetdb5/modules/mal/bbp.c b/monetdb5/modules/mal/bbp.c
--- a/monetdb5/modules/mal/bbp.c
+++ b/monetdb5/modules/mal/bbp.c
@@ -804,20 +804,18 @@ CMDbbpNames(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_str, BBPsize);
+ b = BATnew(TYPE_void, TYPE_str, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpNames", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpNames");
for (i = 1; i < BBPsize; i++)
if (i != b->batCacheid) {
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i)) ) {
- BUNins(b, &i, BBP_logical(i), FALSE);
- if (BBP_logical(-i) && (BBP_refs(-i) ||
BBP_lrefs(-i)) && !BBPtmpcheck(BBP_logical(-i))) {
- int j = -i;
-
- BUNins(b, &j, BBP_logical(j), FALSE);
- }
+ BUNappend(b, BBP_logical(i), FALSE);
+ if (BBP_logical(-i) && (BBP_refs(-i) ||
BBP_lrefs(-i)) && !BBPtmpcheck(BBP_logical(-i)))
+ BUNappend(b, BBP_logical(-i), FALSE);
}
}
BBPunlock("CMDbbpNames");
@@ -851,17 +849,18 @@ CMDbbpRNames(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_str, BBPsize);
+ b = BATnew(TYPE_void, TYPE_str, BBPsize);
if (b == 0)
throw(MAL, "bbp.getRNames", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpRNames");
for (i = 1; i < BBPsize; i++)
if (i != b->batCacheid && BBP_logical(i) && (BBP_refs(i) ||
BBP_lrefs(i))) {
if (BBP_logical(-i)) {
- BUNins(b, &i, BBP_logical(-i), FALSE);
+ BUNappend(b, BBP_logical(-i), FALSE);
} else
- BUNins(b, &i, BBP_logical(i), FALSE);
+ BUNappend(b, BBP_logical(i), FALSE);
}
BBPunlock("CMDbbpRNames");
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
@@ -876,9 +875,10 @@ CMDbbpCount(int *ret)
int i;
lng l;
- b = BATnew(TYPE_int, TYPE_lng, BBPsize);
+ b = BATnew(TYPE_void, TYPE_lng, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpCount", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
for (i = 1; i < BBPsize; i++)
if (i != b->batCacheid) {
@@ -886,7 +886,7 @@ CMDbbpCount(int *ret)
bn = BATdescriptor(i);
if (bn) {
l = BATcount(bn);
- BUNins(b, &i, &l, FALSE);
+ BUNappend(b, &l, FALSE);
BBPunfix(bn->batCacheid);
}
}
@@ -910,16 +910,17 @@ CMDbbpLocation(int *ret)
if (getcwd(cwd, MAXPATHLEN) == NULL)
throw(MAL, "catalog.bbpLocation", RUNTIME_DIR_ERROR);
- b = BATnew(TYPE_int, TYPE_str, BBPsize);
+ b = BATnew(TYPE_void, TYPE_str, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpLocation", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpLocation");
for (i = 1; i < BBPsize; i++)
if (i != b->batCacheid) {
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
snprintf(buf,MAXPATHLEN,"%s/bat/%s",cwd,BBP_physical(i));
- BUNins(b, &i, buf, FALSE);
+ BUNappend(b, buf, FALSE);
}
}
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
@@ -938,9 +939,10 @@ CMDbbpHeat(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_int, BBPsize);
+ b = BATnew(TYPE_void, TYPE_int, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpHeat", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpHeat");
for (i = 1; i < BBPsize; i++)
@@ -970,9 +972,10 @@ CMDbbpDirty(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_str, BBPsize);
+ b = BATnew(TYPE_void, TYPE_str, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpDirty", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpDirty");
for (i = 1; i < BBPsize; i++)
@@ -980,7 +983,7 @@ CMDbbpDirty(int *ret)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
BAT *bn = BBP_cache(i);
- BUNins(b, &i, bn ? BATdirty(bn) ? "dirty" :
DELTAdirty(bn) ? "diffs" : "clean" : (BBP_status(i) & BBPSWAPPED) ? "diffs" :
"clean", FALSE);
+ BUNappend(b, bn ? BATdirty(bn) ? "dirty" :
DELTAdirty(bn) ? "diffs" : "clean" : (BBP_status(i) & BBPSWAPPED) ? "diffs" :
"clean", FALSE);
}
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
BBPunlock("CMDbbpDirty");
@@ -997,9 +1000,10 @@ CMDbbpStatus(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_str, BBPsize);
+ b = BATnew(TYPE_void, TYPE_str, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpStatus", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpStatus");
for (i = 1; i < BBPsize; i++)
@@ -1007,7 +1011,7 @@ CMDbbpStatus(int *ret)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
char *loc = BBP_cache(i) ? "load" : "disk";
- BUNins(b, &i, loc, FALSE);
+ BUNappend(b, loc, FALSE);
}
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
BBPunlock("CMDbbpStatus");
@@ -1021,9 +1025,10 @@ CMDbbpKind(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_str, BBPsize);
+ b = BATnew(TYPE_void, TYPE_str, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpKind", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpKind");
for (i = 1; i < BBPsize; i++)
@@ -1036,7 +1041,7 @@ CMDbbpKind(int *ret)
else
mode = "persistent";
if (mode)
- BUNins(b, &i, mode, FALSE);
+ BUNappend(b, mode, FALSE);
}
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
BBPunlock("CMDbbpKind");
@@ -1050,16 +1055,17 @@ CMDbbpRefCount(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_int, BBPsize);
+ b = BATnew(TYPE_void, TYPE_int, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpRefCount", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpRefCount");
for (i = 1; i < BBPsize; i++)
if (i != b->batCacheid && BBP_logical(i) && (BBP_refs(i) ||
BBP_lrefs(i))) {
int refs = BBP_refs(i);
- BUNins(b, &i, &refs, FALSE);
+ BUNappend(b, &refs, FALSE);
}
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
BBPunlock("CMDbbpRefCount");
@@ -1073,16 +1079,17 @@ CMDbbpLRefCount(int *ret)
BAT *b;
int i;
- b = BATnew(TYPE_int, TYPE_int, BBPsize);
+ b = BATnew(TYPE_void, TYPE_int, BBPsize);
if (b == 0)
throw(MAL, "catalog.bbpLRefCount", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
BBPlock("CMDbbpLRefCount");
for (i = 1; i < BBPsize; i++)
if (i != b->batCacheid && BBP_logical(i) && (BBP_refs(i) ||
BBP_lrefs(i))) {
int refs = BBP_lrefs(i);
- BUNins(b, &i, &refs, FALSE);
+ BUNappend(b, &refs, FALSE);
}
if (!(b->batDirty&2)) b = BATsetaccess(b, BAT_READ);
BBPunlock("CMDbbpLRefCount");
@@ -1124,37 +1131,19 @@ CMDgetBATlrefcnt(int *res, int *bid)
}
-str CMDbbpHeadType( int *ret){
+str CMDbbpType( int *ret){
BAT *b,*bn;
int i;
- b= BATnew(TYPE_int,TYPE_str,BBPsize);
+ b= BATnew(TYPE_void,TYPE_str,BBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpHeadType", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.bbpTailType", MAL_MALLOC_FAIL);
+ BATseqbase(b,0);
for(i=1; i < BBPsize; i++) if (i != b->batCacheid)
if (BBP_logical(i) && (BBP_refs(i) || BBP_lrefs(i))) {
bn= BATdescriptor(i);
- if(bn) BUNins(b, &i, BATatoms[BAThtype(bn)].name, FALSE);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
