Changeset: 6b294fa8c3a1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b294fa8c3a1
Modified Files:
monetdb5/extras/Makefile.ag
monetdb5/extras/crackers/Makefile.ag
monetdb5/modules/mal/cbp.c
monetdb5/modules/mal/extensions.c
monetdb5/modules/mal/inout.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcrelib.c
monetdb5/modules/mal/pqueue.mx
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/xmlcolumn.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_tarantula.c
monetdb5/optimizer/opt_wrapper.c
Branch: headless
Log Message:
Fixes
Some portions of the code has been disabled, for they require
more thought and/or progress in GDK. Compilation has been
checked until it starts compiling SQL.
diffs (truncated from 980 to 300 lines):
diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag
--- a/monetdb5/extras/Makefile.ag
+++ b/monetdb5/extras/Makefile.ag
@@ -15,5 +15,5 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = compiler crackers HAVE_RAPTOR?rdf HAVE_SPHINXCLIENT?sphinx
+SUBDIRS = # compiler crackers HAVE_RAPTOR?rdf HAVE_SPHINXCLIENT?sphinx
diff --git a/monetdb5/extras/crackers/Makefile.ag
b/monetdb5/extras/crackers/Makefile.ag
--- a/monetdb5/extras/crackers/Makefile.ag
+++ b/monetdb5/extras/crackers/Makefile.ag
@@ -26,7 +26,8 @@
MODULE
DIR = libdir/monetdb5
SEP = _
- SOURCES = crackers.mx \
+ SOURCES = \
+ crackers.mx \
crackers_AVL_index.mx crackers_AVL_tree.mx crackers_index.mx \
crackers_core_ordered.mx crackers_core_unordered.mx
crackers_validation.mx \
crackers_joinselect_ops.mx crackers_select_ops.mx
crackers_sideways.mx crackers_partial_sideways.mx crackers_updates.mx
crackers_joins.mx crackers_sortmerge.mx crackers_crackmerge.mx crackers_pq.c \
@@ -40,8 +41,8 @@
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = crackers.mx
+ SOURCES = # crackers.mx
}
#EXTRA_DIST_DIR = Tests
-EXTRA_DIST = crackers_pq.h
+EXTRA_DIST = # crackers_pq.h
diff --git a/monetdb5/modules/mal/cbp.c b/monetdb5/modules/mal/cbp.c
--- a/monetdb5/modules/mal/cbp.c
+++ b/monetdb5/modules/mal/cbp.c
@@ -236,16 +236,16 @@
b->dirty= FALSE;
if (CBP_lrefs(*bid) == 0) {
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
throw(MAL, "cbp.garbage", INTERNAL_COL_ACCESS);
}
if (CBP_lrefs(*bid) == 2 && b->persistence == PERSISTENT) {
/* release column from pool altogether */
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
CBPdecref(*bid, TRUE);
return MAL_SUCCEED;
}
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
if (*bid)
/* while( CBP_lrefs(*bid) > 1 ) */
CBPdecref(*bid, TRUE);
@@ -335,7 +335,7 @@
if (bn) {
l = COLcount(bn);
BUNappend(b, &l, FALSE);
- CBPunfix(bn->batCacheid);
+ CBPreleaseref(bn);
}
}
}
@@ -543,7 +543,7 @@
throw(MAL, "cbp.getRefCount", INTERNAL_COL_ACCESS);
*res = CBP_refs(b->batCacheid);
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
return MAL_SUCCEED;
}
@@ -556,7 +556,7 @@
throw(MAL, "cbp.getLRefCount", INTERNAL_COL_ACCESS);
*res = CBP_lrefs(b->batCacheid);
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
return MAL_SUCCEED;
}
@@ -574,7 +574,7 @@
bn= COLdescriptor(i);
if(bn)
BUNappend(b, COLatoms[COLtype(bn)].name, FALSE);
- CBPunfix(bn->batCacheid);
+ CBPreleaseref(bn);
}
COLsetreadonly(b);
*ret = CBPkeepref(b);
diff --git a/monetdb5/modules/mal/extensions.c
b/monetdb5/modules/mal/extensions.c
--- a/monetdb5/modules/mal/extensions.c
+++ b/monetdb5/modules/mal/extensions.c
@@ -262,7 +262,7 @@
throw(MAL, "chop.newChunkMoreElements",
INTERNAL_COL_ACCESS);
if ((view = COLdescriptor(*vid)) == NULL) {
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
throw(MAL, "chop.newChunkMoreElements", INTERNAL_COL_ACCESS);
}
i = (oid)(*res + COLcount(view));
@@ -346,7 +346,7 @@
p = *(ptr **) p;
}
bn = COLconst(b, tt, p);
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
if (bn) {
*result = CBPkeepref(bn);
return MAL_SUCCEED;
diff --git a/monetdb5/modules/mal/inout.c b/monetdb5/modules/mal/inout.c
--- a/monetdb5/modules/mal/inout.c
+++ b/monetdb5/modules/mal/inout.c
@@ -546,7 +546,7 @@
b = COLdescriptor(*(int *) val);
if (b == NULL) {
for (k = 0; k < nbats; k++)
- CBPunfix(piv[k]->batCacheid);
+ CBPreleaseref(piv[k]);
throw(MAL, "io.table", MAL_MALLOC_FAIL);
}
piv[nbats++] = b;
diff --git a/monetdb5/modules/mal/mat.c b/monetdb5/modules/mal/mat.c
--- a/monetdb5/modules/mal/mat.c
+++ b/monetdb5/modules/mal/mat.c
@@ -201,7 +201,7 @@
if (lst <= cap + c) {
b = COLdescriptor(bid);
bn = COLslice(b, fst - cap, lst - cap);
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
*ret = CBPkeepref(bn);
return MAL_SUCCEED;
}
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -313,7 +313,7 @@
dst = x;
}
*res = CBPkeepref( dst);
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
return msg;
}
diff --git a/monetdb5/modules/mal/pcrelib.c b/monetdb5/modules/mal/pcrelib.c
--- a/monetdb5/modules/mal/pcrelib.c
+++ b/monetdb5/modules/mal/pcrelib.c
@@ -798,7 +798,7 @@
msg = pcre_replace_bat(&bn,b,*pat,*repl,*flags);
if( msg == MAL_SUCCEED)
*res = CBPkeepref(bn);
- CBPunfix(b->batCacheid);
+ CBPreleaseref(b);
return msg;
}
@@ -832,13 +832,13 @@
}
if ((msg = pcre_uselect(&bn, *pattern, strs, *ignore)) != MAL_SUCCEED) {
- CBPunfix(strs->batCacheid);
+ CBPreleaseref(strs);
return msg;
}
*res = bn->batCacheid;
CBPkeepref(bn);
- CBPunfix(strs->batCacheid);
+ CBPreleaseref(strs);
return msg;
}
diff --git a/monetdb5/modules/mal/pqueue.mx b/monetdb5/modules/mal/pqueue.mx
--- a/monetdb5/modules/mal/pqueue.mx
+++ b/monetdb5/modules/mal/pqueue.mx
@@ -360,7 +360,7 @@
pqueue_topreplace_@1@2(h, &idx, v);
}
*H = heap2bat_@1@2(h);
- CBPunfix(h->batCacheid);
+ CBPreleaseref(h);
return GDK_SUCCEED;
}
@@ -384,7 +384,7 @@
pqueue_topreplace_@1@2(h, (oid*)BUNhloc(ti,p), (@1*)BUNtloc(ti,p));
}
*H = heap2bat_@1@2(h);
- CBPunfix(h->batCacheid);
+ CBPreleaseref(h);
return GDK_SUCCEED;
}
@@ -405,7 +405,7 @@
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
if (duplicates == NULL) {
- CBPunfix((*H)->batCacheid);
+ CBPreleaseref((*H));
return GDK_FAIL;
}
v = (@1*)BUNtail(ti,BUNfirst(t));
@@ -434,12 +434,12 @@
}
}
b = heap2bat_@1@2(*H);
- CBPunfix((*H)->batCacheid); *H = b;
+ CBPreleaseref((*H)); *H = b;
b = VIEWcombine(*H);
- CBPunfix((*H)->batCacheid); *H = b;
+ CBPreleaseref((*H)); *H = b;
b = COLleftjoin(*H, duplicates, COLcount(duplicates));
- CBPunfix((*H)->batCacheid);
- CBPunfix(duplicates->batCacheid);
+ CBPreleaseref((*H));
+ CBPreleaseref(duplicates);
*H = BATmirror(b);
return GDK_SUCCEED;
}
@@ -459,7 +459,7 @@
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
if (duplicates == NULL) {
- CBPunfix((*H)->batCacheid);
+ CBPreleaseref((*H));
return GDK_FAIL;
}
v = (@1*)BUNtail(ti,BUNfirst(t));
@@ -489,12 +489,12 @@
}
}
b = heap2bat_@1@2(*H);
- CBPunfix((*H)->batCacheid); *H = b;
+ CBPreleaseref((*H)); *H = b;
b = VIEWcombine(*H);
- CBPunfix((*H)->batCacheid); *H = b;
+ CBPreleaseref((*H)); *H = b;
b = COLleftjoin(*H, duplicates, COLcount(duplicates));
- CBPunfix((*H)->batCacheid);
- CBPunfix(duplicates->batCacheid);
+ CBPreleaseref((*H));
+ CBPreleaseref(duplicates);
*H = BATmirror(b);
return GDK_SUCCEED;
}
@@ -683,7 +683,7 @@
pqueue_topreplace_any@1(h, &idx, BUNtail(ti,p), tpe);
}
*H = heap2bat_any@1(h);
- CBPunfix(h->batCacheid);
+ CBPreleaseref(h);
return GDK_SUCCEED;
}
@@ -708,7 +708,7 @@
pqueue_topreplace_any@1(h, (oid*)BUNhloc(ti,p), BUNtail(ti,p), tpe);
}
*H = heap2bat_any@1(h);
- CBPunfix(h->batCacheid);
+ CBPreleaseref(h);
return GDK_SUCCEED;
}
@@ -729,7 +729,7 @@
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
if (duplicates == NULL) {
- CBPunfix((*H)->batCacheid);
+ CBPreleaseref((*H));
return GDK_FAIL;
}
hi = col_iterator(*H);
@@ -760,12 +760,12 @@
}
}
b = heap2bat_any@1(*H);
- CBPunfix((*H)->batCacheid); *H = b;
+ CBPreleaseref((*H)); *H = b;
b = VIEWcombine(*H);
- CBPunfix((*H)->batCacheid); *H = b;
+ CBPreleaseref((*H)); *H = b;
b = COLleftjoin(*H, duplicates, COLcount(duplicates));
- CBPunfix((*H)->batCacheid);
- CBPunfix(duplicates->batCacheid);
+ CBPreleaseref((*H));
+ CBPreleaseref(duplicates);
*H = BATmirror(b);
return GDK_SUCCEED;
}
@@ -787,7 +787,7 @@
return GDK_FAIL;
duplicates = BATnew(TYPE_oid, TYPE_oid, n);
if (duplicates == NULL) {
- CBPunfix((*H)->batCacheid);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
