Changeset: 560e473805fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=560e473805fe
Modified Files:
monetdb5/modules/kernel/kprelude.mx
Branch: headless
Log Message:
Restore
diffs (74 lines):
diff --git a/monetdb5/modules/kernel/kprelude.mx
b/monetdb5/modules/kernel/kprelude.mx
--- a/monetdb5/modules/kernel/kprelude.mx
+++ b/monetdb5/modules/kernel/kprelude.mx
@@ -20,8 +20,8 @@
@-
The Mx macros below are used in many places throughout the code base.
-@= getCOLdescriptor
- if( (@2= COLdescriptor(*@1)) == NULL ){ @4;
+@= getBATdescriptor
+ if( (@2= BATdescriptor(*@1)) == NULL ){ @4;
throw(MAL, @3, RUNTIME_OBJECT_MISSING);
}
@= tstBAT
@@ -29,7 +29,7 @@
throw(MAL, @1, MAL_MALLOC_FAIL);}
@= resBAT
- bn = BATnew(ATOMtype(b->htype), TYPE_@1, COLcount(b));
+ bn = BATnew(ATOMtype(b->htype), TYPE_@1, BATcount(b));
if ( bn== NULL) {
@3
throw(MAL, @2, MAL_MALLOC_FAIL);
@@ -38,14 +38,14 @@
bn->tsorted = b->tsorted;
bn->H->nonil = b->H->nonil;
bn->T->nonil = b->T->nonil;
- COLkey(bn, BAThkey(b));
+ BATkey(bn, BAThkey(b));
@= resultBAT
if (BAThvoid(b)) {
- bn = BATnew(TYPE_void, TYPE_@1, COLcount(b));
- COLseqbase(bn, b->hseqbase);
+ bn = BATnew(TYPE_void, TYPE_@1, BATcount(b));
+ BATseqbase(bn, b->hseqbase);
} else {
- bn = BATnew(b->htype, TYPE_@1, COLcount(b));
+ bn = BATnew(b->htype, TYPE_@1, BATcount(b));
}
if ( bn== NULL) {
@3
@@ -56,11 +56,11 @@
if (!BAThvoid(b))
bn->H->nonil = b->H->nonil;
bn->T->nonil = b->T->nonil;
- COLkey(bn, BAThkey(b));
+ BATkey(bn, BAThkey(b));
@= voidresultBAT
- bn = BATnew(TYPE_void, @1, COLcount(b));
- COLseqbase(bn, b->hseqbase);
+ bn = BATnew(TYPE_void, @1, BATcount(b));
+ BATseqbase(bn, b->hseqbase);
if (bn == NULL) {
@3
throw(MAL, @2, MAL_MALLOC_FAIL);
@@ -71,11 +71,12 @@
bn->T->nonil = b->T->nonil;
@= Pseudo
- if (CBPindex("view_@1_@2") <= 0)
- COLname(b, "@2");
+ if (BBPindex("view_@1_@2") <= 0)
+ BATname(b, "@2");
BATroles(b,"@1","@2");
- COLmode(b,TRANSIENT);
- *ret = CBPkeepref(b);
+ BATmode(b,TRANSIENT);
+ BBPkeepref(b->batCacheid);
BATfakeCommit(b);
+ *ret = b->batCacheid;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
