Changeset: f780a1da369e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f780a1da369e
Modified Files:
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/aggr.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/array.mx
monetdb5/modules/kernel/colcalc.mx
monetdb5/modules/kernel/colcast.mx
monetdb5/modules/kernel/colcolor.mx
monetdb5/modules/kernel/colifthen.mx
monetdb5/modules/kernel/colmmath.mx
monetdb5/modules/kernel/colmtime.mx
monetdb5/modules/kernel/colstr.mx
monetdb5/modules/kernel/column.mx
monetdb5/modules/kernel/group.mx
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/cbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/extensions.c
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/pcrelib.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/zorder.c
Branch: headless
Log Message:
BAT_READ -> COL_READ
diffs (truncated from 1462 to 300 lines):
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -27,35 +27,35 @@
lib_kernel = {
NOINST
SOURCES = \
- aggr_be_avg.mx \
- aggr_be_count.mx \
- aggr_be_minmax.mx \
- aggr_be_prod.mx \
- aggr_be_sum.mx \
- aggr_bge_avg.mx \
- aggr_bge_count.mx \
- aggr_bge_minmax.mx \
- aggr_bge_prod.mx \
- aggr_bge_sum.mx \
- aggr.mx \
- alarm.mx \
- algebra.mx \
- array.mx \
- column.mx \
- colcalc.mx \
- colcast.mx \
- colcolor.mx \
- colifthen.mx \
- colmmath.mx \
- colmtime.mx \
- colstr.mx \
- calc.mx \
- counters.mx \
- group.mx \
+# aggr_be_avg.mx \
+# aggr_be_count.mx \
+# aggr_be_minmax.mx \
+# aggr_be_prod.mx \
+# aggr_be_sum.mx \
+# aggr_bge_avg.mx \
+# aggr_bge_count.mx \
+# aggr_bge_minmax.mx \
+# aggr_bge_prod.mx \
+# aggr_bge_sum.mx \
+# aggr.mx \
+# alarm.mx \
+# algebra.mx \
+# array.mx \
+# column.mx \
+# colcalc.mx \
+# colcast.mx \
+# colcolor.mx \
+# colifthen.mx \
+# colmmath.mx \
+# colmtime.mx \
+# colstr.mx \
+# calc.mx \
+# counters.mx \
+# group.mx \
lock.c \
- logger.mx \
- microbenchmark.mx \
- mmath.mx \
+ logger.c \
+# microbenchmark.mx \
+# mmath.mx \
sema.c \
status.c \
unix.c
@@ -68,7 +68,7 @@
mmath.mx lock.mal sema.mal alarm.mx colstr.mx colmtime.mx \
colcolor.mx colifthen.mx colcast.mx colcalc.mx colmmath.mx \
group.mx aggr.mx array.mx \
- mx logger.mx microbenchmark.mx
+ mx logger.mal microbenchmark.mx
}
EXTRA_DIST = aggr_ri.mx kprelude.mx lock.mal lock.h sema.mal unix.mal alarm.h
logger.mal microbenchmark.mal microbenchmark.h
diff --git a/monetdb5/modules/kernel/aggr.mx b/monetdb5/modules/kernel/aggr.mx
--- a/monetdb5/modules/kernel/aggr.mx
+++ b/monetdb5/modules/kernel/aggr.mx
@@ -295,7 +295,7 @@
throw(MAL, "aggr.sum", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_sum_@1_@2(&bn,b,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -320,7 +320,7 @@
throw(MAL, "aggr.prod", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_prod_@1_@2(&bn,b,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -371,7 +371,7 @@
throw(MAL, "aggr.avg", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_avg_@1(&bn,b,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -405,7 +405,7 @@
}
if( CMDaggrX3_@1(&bn,b,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*ret = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -436,7 +436,7 @@
}
if (CMDaggrX3_count(&bn, b, e, ignore_nils) == GDK_SUCCEED) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -464,7 +464,7 @@
throw(MAL, "aggr.size", RUNTIME_OBJECT_MISSING);
}
if (CMDaggrX3_size(&bn, b, e) == GDK_SUCCEED) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -495,7 +495,7 @@
throw(MAL, "aggr.sum3", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_sum3_@1_@2(&bn,b,g,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -526,7 +526,7 @@
throw(MAL, "aggr.prod3", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_prod3_@1_@2(&bn,b,g,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -583,7 +583,7 @@
throw(MAL, "aggr.avg3", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_avg3_@1(&bn,b,g,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retid = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -624,7 +624,7 @@
throw(MAL, "aggr.@13", RUNTIME_OBJECT_MISSING);
}
if( CMDaggrX3_@13(&bn,b,g,e) == GDK_SUCCEED){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*ret = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
@@ -660,7 +660,7 @@
throw(MAL, "aggr.count3", RUNTIME_OBJECT_MISSING);
}
if (CMDaggrX3_count3(&bn, b, g, e, ignore_nils) == GDK_SUCCEED) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*retif = CBPkeepref(bn);
CBPreleaseref(b);
CBPreleaseref(e);
diff --git a/monetdb5/modules/kernel/algebra.mx
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -1974,7 +1974,7 @@
throw(MAL, "algebra.groupby",GDK_EXCEPTION);
}
if( bn){
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*res = bn->batCacheid;
CBPkeeref(bn);
}
@@ -2038,7 +2038,7 @@
CMDselect1(&bn, b, value);
CBPreleaseref(b);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
return MAL_SUCCEED;
}
@@ -2059,7 +2059,7 @@
bn = BATmirror(bn);
CBPreleaseref(b);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
return MAL_SUCCEED;
}
@@ -2078,7 +2078,7 @@
CMDuselect1(&bn, b, value);
CBPreleaseref(b);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
return MAL_SUCCEED;
}
@@ -2097,7 +2097,7 @@
CMDantiuselect1(&bn, b, value);
CBPreleaseref(b);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
return MAL_SUCCEED;
}
@@ -2117,7 +2117,7 @@
CMDselect(&bn, b, low, high);
CBPreleaseref(b);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
return MAL_SUCCEED;
}
@@ -2139,7 +2139,7 @@
low=high= ATOMnilptr(b->ttype);
CMDselect_(&bn, b, low, high, &bound, &bound);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2165,7 +2165,7 @@
@:derefStr(b,t,high);@
CMDuselect(&bn, b, low, high);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2208,7 +2208,7 @@
CMDuselect_(&bn, b, low, high, &lin, &rin);
}
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2229,7 +2229,7 @@
@:derefStr(b,t,high)@
CMDselect_(&bn, b, low, high, lin, rin);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2252,7 +2252,7 @@
CMDselect_(&bn, b, low, high, lin, rin);
bn = BATmirror(bn);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2273,7 +2273,7 @@
@:derefStr(b,t,high);@
CMDuselect_(&bn, b, low, high, lin, rin);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2296,7 +2296,7 @@
@:derefStr(b,t,thigh);@
CMDfragment(&bn, b, hlow, hhigh, tlow, thigh);
if (bn) {
- if (!(bn->dirty&2)) bn = COLsetaccess(bn, BAT_READ);
+ if (!(bn->dirty&2)) bn = COLsetaccess(bn, COL_READ);
*result = CBPkeepref(bn);
CBPreleaseref(b);
return MAL_SUCCEED;
@@ -2325,7 +2325,7 @@
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
